dont provide a default icon in the python stuff, itll come from the style

[chaz/openbox] / src / client.cc

diff --git a/src/client.cc b/src/client.cc
index b3d444eae49ac24326fc2e553fbbae97407fcb5b..618277343cc5e6eaa04a10afe130c316f8e17a00 100644 (file)
--- a/src/client.cc
+++ b/src/client.cc
@@ -446,7 +446,7 @@ void Client::calcLayer() {
     }
     c = c->_transient_for;
   }
-  if (!fs) {
+  if (!fs && _fullscreen) {
     // is one of our transients focused?
     c = searchFocusTree(this, this);
     if (c) fs = true;
@@ -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
@@ -716,7 +716,7 @@ void Client::updateIcons()
   _nicons = 0;
 
   if (otk::Property::get(_window, otk::Property::atoms.net_wm_icon,
-                         otk::Property::atoms.cardinal, &num, &data)) {
+                          otk::Property::atoms.cardinal, &num, &data)) {
     // figure out how man valid icons are in here
     while (num - i > 2) {
       w = data[i++];
@@ -727,7 +727,7 @@ void Client::updateIcons()
     }
 
     _icons = new Icon[_nicons];
-
+    
     // store the icons
     i = 0;
     for (int j = 0; j < _nicons; ++j) {
@@ -738,14 +738,11 @@ void Client::updateIcons()
       i += w * h;
       assert(i <= num);
     }
-    printf("i: %lu\n", i);
-    printf("bleffffffff\n");
-    
+
     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;
@@ -1233,9 +1230,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)
@@ -1713,8 +1710,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)
@@ -1758,8 +1753,6 @@ bool Client::focus()
 
 void Client::unfocus() const
 {
-  if (!_focused) return;
-
   assert(openbox->focusedClient() == this);
   openbox->setFocusedClient(0);
 }