not using CurrentTime anywhere

[chaz/openbox] / openbox / client.c

diff --git a/openbox/client.c b/openbox/client.c
index de1b2c9c253bf19c146c881893aa17e1fd3cb3c4..61635145a6e15fdfa9353b1cc9490f62bb63fb12 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -23,6 +23,9 @@
 GSList     *client_list      = NULL;
 GHashTable *client_map       = NULL;
 
+static Window *client_startup_stack_order = NULL;
+static gulong  client_startup_stack_size = 0;
+
 static void client_get_all(Client *self);
 static void client_toggle_border(Client *self, gboolean show);
 static void client_get_area(Client *self);
@@ -38,13 +41,18 @@ static Client *search_focus_tree(Client *node, Client *skip);
 static void client_apply_startup_state(Client *self);
 static Client *search_modal_tree(Client *node, Client *skip);
 
-static guint map_hash(Window w) { return w; }
-static gboolean map_key_comp(Window w1, Window w2) { return w1 == w2; }
+static guint map_hash(Window *w) { return *w; }
+static gboolean map_key_comp(Window *w1, Window *w2) { return *w1 == *w2; }
 
 void client_startup()
 {
     client_map = g_hash_table_new((GHashFunc)map_hash,
                                  (GEqualFunc)map_key_comp);
+
+    /* save the stacking order on startup! */
+    PROP_GET32U(ob_root, net_client_list_stacking, window,
+                client_startup_stack_order, client_startup_stack_size);
+
     client_set_list();
 }
 
@@ -112,6 +120,21 @@ void client_manage_all()
        }
     }
     XFree(children);
+
+    /* 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);
+        if (c) stacking_lower(c);
+    }
+    g_free(client_startup_stack_order);
+    client_startup_stack_order = NULL;
+    client_startup_stack_size = 0;
 }
 
 void client_manage(Window window)
@@ -186,8 +209,8 @@ void client_manage(Window window)
      
     client_list = g_slist_append(client_list, client);
     stacking_list = g_list_append(stacking_list, client);
-    g_assert(!g_hash_table_lookup(client_map, (gpointer)client->window));
-    g_hash_table_insert(client_map, (gpointer)window, client);
+    g_assert(!g_hash_table_lookup(client_map, &client->window));
+    g_hash_table_insert(client_map, &client->window, client);
 
     /* update the focus lists */
     if (client->desktop == DESKTOP_ALL) {
@@ -211,7 +234,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()
@@ -226,7 +249,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);
@@ -241,7 +264,7 @@ void client_unmanage(Client *client)
 
     client_list = g_slist_remove(client_list, client);
     stacking_list = g_list_remove(stacking_list, client);
-    g_hash_table_remove(client_map, (gpointer)client->window);
+    g_hash_table_remove(client_map, &client->window);
 
     /* update the focus lists */
     if (client->desktop == DESKTOP_ALL) {
@@ -528,7 +551,7 @@ void client_update_transient_for(Client *self)
     if (XGetTransientForHint(ob_display, self->window, &t) &&
        t != self->window) { /* cant be transient to itself! */
        self->transient = TRUE;
-       c = g_hash_table_lookup(client_map, (gpointer)t);
+       c = g_hash_table_lookup(client_map, &t);
        g_assert(c != self);/* if this happens then we need to check for it*/
 
        if (!c /*XXX: && _group*/) {
@@ -1090,8 +1113,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;
@@ -1101,11 +1124,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);
 }
@@ -1916,7 +1934,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;
@@ -1926,7 +1944,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;
@@ -1954,6 +1972,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);
     }
@@ -1963,3 +1982,28 @@ void client_set_focused(Client *self, gboolean focused)
 
     engine_frame_adjust_focus(self->frame);
 }
+
+Icon *client_icon(Client *self, int w, int h)
+{
+    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;
+
+    if (!self->nicons) return NULL;
+
+    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];
+}