X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.cc;h=3dc6237f1a36e2e6cdfa6ae99fb3ec466fda3977;hb=d2dcef46752df01312cbb3c5a89b3227c6959087;hp=bd7f7b83c82a29b68302de4782088d7219f28f72;hpb=059bc4dc24b68d637c3608c05344c53c64cc2c4b;p=chaz%2Fopenbox

diff --git a/src/client.cc b/src/client.cc
index bd7f7b83..3dc6237f 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -581,7 +581,7 @@ void Client::updateWMHints(bool initstate)
   if (ur != _urgent) {
     _urgent = ur;
 #ifdef DEBUG
-    printf("DEBUG: Urgent Hint for 0x%lx: %s\n",
+    printf("Urgent Hint for 0x%lx: %s\n",
            (long)_window, _urgent ? "ON" : "OFF");
 #endif
     // fire the urgent callback if we're mapped, otherwise, wait until after
@@ -708,6 +708,7 @@ void Client::updateIcons()
   unsigned long num = (unsigned) -1;
   unsigned long *data;
   unsigned long w, h, i = 0;
+  bool freeit = false;
 
   for (int j = 0; j < _nicons; ++j)
     delete [] _icons[j].data;
@@ -715,35 +716,40 @@ void Client::updateIcons()
     delete [] _icons;
   _nicons = 0;
 
-  if (otk::Property::get(_window, otk::Property::atoms.net_wm_icon,
-                         otk::Property::atoms.cardinal, &num, &data)) {
-    // figure out how man valid icons are in here
-    while (num - i > 2) {
-      w = data[i++];
-      h = data[i++];
-      i += w * h;
-      if (i > num) break;
-      ++_nicons;
-    }
+  if (!otk::Property::get(_window, otk::Property::atoms.net_wm_icon,
+                          otk::Property::atoms.cardinal, &num, &data)) {
+    // use default icon(s)
+    num = openbox->screen(_screen)->config().icon_length;
+    data = openbox->screen(_screen)->config().default_icon;
+  } else
+    freeit = true;
+  
+  // figure out how man valid icons are in here
+  while (num - i > 2) {
+    w = data[i++];
+    h = data[i++];
+    i += w * h;
+    if (i > num) break;
+    ++_nicons;
+  }
 
-    _icons = new Icon[_nicons];
+  _icons = new Icon[_nicons];
 
-    // store the icons
-    i = 0;
-    for (int j = 0; j < _nicons; ++j) {
-      w = _icons[j].w = data[i++];
+  // store the icons
+  i = 0;
+  for (int j = 0; j < _nicons; ++j) {
+    w = _icons[j].w = data[i++];
       h = _icons[j].h = data[i++];
       _icons[j].data = new unsigned long[w * h];
       ::memcpy(_icons[j].data, &data[i], w * h * sizeof(unsigned long));
       i += w * h;
       assert(i <= num);
-    }
-    
-    delete [] data;
   }
 
+  if (freeit)
+    delete [] data;
+
   if (_nicons <= 0) {
-    // set the default icon(s) XXX load these from the py
     _nicons = 1;
     _icons = new Icon[1];
     _icons[i].w = 0;
@@ -1231,9 +1237,9 @@ const Icon *Client::icon(const otk::Size &s) const
       li = i;
     }
   }
-  if (smallest == 0xffffffff) // didnt find one bigger than us...
-    return &_icons[li];
-  return &_icons[si];
+  if (largest == 0) // didnt find one smaller than the requested size
+    return &_icons[si];
+  return &_icons[li];
 }
 
 void Client::move(int x, int y)
@@ -1711,8 +1717,6 @@ bool Client::focus()
   // visible on the screen
   if (!(frame->visible() && (_can_focus || _focus_notify))) return false;
 
-  if (_focused) return true;
-
   // do a check to see if the window has already been unmapped or destroyed
   // do this intelligently while watching out for unmaps we've generated
   // (ignore_unmaps > 0)
@@ -1756,8 +1760,6 @@ bool Client::focus()
 
 void Client::unfocus() const
 {
-  if (!_focused) return;
-
   assert(openbox->focusedClient() == this);
   openbox->setFocusedClient(0);
 }