X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fclient.cc;h=f9676e7cf7eebd3bbb8cc87722d5f84cb80c7cb5;hb=49974f6916c98a23189daefa19dd79986629fe8f;hp=d42a962a8f9bcca3f05a212a4633f9b557c08394;hpb=51a41b9b765dbcf76ec09324f533d8c8edd46e37;p=chaz%2Fopenbox

diff --git a/src/client.cc b/src/client.cc
index d42a962a..f9676e7c 100644
--- a/src/client.cc
+++ b/src/client.cc
@@ -1,8 +1,6 @@
 // -*- mode: C++; indent-tabs-mode: nil; c-basic-offset: 2; -*-
 
-#ifdef HAVE_CONFIG_H
-# include "../config.h"
-#endif
+#include "config.h"
 
 #include "client.hh"
 #include "frame.hh"
@@ -17,19 +15,19 @@ extern "C" {
 #include <X11/Xutil.h>
 #include <X11/Xatom.h>
 
-#include <assert.h>
-
 #include "gettext.h"
 #define _(str) gettext(str)
 }
 
+#include <cstring> // for memcpy
+#include <climits>
+#include <cassert>
 #include <algorithm>
 
 namespace ob {
 
 Client::Client(int screen, Window window)
   : otk::EventHandler(),
-    WidgetBase(WidgetBase::Type_Client),
     frame(0), _screen(screen), _window(window)
 {
   assert(screen >= 0);
@@ -47,9 +45,9 @@ Client::Client(int screen, Window window)
   _urgent = false;
   _positioned = false;
   _disabled_decorations = 0;
-  _modal_child = 0;
   _group = None;
   _desktop = 0;
+  _nicons = 0;
   
   getArea();
   getDesktop();
@@ -78,7 +76,8 @@ Client::Client(int screen, Window window)
   updateIconTitle();
   updateClass();
   updateStrut();
-
+  updateIcons();
+  
   // this makes sure that these windows appear on all desktops
   if (/*_type == Type_Dock ||*/ _type == Type_Desktop)
     _desktop = 0xffffffff;
@@ -87,13 +86,17 @@ Client::Client(int screen, Window window)
   // any changes we've made here
   otk::Property::set(_window, otk::Property::atoms.net_wm_desktop,
                      otk::Property::atoms.cardinal, (unsigned)_desktop);
-  
   changeState();
 }
 
 
 Client::~Client()
 {
+  assert(_nicons > 0); // there should always be a default..
+  for (int j = 0; j < _nicons; ++j)
+    delete [] _icons[j].data;
+  delete [] _icons;
+  
   // clean up childrens' references
   while (!_transients.empty()) {
     _transients.front()->_transient_for = 0;
@@ -212,7 +215,7 @@ void Client::getType()
 void Client::setupDecorAndFunctions()
 {
   // start with everything (cept fullscreen)
-  _decorations = Decor_Titlebar | Decor_Handle | Decor_Border |
+  _decorations = Decor_Titlebar | Decor_Handle | Decor_Border | Decor_Icon |
     Decor_AllDesktops | Decor_Iconify | Decor_Maximize;
   _functions = Func_Resize | Func_Move | Func_Iconify | Func_Maximize |
     Func_Shade;
@@ -221,7 +224,8 @@ void Client::setupDecorAndFunctions()
     _functions |= Func_Close;
   }
 
-  if (!(_min_size.x() < _max_size.x() || _min_size.y() < _max_size.y())) {
+  if (!(_min_size.width() < _max_size.width() ||
+        _min_size.height() < _max_size.height())) {
     _decorations &= ~(Decor_Maximize | Decor_Handle);
     _functions &= ~(Func_Resize | Func_Maximize);
   }
@@ -264,11 +268,8 @@ void Client::setupDecorAndFunctions()
         _decorations &= ~Decor_Border;
       if (! (_mwmhints.decorations & MwmDecor_Handle))
         _decorations &= ~Decor_Handle;
-      if (! (_mwmhints.decorations & MwmDecor_Title)) {
+      if (! (_mwmhints.decorations & MwmDecor_Title))
         _decorations &= ~Decor_Titlebar;
-        // if we don't have a titlebar, then we cannot shade!
-        _functions &= ~Func_Shade;
-      }
       if (! (_mwmhints.decorations & MwmDecor_Iconify))
         _decorations &= ~Decor_Iconify;
       if (! (_mwmhints.decorations & MwmDecor_Maximize))
@@ -313,16 +314,17 @@ void Client::setupDecorAndFunctions()
   if (_disabled_decorations & Decor_Close)
     _decorations &= ~Decor_Close;
 
-  // You can't shade without a titlebar
+  // if we don't have a titlebar, then we cannot shade!
   if (!(_decorations & Decor_Titlebar))
     _functions &= ~Func_Shade;
-  
+
   changeAllowedActions();
 
   if (frame) {
     frame->adjustSize(); // change the decors on the frame
     frame->adjustPosition(); // with more/less decorations, we may need to be
                              // moved
+    remaximize(); // with new decor, the window's maximized size may change
   }
 }
 
@@ -358,7 +360,7 @@ void Client::getArea()
   ret = XGetWindowAttributes(**otk::display, _window, &wattrib);
   assert(ret != BadWindow);
 
-  _area.setRect(wattrib.x, wattrib.y, wattrib.width, wattrib.height);
+  _area = otk::Rect(wattrib.x, wattrib.y, wattrib.width, wattrib.height);
   _border_width = wattrib.border_width;
 }
 
@@ -400,7 +402,6 @@ void Client::getState()
   }
 }
 
-
 void Client::getShaped()
 {
   _shaped = false;
@@ -419,12 +420,40 @@ void Client::getShaped()
 #endif // SHAPE
 }
 
+Client *Client::searchFocusTree(Client *node, Client *skip)
+{
+  List::const_iterator it, end = node->_transients.end();
+  Client *ret;
+
+  for (it = node->_transients.begin(); it != end; ++it) {
+    if (*it == skip) continue; // circular?
+    if ((ret = searchModalTree(*it, skip))) return ret; // got one
+    if ((*it)->_focused) return *it; // got one
+  }
+  return 0;
+}
 
 void Client::calcLayer() {
   StackLayer l;
+  bool fs = false;
 
+  // are we fullscreen, or do we have a fullscreen transient parent?
+  Client *c = this;
+  while (c) {
+    if (c->_fullscreen) {
+      fs =true;
+      break;
+    }
+    c = c->_transient_for;
+  }
+  if (!fs && _fullscreen) {
+    // is one of our transients focused?
+    c = searchFocusTree(this, this);
+    if (c) fs = true;
+  }
+  
   if (_iconic) l = Layer_Icon;
-  else if (_fullscreen) l = Layer_Fullscreen;
+  else if (fs) l = Layer_Fullscreen;
   else if (_type == Type_Desktop) l = Layer_Desktop;
   else if (_type == Type_Dock) {
     if (!_below) l = Layer_Top;
@@ -446,7 +475,6 @@ void Client::calcLayer() {
   }
 }
 
-
 void Client::updateProtocols()
 {
   Atom *proto;
@@ -469,7 +497,6 @@ void Client::updateProtocols()
   }
 }
 
-
 void Client::updateNormalHints()
 {
   XSizeHints size;
@@ -479,10 +506,10 @@ void Client::updateNormalHints()
   // defaults
   _min_ratio = 0.0;
   _max_ratio = 0.0;
-  _size_inc.setPoint(1, 1);
-  _base_size.setPoint(0, 0);
-  _min_size.setPoint(0, 0);
-  _max_size.setPoint(INT_MAX, INT_MAX);
+  _size_inc = otk::Size(1, 1);
+  _base_size = otk::Size(0, 0);
+  _min_size = otk::Size(0, 0);
+  _max_size = otk::Size(INT_MAX, INT_MAX);
 
   // get the hints from the window
   if (XGetWMNormalHints(**otk::display, _window, &size, &ret)) {
@@ -495,9 +522,9 @@ void Client::updateNormalHints()
       // changing its gravity
       if (frame && _gravity != oldgravity) {
         // move our idea of the client's position based on its new gravity
-        int x = frame->rect().x(), y = frame->rect().y();
+        int x = frame->area().x(), y = frame->area().y();
         frame->frameGravity(x, y);
-        _area.setPos(x, y);
+        _area = otk::Rect(otk::Point(x, y), _area.size());
       }
     }
 
@@ -507,20 +534,19 @@ void Client::updateNormalHints()
     }
 
     if (size.flags & PMinSize)
-      _min_size.setPoint(size.min_width, size.min_height);
+      _min_size = otk::Size(size.min_width, size.min_height);
     
     if (size.flags & PMaxSize)
-      _max_size.setPoint(size.max_width, size.max_height);
+      _max_size = otk::Size(size.max_width, size.max_height);
     
     if (size.flags & PBaseSize)
-      _base_size.setPoint(size.base_width, size.base_height);
+      _base_size = otk::Size(size.base_width, size.base_height);
     
     if (size.flags & PResizeInc)
-      _size_inc.setPoint(size.width_inc, size.height_inc);
+      _size_inc = otk::Size(size.width_inc, size.height_inc);
   }
 }
 
-
 void Client::updateWMHints(bool initstate)
 {
   XWMHints *hints;
@@ -555,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
@@ -565,7 +591,6 @@ void Client::updateWMHints(bool initstate)
   }
 }
 
-
 void Client::updateTitle()
 {
   _title = "";
@@ -582,10 +607,9 @@ void Client::updateTitle()
     _title = _("Unnamed Window");
 
   if (frame)
-    frame->setTitle(_title);
+    frame->adjustTitle();
 }
 
-
 void Client::updateIconTitle()
 {
   _icon_title = "";
@@ -602,7 +626,6 @@ void Client::updateIconTitle()
     _icon_title = _("Unnamed Window");
 }
 
-
 void Client::updateClass()
 {
   // set the defaults
@@ -625,7 +648,6 @@ void Client::updateClass()
   }
 }
 
-
 void Client::updateStrut()
 {
   unsigned long num = 4;
@@ -643,13 +665,12 @@ void Client::updateStrut()
     // updating here is pointless while we're being mapped cuz we're not in
     // the screen's client list yet
     if (frame)
-      openbox->screen(_screen)->updateStrut();
+      openbox->screen(_screen)->updateStruts();
   }
 
   delete [] data;
 }
 
-
 void Client::updateTransientFor()
 {
   Window t = 0;
@@ -674,21 +695,72 @@ void Client::updateTransientFor()
 
   // if anything has changed...
   if (c != _transient_for) {
-    bool m = _modal;
-    if (_modal)
-      setModal(false);
-    
     if (_transient_for)
       _transient_for->_transients.remove(this); // remove from old parent
     _transient_for = c;
     if (_transient_for)
       _transient_for->_transients.push_back(this); // add to new parent
-
-    if (m)
-      setModal(true);
   }
 }
 
+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;
+  if (_nicons > 0)
+    delete [] _icons;
+  _nicons = 0;
+
+  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];
+
+  // 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);
+  }
+
+  if (freeit)
+    delete [] data;
+
+  if (_nicons <= 0) {
+    _nicons = 1;
+    _icons = new Icon[1];
+    _icons[i].w = 0;
+    _icons[i].h = 0;
+    _icons[i].data = 0;
+  }
+
+  assert(_nicons > 0); // there should always be a default..
+  
+  if (frame) frame->adjustIcon();
+}
 
 void Client::propertyHandler(const XPropertyEvent &e)
 {
@@ -733,126 +805,65 @@ void Client::propertyHandler(const XPropertyEvent &e)
   }
   else if (e.atom == otk::Property::atoms.net_wm_strut)
     updateStrut();
+  else if (e.atom == otk::Property::atoms.net_wm_icon)
+    updateIcons();
 }
 
-
 void Client::setWMState(long state)
 {
   if (state == _wmstate) return; // no change
   
   switch (state) {
   case IconicState:
-    setDesktop(ICONIC_DESKTOP);
+    iconify(true);
     break;
   case NormalState:
-    setDesktop(openbox->screen(_screen)->desktop());
+    iconify(false);
     break;
   }
 }
 
-
-void Client::setDesktop(long target)
+void Client::setDesktop(unsigned int target)
 {
   if (target == _desktop) return;
   
-  printf("Setting desktop %ld\n", target);
+  printf("Setting desktop %u\n", target);
 
-  if (!(target >= 0 || target == (signed)0xffffffff ||
-        target == ICONIC_DESKTOP))
+  if (!(target < openbox->screen(_screen)->numDesktops() ||
+        target == 0xffffffff))
     return;
-  
-  _desktop = target;
 
-  // set the desktop hint, but not if we're iconifying
-  if (_desktop != ICONIC_DESKTOP)
-    otk::Property::set(_window, otk::Property::atoms.net_wm_desktop,
-                       otk::Property::atoms.cardinal, (unsigned)_desktop);
-  
+  _desktop = target;
+  // set the desktop hint
+  otk::Property::set(_window, otk::Property::atoms.net_wm_desktop,
+                     otk::Property::atoms.cardinal, _desktop);
+  frame->adjustState(); // the frame can display the current desktop state
   // 'move' the window to the new desktop
-  if (_desktop == openbox->screen(_screen)->desktop() ||
-      _desktop == (signed)0xffffffff)
-    frame->show();
-  else
-    frame->hide();
-
-  // Handle Iconic state. Iconic state is maintained by the client being a
-  // member of the ICONIC_DESKTOP, so this is where we make iconifying and
-  // uniconifying happen.
-  bool i = _desktop == ICONIC_DESKTOP;
-  if (i != _iconic) { // has the state changed?
-    _iconic = i;
-    if (_iconic) {
-      _wmstate = IconicState;
-      ignore_unmaps++;
-      // we unmap the client itself so that we can get MapRequest events, and
-      // because the ICCCM tells us to!
-      XUnmapWindow(**otk::display, _window);
-    } else {
-      _wmstate = NormalState;
-      XMapWindow(**otk::display, _window);
-    }
-    changeState();
-  }
-  
-  frame->adjustState();
+  showhide();
+  openbox->screen(_screen)->updateStruts();
 }
 
-
-Client *Client::findModalChild(Client *skip) const
+void Client::showhide()
 {
-  Client *ret = 0;
-  
-  // find a modal child recursively and try focus it
-  List::const_iterator it, end = _transients.end();
-  for (it = _transients.begin(); it != end; ++it)
-    if ((*it)->_modal && *it != skip)
-      return *it; // got one
-  // none of our direct children are modal, let them try check
-  for (it = _transients.begin(); it != end; ++it)
-    if ((ret = (*it)->findModalChild()))
-      return ret; // got one
-  return ret;
-}
+  bool show;
+  Screen *s = openbox->screen(_screen);
 
+  if (_iconic) show = false;
+  else if (!(_desktop == s->desktop() ||
+             _desktop == 0xffffffff)) show = false;
+  else if (normal() && s->showingDesktop()) show = false;
+  else show = true;
 
-void Client::setModal(bool modal)
-{
-  if (modal == _modal) return;
-  
-  if (modal) {
-    Client *c = this;
-    while (c->_transient_for) {
-      c = c->_transient_for;
-      if (c->_modal_child) break; // already has a modal child
-      c->_modal_child = this;
-    }
-  } else {
-    // try find a replacement modal dialog
-    Client *replacement = 0;
-    
-    Client *c = this;
-    while (c->_transient_for) // go up the tree
-      c = c->_transient_for;
-    replacement = c->findModalChild(this); // find a modal child, skipping this
-
-    c = this;
-    while (c->_transient_for) {
-      c = c->_transient_for;
-      if (c->_modal_child != this) break; // has a different modal child
-      c->_modal_child = replacement;
-    }
-  }
-  _modal = modal;
+  if (show) frame->show();
+  else      frame->hide();
 }
 
-
 void Client::setState(StateAction action, long data1, long data2)
 {
   bool shadestate = _shaded;
   bool fsstate = _fullscreen;
   bool maxh = _max_horz;
   bool maxv = _max_vert;
-  bool modal = _modal;
 
   if (!(action == State_Add || action == State_Remove ||
         action == State_Toggle))
@@ -888,7 +899,7 @@ void Client::setState(StateAction action, long data1, long data2)
     if (action == State_Add) {
       if (state == otk::Property::atoms.net_wm_state_modal) {
         if (_modal) continue;
-        modal = true;
+        _modal = true;
       } else if (state == otk::Property::atoms.net_wm_state_maximized_vert) {
         maxv = true;
       } else if (state == otk::Property::atoms.net_wm_state_maximized_horz) {
@@ -913,7 +924,7 @@ void Client::setState(StateAction action, long data1, long data2)
     } else { // action == State_Remove
       if (state == otk::Property::atoms.net_wm_state_modal) {
         if (!_modal) continue;
-        modal = false;
+        _modal = false;
       } else if (state == otk::Property::atoms.net_wm_state_maximized_vert) {
         maxv = false;
       } else if (state == otk::Property::atoms.net_wm_state_maximized_horz) {
@@ -950,8 +961,6 @@ void Client::setState(StateAction action, long data1, long data2)
         maximize(maxv, 2, true);
     }
   }
-  if (modal != _modal)
-    setModal(modal);
   // change fullscreen state before shading, as it will affect if the window
   // can shade or not
   if (fsstate != _fullscreen)
@@ -962,7 +971,6 @@ void Client::setState(StateAction action, long data1, long data2)
   changeState(); // change the hint to relect these changes
 }
 
-
 void Client::toggleClientBorder(bool addborder)
 {
   // adjust our idea of where the client is, based on its border. When the
@@ -1014,7 +1022,7 @@ void Client::toggleClientBorder(bool addborder)
     else           y += _border_width;
     break;
   }
-  _area.setPos(x, y);
+  _area = otk::Rect(otk::Point(x, y), _area.size());
 
   if (addborder) {
     XSetWindowBorderWidth(**otk::display, _window, _border_width);
@@ -1026,7 +1034,6 @@ void Client::toggleClientBorder(bool addborder)
     XSetWindowBorderWidth(**otk::display, _window, 0);
 }
 
-
 void Client::clientMessageHandler(const XClientMessageEvent &e)
 {
   otk::EventHandler::clientMessageHandler(e);
@@ -1088,15 +1095,23 @@ void Client::clientMessageHandler(const XClientMessageEvent &e)
 #ifdef DEBUG
     printf("net_active_window for 0x%lx\n", _window);
 #endif
+    if (openbox->screen(_screen)->showingDesktop())
+      openbox->screen(_screen)->showDesktop(false);
     if (_iconic)
-      setDesktop(openbox->screen(_screen)->desktop());
+      iconify(false);
+    else if (!frame->visible()) // if its not visible for other reasons, then
+      return;                   // don't mess with it
     if (_shaded)
       shade(false);
     focus();
     openbox->screen(_screen)->raiseWindow(this);
   } else if (e.message_type == otk::Property::atoms.openbox_active_window) {
+    if (openbox->screen(_screen)->showingDesktop())
+      openbox->screen(_screen)->showDesktop(false);
     if (_iconic)
-      setDesktop(openbox->screen(_screen)->desktop());
+      iconify(false);
+    else if (!frame->visible()) // if its not visible for other reasons, then
+      return;                   // don't mess with it
     if (e.data.l[0] && _shaded)
       shade(false);
     focus();
@@ -1105,7 +1120,6 @@ void Client::clientMessageHandler(const XClientMessageEvent &e)
   }
 }
 
-
 #if defined(SHAPE)
 void Client::shapeHandler(const XShapeEvent &e)
 {
@@ -1118,30 +1132,28 @@ void Client::shapeHandler(const XShapeEvent &e)
 }
 #endif
 
-
 void Client::resize(Corner anchor, int w, int h)
 {
   if (!(_functions & Func_Resize)) return;
   internal_resize(anchor, w, h);
 }
 
-
-void Client::internal_resize(Corner anchor, int w, int h, bool user,
-                             int x, int y)
+void Client::internal_resize(Corner anchor, int w, int h,
+                             bool user, int x, int y)
 {
-  w -= _base_size.x(); 
-  h -= _base_size.y();
+  w -= _base_size.width();
+  h -= _base_size.height();
 
   if (user) {
     // for interactive resizing. have to move half an increment in each
     // direction.
-    int mw = w % _size_inc.x(); // how far we are towards the next size inc
-    int mh = h % _size_inc.y();
-    int aw = _size_inc.x() / 2; // amount to add
-    int ah = _size_inc.y() / 2;
+    int mw = w % _size_inc.width(); // how far we are towards the next size inc
+    int mh = h % _size_inc.height();
+    int aw = _size_inc.width() / 2; // amount to add
+    int ah = _size_inc.height() / 2;
     // don't let us move into a new size increment
-    if (mw + aw >= _size_inc.x()) aw = _size_inc.x() - mw - 1;
-    if (mh + ah >= _size_inc.y()) ah = _size_inc.y() - mh - 1;
+    if (mw + aw >= _size_inc.width()) aw = _size_inc.width() - mw - 1;
+    if (mh + ah >= _size_inc.height()) ah = _size_inc.height() - mh - 1;
     w += aw;
     h += ah;
     
@@ -1149,10 +1161,10 @@ void Client::internal_resize(Corner anchor, int w, int h, bool user,
     // and aspect ratios
 
     // smaller than min size or bigger than max size?
-    if (w < _min_size.x()) w = _min_size.x();
-    else if (w > _max_size.x()) w = _max_size.x();
-    if (h < _min_size.y()) h = _min_size.y();
-    else if (h > _max_size.y()) h = _max_size.y();
+    if (w > _max_size.width()) w = _max_size.width();
+    if (w < _min_size.width()) w = _min_size.width();
+    if (h > _max_size.height()) h = _max_size.height();
+    if (h < _min_size.height()) h = _min_size.height();
 
     // adjust the height ot match the width for the aspect ratios
     if (_min_ratio)
@@ -1162,21 +1174,21 @@ void Client::internal_resize(Corner anchor, int w, int h, bool user,
   }
 
   // keep to the increments
-  w /= _size_inc.x();
-  h /= _size_inc.y();
+  w /= _size_inc.width();
+  h /= _size_inc.height();
 
   // you cannot resize to nothing
   if (w < 1) w = 1;
   if (h < 1) h = 1;
   
   // store the logical size
-  _logical_size.setPoint(w, h);
+  _logical_size = otk::Size(w, h);
 
-  w *= _size_inc.x();
-  h *= _size_inc.y();
+  w *= _size_inc.width();
+  h *= _size_inc.height();
 
-  w += _base_size.x();
-  h += _base_size.y();
+  w += _base_size.width();
+  h += _base_size.height();
 
   if (x == INT_MIN || y == INT_MIN) {
     x = _area.x();
@@ -1197,7 +1209,7 @@ void Client::internal_resize(Corner anchor, int w, int h, bool user,
     }
   }
 
-  _area.setSize(w, h);
+  _area = otk::Rect(_area.position(), otk::Size(w, h));
 
   XResizeWindow(**otk::display, _window, w, h);
 
@@ -1206,6 +1218,29 @@ void Client::internal_resize(Corner anchor, int w, int h, bool user,
   internal_move(x, y);
 }
 
+const Icon *Client::icon(const otk::Size &s) const
+{
+  unsigned long req = s.width() * s.height();
+  // si is the smallest image >= req
+  // li is the largest image < req
+  unsigned long smallest = 0xffffffff, largest = 0, si = 0, li = 0;
+
+  assert(_nicons > 0); // there should always be a default..
+  for (int i = 0; i < _nicons; ++i) {
+    unsigned long size = _icons[i].w * _icons[i].h;
+    if (size < smallest && size >= req) {
+      smallest = size;
+      si = i;
+    }
+    if (size > largest && size <= req) {
+      largest = size;
+      li = i;
+    }
+  }
+  if (smallest == 0xffffffff) // didnt find one bigger than us...
+    return &_icons[li];
+  return &_icons[si];
+}
 
 void Client::move(int x, int y)
 {
@@ -1215,10 +1250,9 @@ void Client::move(int x, int y)
   internal_move(x, y);
 }
 
-
 void Client::internal_move(int x, int y)
 {
-  _area.setPos(x, y);
+  _area = otk::Rect(otk::Point(x, y), _area.size());
 
   // move the frame to be in the requested position
   if (frame) { // this can be called while mapping, before frame exists
@@ -1251,7 +1285,6 @@ void Client::internal_move(int x, int y)
   }
 }
 
-
 void Client::close()
 {
   XEvent ce;
@@ -1277,7 +1310,6 @@ void Client::close()
   XSendEvent(**otk::display, _window, false, NoEventMask, &ce);
 }
 
-
 void Client::changeState()
 {
   unsigned long state[2];
@@ -1317,7 +1349,6 @@ void Client::changeState()
     frame->adjustState();
 }
 
-
 void Client::changeAllowedActions(void)
 {
   Atom actions[9];
@@ -1344,8 +1375,22 @@ void Client::changeAllowedActions(void)
 
   otk::Property::set(_window, otk::Property::atoms.net_wm_allowed_actions,
                      otk::Property::atoms.atom, actions, num);
-}
 
+  // make sure the window isn't breaking any rules now
+  
+  if (!(_functions & Func_Shade) && _shaded)
+    if (frame) shade(false);
+    else _shaded = false;
+  if (!(_functions & Func_Iconify) && _iconic)
+    if (frame) setDesktop(openbox->screen(_screen)->desktop());
+    else _iconic = false;
+  if (!(_functions & Func_Fullscreen) && _fullscreen)
+    if (frame) fullscreen(false);
+    else _fullscreen = false;
+  if (!(_functions & Func_Maximize) && (_max_horz || _max_vert))
+    if (frame) maximize(false, 0);
+    else _max_vert = _max_horz = false;
+}
 
 void Client::remaximize()
 {
@@ -1362,19 +1407,13 @@ void Client::remaximize()
   maximize(true, dir, false);
 }
 
-
 void Client::applyStartupState()
 {
   // these are in a carefully crafted order..
 
-  if (_modal) {
-    _modal = false;
-    setModal(true);
-  }
-  
   if (_iconic) {
     _iconic = false;
-    setDesktop(ICONIC_DESKTOP);
+    iconify(true);
   }
   if (_fullscreen) {
     _fullscreen = false;
@@ -1405,7 +1444,6 @@ void Client::applyStartupState()
   if (_below);        // nothing to do for this
 }
 
-
 void Client::fireUrgent()
 {
   // call the python UrgentWindow callbacks
@@ -1413,7 +1451,6 @@ void Client::fireUrgent()
   openbox->bindings()->fireEvent(&data);
 }
 
-
 void Client::shade(bool shade)
 {
   if (!(_functions & Func_Shade) || // can't
@@ -1427,7 +1464,6 @@ void Client::shade(bool shade)
   frame->adjustSize();
 }
 
-
 void Client::maximize(bool max, int dir, bool savearea)
 {
   assert(dir == 0 || dir == 1 || dir == 2);
@@ -1444,8 +1480,8 @@ void Client::maximize(bool max, int dir, bool savearea)
     if (dir == 2 && !_max_vert) return;
   }
 
-  const otk::Rect &a = openbox->screen(_screen)->area();
-  int x = frame->rect().x(), y = frame->rect().y(),
+  const otk::Rect &a = openbox->screen(_screen)->area(_desktop);
+  int x = frame->area().x(), y = frame->area().y(),
     w = _area.width(), h = _area.height();
   
   if (max) {
@@ -1534,7 +1570,6 @@ void Client::maximize(bool max, int dir, bool savearea)
   internal_resize(TopLeft, w, h, true, x, y);
 }
 
-
 void Client::fullscreen(bool fs, bool savearea)
 {
   static FunctionFlags saved_func;
@@ -1568,8 +1603,8 @@ void Client::fullscreen(bool fs, bool savearea)
     const otk::ScreenInfo *info = otk::display->screenInfo(_screen);
     x = 0;
     y = 0;
-    w = info->width();
-    h = info->height();
+    w = info->size().width();
+    h = info->size().height();
   } else {
     _functions = saved_func;
     _decorations = saved_decor;
@@ -1589,7 +1624,7 @@ void Client::fullscreen(bool fs, bool savearea)
       delete dimensions;
     } else {
       // pick some fallbacks...
-      const otk::Rect &a = openbox->screen(_screen)->area();
+      const otk::Rect &a = openbox->screen(_screen)->area(_desktop);
       x = a.x() + a.width() / 4;
       y = a.y() + a.height() / 4;
       w = a.width() / 2;
@@ -1609,6 +1644,32 @@ void Client::fullscreen(bool fs, bool savearea)
   if (fs) focus();
 }
 
+void Client::iconify(bool iconic, bool curdesk)
+{
+  if (_iconic == iconic) return; // nothing to do
+
+#ifdef DEBUG
+    printf("%sconifying window: 0x%lx\n", (iconic ? "I" : "Uni"), _window);
+#endif
+
+  _iconic = iconic;
+
+  if (_iconic) {
+    _wmstate = IconicState;
+    ignore_unmaps++;
+    // we unmap the client itself so that we can get MapRequest events, and
+    // because the ICCCM tells us to!
+    XUnmapWindow(**otk::display, _window);
+  } else {
+    if (curdesk)
+      setDesktop(openbox->screen(_screen)->desktop());
+    _wmstate = NormalState;
+    XMapWindow(**otk::display, _window);
+  }
+  changeState();
+  showhide();
+  openbox->screen(_screen)->updateStruts();
+}
 
 void Client::disableDecorations(DecorationFlags flags)
 {
@@ -1616,7 +1677,6 @@ void Client::disableDecorations(DecorationFlags flags)
   setupDecorAndFunctions();
 }
 
-
 void Client::installColormap(bool install) const
 {
   XWindowAttributes wa;
@@ -1628,16 +1688,34 @@ void Client::installColormap(bool install) const
   }
 }
 
+Client *Client::searchModalTree(Client *node, Client *skip)
+{
+  List::const_iterator it, end = node->_transients.end();
+  Client *ret;
+  
+  for (it = node->_transients.begin(); it != end; ++it) {
+    if (*it == skip) continue; // circular?
+    if ((ret = searchModalTree(*it, skip))) return ret; // got one
+    if ((*it)->_modal) return *it; // got one
+  }
+  return 0;
+}
+
+Client *Client::findModalChild()
+{
+  return searchModalTree(this, this);
+}
+
 
 bool Client::focus()
 {
   // if we have a modal child, then focus it, not us
-  if (_modal_child)
-    return _modal_child->focus();
+  Client *c = findModalChild();
+  if (c) return c->focus();
 
   // won't try focus if the client doesn't want it, or if the window isn't
   // visible on the screen
-  if (!(frame->isVisible() && (_can_focus || _focus_notify))) return false;
+  if (!(frame->visible() && (_can_focus || _focus_notify))) return false;
 
   if (_focused) return true;
 
@@ -1699,8 +1777,10 @@ void Client::focusHandler(const XFocusChangeEvent &e)
   
   otk::EventHandler::focusHandler(e);
 
-  frame->focus();
   _focused = true;
+  frame->adjustFocus();
+
+  calcLayer(); // focus state can affect the stacking layer
 
   openbox->setFocusedClient(this);
 }
@@ -1714,21 +1794,45 @@ void Client::unfocusHandler(const XFocusChangeEvent &e)
   
   otk::EventHandler::unfocusHandler(e);
 
-  frame->unfocus();
   _focused = false;
+  frame->adjustFocus();
+
+  calcLayer(); // focus state can affect the stacking layer
 
   if (openbox->focusedClient() == this)
     openbox->setFocusedClient(0);
 }
 
 
-void Client::configureRequestHandler(const XConfigureRequestEvent &e)
+void Client::configureRequestHandler(const XConfigureRequestEvent &ec)
 {
 #ifdef    DEBUG
-  printf("ConfigureRequest for 0x%lx\n", e.window);
+  printf("ConfigureRequest for 0x%lx\n", ec.window);
 #endif // DEBUG
   
-  otk::EventHandler::configureRequestHandler(e);
+  otk::EventHandler::configureRequestHandler(ec);
+
+  // compress these
+  XConfigureRequestEvent e = ec;
+  XEvent ev;
+  while (XCheckTypedWindowEvent(**otk::display, window(), ConfigureRequest,
+                                &ev)) {
+    // XXX if this causes bad things.. we can compress config req's with the
+    //     same mask.
+    e.value_mask |= ev.xconfigurerequest.value_mask;
+    if (ev.xconfigurerequest.value_mask & CWX)
+      e.x = ev.xconfigurerequest.x;
+    if (ev.xconfigurerequest.value_mask & CWY)
+      e.y = ev.xconfigurerequest.y;
+    if (ev.xconfigurerequest.value_mask & CWWidth)
+      e.width = ev.xconfigurerequest.width;
+    if (ev.xconfigurerequest.value_mask & CWHeight)
+      e.height = ev.xconfigurerequest.height;
+    if (ev.xconfigurerequest.value_mask & CWBorderWidth)
+      e.border_width = ev.xconfigurerequest.border_width;
+    if (ev.xconfigurerequest.value_mask & CWStackMode)
+      e.detail = ev.xconfigurerequest.detail;
+  }
 
   // if we are iconic (or shaded (fvwm does this)) ignore the event
   if (_iconic || _shaded) return;
@@ -1859,7 +1963,7 @@ void Client::mapRequestHandler(const XMapRequestEvent &e)
   assert(_iconic); // we shouldn't be able to get this unless we're iconic
 
   // move to the current desktop (uniconify)
-  setDesktop(openbox->screen(_screen)->desktop());
+  iconify(false);
   // XXX: should we focus/raise the window? (basically a net_wm_active_window)
 }