X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=openbox%2Fclient.c;h=757b118d5f9dd298521469e1c2b24e609435797b;hb=ac735b647c9915a40fc3c44a04f7f5f7cacb4278;hp=6d32c407e99a7f724385df172b05d2cb2cfb51e8;hpb=e731042dc9f45555fbb1c52e2affaaf6ffeb141f;p=chaz%2Fopenbox

diff --git a/openbox/client.c b/openbox/client.c
index 6d32c407..757b118d 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -50,10 +50,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();
 }
@@ -123,7 +121,10 @@ 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;
 
@@ -131,6 +132,9 @@ void client_manage_all()
         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)
@@ -1109,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;
@@ -1120,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);
 }
@@ -1982,3 +1981,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];
+}