handle focus in the kernel, no more plugin

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index 6d32c407e99a7f724385df172b05d2cb2cfb51e8..5d897f1c00faf01f78d3956f133ea98815b91b8a 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2,6 +2,7 @@
 #include "screen.h"
 #include "prop.h"
 #include "extensions.h"
+#include "config.h"
 #include "frame.h"
 #include "engine.h"
 #include "event.h"
@@ -50,10 +51,8 @@ void client_startup()
                                  (GEqualFunc)map_key_comp);
 
     /* save the stacking order on startup! */
-    if (!PROP_GET32U(ob_root, net_client_list_stacking, window,
-                     client_startup_stack_order, client_startup_stack_size))
-        g_message("failed");
-    g_message("%ld", client_startup_stack_size);
+    PROP_GET32U(ob_root, net_client_list_stacking, window,
+                client_startup_stack_order, client_startup_stack_size);
 
     client_set_list();
 }
@@ -88,6 +87,7 @@ void client_set_list()
 
 void client_manage_all()
 {
+    ConfigValue focus_new;
     unsigned int i, j, nchild;
     Window w, *children;
     XWMHints *wmhints;
@@ -123,14 +123,26 @@ void client_manage_all()
     }
     XFree(children);
 
-    /* stack them as they were on startup! */
+    /* stack them as they were on startup!
+       why with stacking_lower? Why, because then windows who aren't in the
+       stacking list are on the top where you can see them instead of buried
+       at the bottom! */
     for (i = client_startup_stack_size; i > 0; --i) {
         Client *c;
 
         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);
+    client_startup_stack_order = NULL;
+    client_startup_stack_size = 0;
+
+    if (!config_get("focusNew", Config_Bool, &focus_new))
+        g_assert_not_reached();
+    if (focus_new.bool)
+        focus_fallback(FALSE);
 }
 
 void client_manage(Window window)
@@ -141,6 +153,7 @@ void client_manage(Window window)
     XSetWindowAttributes attrib_set;
 /*    XWMHints *wmhint; */
     guint i;
+    ConfigValue focus_new;
 
     grab_server(TRUE);
 
@@ -227,10 +240,15 @@ void client_manage(Window window)
 
     dispatch_client(Event_Client_Mapped, client, 0, 0);
 
+    if (!config_get("focusNew", Config_Bool, &focus_new))
+        g_assert_not_reached();
+    if (ob_state != State_Starting && focus_new.bool)
+        client_focus(client);
+
     /* 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()
@@ -245,7 +263,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);
@@ -1109,8 +1127,8 @@ void client_update_icons(Client *self)
        /* store the icons */
        i = 0;
        for (j = 0; j < self->nicons; ++j) {
-           w = self->icons[j].w = data[i++];
-           h = self->icons[j].h = data[i++];
+           w = self->icons[j].width = data[i++];
+           h = self->icons[j].height = data[i++];
            self->icons[j].data =
                g_memdup(&data[i], w * h * sizeof(gulong));
            i += w * h;
@@ -1120,11 +1138,6 @@ void client_update_icons(Client *self)
        g_free(data);
     }
 
-    if (self->nicons <= 0) {
-       self->nicons = 1;
-       self->icons = g_new0(Icon, 1);
-    }
-
     if (self->frame)
        engine_frame_adjust_icon(self->frame);
 }
@@ -1934,8 +1947,8 @@ gboolean client_focus(Client *self)
     }
 
     if (self->can_focus)
-       XSetInputFocus(ob_display, self->window, RevertToNone,
-                       CurrentTime);
+       XSetInputFocus(ob_display, self->window, RevertToPointerRoot,
+                       event_lasttime);
 
     if (self->focus_notify) {
        XEvent ce;
@@ -1945,21 +1958,26 @@ 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;
        XSendEvent(ob_display, self->window, FALSE, NoEventMask, &ce);
     }
 
-    /* XSync(ob_display, FALSE); XXX Why sync? */
+    g_message("focusing %lx", self->window);
+
+    /* Cause the FocusIn to come back to us. Important for desktop switches,
+       since otherwise we'll have no FocusIn on the queue and send it off to
+       the focus_backup. */
+    XSync(ob_display, FALSE);
     return TRUE;
 }
 
 void client_unfocus(Client *self)
 {
     g_assert(focus_client == self);
-    client_set_focused(self, FALSE);
+    focus_fallback(FALSE);
 }
 
 gboolean client_focused(Client *self)
@@ -1967,18 +1985,27 @@ gboolean client_focused(Client *self)
     return self == focus_client;
 }
 
-void client_set_focused(Client *self, gboolean focused)
+Icon *client_icon(Client *self, int w, int h)
 {
-    if (focused) {
-        if (focus_client != self)
-            focus_set_client(self);
-    } else {
-       if (focus_client == self)
-           focus_set_client(NULL);
-    }
+    int i;
+    /* si is the smallest image >= req */
+    /* li is the largest image < req */
+    unsigned long size, smallest = 0xffffffff, largest = 0, si = 0, li = 0;
 
-    /* focus state can affect the stacking layer */
-    client_calc_layer(self);
+    if (!self->nicons) return NULL;
 
-    engine_frame_adjust_focus(self->frame);
+    for (i = 0; i < self->nicons; ++i) {
+        size = self->icons[i].width * self->icons[i].height;
+        if (size < smallest && size >= (unsigned)(w * h)) {
+            smallest = size;
+            si = i;
+        }
+        if (size > largest && size <= (unsigned)(w * h)) {
+            largest = size;
+            li = i;
+        }
+    }
+    if (largest == 0) /* didnt find one smaller than the requested size */
+        return &self->icons[si];
+    return &self->icons[li];
 }