X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FWorkspace.cc;h=619b520548e8f6b6e12e7b4fd775ae04f91f2526;hb=63f8386dde9fb610492dd9a10d0a688f16d0dcf4;hp=f25ff0f213fc2bcced7179c5c045b4cf175af945;hpb=b8dd077ab0d46e044da324623e1253422621b687;p=chaz%2Fopenbox

diff --git a/src/Workspace.cc b/src/Workspace.cc
index f25ff0f2..619b5205 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -31,6 +31,18 @@
 #  include "../config.h"
 #endif // HAVE_CONFIG_H
 
+#ifdef    HAVE_STDIO_H
+#  include <stdio.h>
+#endif // HAVE_STDIO_H
+
+#ifdef    HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
+#  include <string.h>
+#endif // HAVE_STRING_H
+
 #include <X11/Xlib.h>
 #include <X11/Xatom.h>
 
@@ -41,48 +53,27 @@
 #include "Toolbar.h"
 #include "Window.h"
 #include "Workspace.h"
-
 #include "Windowmenu.h"
 #include "Geometry.h"
 #include "Util.h"
 
-#ifdef    HAVE_STDIO_H
-#  include <stdio.h>
-#endif // HAVE_STDIO_H
-
-#ifdef    HAVE_STDLIB_H
-#  include <stdlib.h>
-#endif // HAVE_STDLIB_H
-
-#ifdef    HAVE_STRING_H
-#  include <string.h>
-#endif // HAVE_STRING_H
-
-#include <vector>
 #include <algorithm>
-typedef vector<Rect> rectList;
+#include <vector>
+typedef std::vector<Rect> rectList;
 
 Workspace::Workspace(BScreen &scrn, int i) : screen(scrn) {
-
-  cascade_x = cascade_y = 32;
-
+  cascade_x = cascade_y = 0;
+  _focused = _last = (OpenboxWindow *) 0;
   id = i;
 
-  stackingList = new LinkedList<OpenboxWindow>;
-  windowList = new LinkedList<OpenboxWindow>;
   clientmenu = new Clientmenu(*this);
 
-  lastfocus = (OpenboxWindow *) 0;
-
   name = (char *) 0;
-  char *tmp = screen.getNameOfWorkspace(id);
-  setName(tmp);
+  setName(screen.getNameOfWorkspace(id));
 }
 
 
 Workspace::~Workspace(void) {
-  delete stackingList;
-  delete windowList;
   delete clientmenu;
 
   if (name)
@@ -90,16 +81,16 @@ Workspace::~Workspace(void) {
 }
 
 
-const int Workspace::addWindow(OpenboxWindow *w, Bool place) {
+int Workspace::addWindow(OpenboxWindow *w, bool place) {
   if (! w) return -1;
 
-  if (place) placeWindow(w);
+  if (place) placeWindow(*w);
 
   w->setWorkspace(id);
-  w->setWindowNumber(windowList->count());
+  w->setWindowNumber(_windows.size());
 
-  stackingList->insert(w, 0);
-  windowList->insert(w);
+  _zorder.push_front(w);
+  _windows.push_back(w);
 
   clientmenu->insert((const char **) w->getTitle());
   clientmenu->update();
@@ -112,71 +103,72 @@ const int Workspace::addWindow(OpenboxWindow *w, Bool place) {
 }
 
 
-const int Workspace::removeWindow(OpenboxWindow *w) {
+int Workspace::removeWindow(OpenboxWindow *w) {
   if (! w) return -1;
 
-  stackingList->remove(w);
+  _zorder.remove(w);
 
   if (w->isFocused()) {
+    if (w == _last)
+      _last = (OpenboxWindow *) 0;
+    
+    OpenboxWindow *fw = (OpenboxWindow *) 0;
     if (w->isTransient() && w->getTransientFor() &&
-	w->getTransientFor()->isVisible()) {
-      w->getTransientFor()->setInputFocus();
-    } else if (screen.sloppyFocus()) {
-      screen.getOpenbox().setFocusedWindow((OpenboxWindow *) 0);
-    } else {
-      OpenboxWindow *top = stackingList->first();
-      if (! top || ! top->setInputFocus()) {
-	screen.getOpenbox().setFocusedWindow((OpenboxWindow *) 0);
-	XSetInputFocus(screen.getOpenbox().getXDisplay(),
-		       screen.getToolbar()->getWindowID(),
-		       RevertToParent, CurrentTime);
-      }
-    }
+	w->getTransientFor()->isVisible())
+      fw = w->getTransientFor();
+    else if (screen.sloppyFocus())             // sloppy focus
+      fw = (OpenboxWindow *) 0;
+    else if (!_zorder.empty())                 // click focus
+      fw = _zorder.front();
+
+    if (!(fw != (OpenboxWindow *) 0 && fw->setInputFocus()))
+      screen.getOpenbox().focusWindow(0);
   }
   
-  if (lastfocus == w)
-    lastfocus = (OpenboxWindow *) 0;
-
-  windowList->remove(w->getWindowNumber());
+  _windows.erase(_windows.begin() + w->getWindowNumber());
   clientmenu->remove(w->getWindowNumber());
   clientmenu->update();
 
   screen.updateNetizenWindowDel(w->getClientWindow());
 
-  LinkedListIterator<OpenboxWindow> it(windowList);
-  OpenboxWindow *bw = it.current();
-  for (int i = 0; bw; it++, i++, bw = it.current())
-    bw->setWindowNumber(i);
+  winVect::iterator it = _windows.begin();
+  for (int i=0; it != _windows.end(); ++it, ++i)
+    (*it)->setWindowNumber(i);
 
-  return windowList->count();
+  return _windows.size();
 }
 
 
-void Workspace::showAll(void) {
-  LinkedListIterator<OpenboxWindow> it(stackingList);
-  for (OpenboxWindow *bw = it.current(); bw; it++, bw = it.current())
-    bw->deiconify(False, False);
+void Workspace::focusWindow(OpenboxWindow *win) {
+  if (win != (OpenboxWindow *) 0)
+    clientmenu->setItemSelected(win->getWindowNumber(), true);
+  if (_focused != (OpenboxWindow *) 0)
+    clientmenu->setItemSelected(_focused->getWindowNumber(), false);
+  _focused = win;
+  if (win != (OpenboxWindow *) 0)
+    _last = win;
 }
 
 
-void Workspace::hideAll(void) {
-  LinkedList<OpenboxWindow> lst;
+void Workspace::showAll(void) {
+  winList::iterator it;
+  for (it = _zorder.begin(); it != _zorder.end(); ++it)
+    (*it)->deiconify(false, false);
+}
 
-  LinkedListIterator<OpenboxWindow> it(stackingList);
-  for (OpenboxWindow *bw = it.current(); bw; it++, bw = it.current())
-    lst.insert(bw, 0);
 
-  LinkedListIterator<OpenboxWindow> it2(&lst);
-  for (OpenboxWindow *bw = it2.current(); bw; it2++, bw = it2.current())
-    if (! bw->isStuck())
-      bw->withdraw();
+void Workspace::hideAll(void) {
+  winList::reverse_iterator it;
+  for (it = _zorder.rbegin(); it != _zorder.rend(); ++it)
+    if (!(*it)->isStuck())
+      (*it)->withdraw();
 }
 
 
 void Workspace::removeAll(void) {
-  LinkedListIterator<OpenboxWindow> it(windowList);
-  for (OpenboxWindow *bw = it.current(); bw; it++, bw = it.current())
-    bw->iconify();
+  winVect::iterator it;
+  for (it = _windows.begin(); it != _windows.end(); ++it)
+    (*it)->iconify();
 }
 
 
@@ -198,14 +190,14 @@ void Workspace::raiseWindow(OpenboxWindow *w) {
   Workspace *wkspc;
 
   win = bottom;
-  while (True) {
+  while (true) {
     *(curr++) = win->getFrameWindow();
     screen.updateNetizenWindowRaise(win->getClientWindow());
 
     if (! win->isIconic()) {
       wkspc = screen.getWorkspace(win->getWorkspaceNumber());
-      wkspc->stackingList->remove(win);
-      wkspc->stackingList->insert(win, 0);
+      wkspc->_zorder.remove(win);
+      wkspc->_zorder.push_front(win);
     }
 
     if (! win->hasTransient() || ! win->getTransient())
@@ -237,14 +229,14 @@ void Workspace::lowerWindow(OpenboxWindow *w) {
   Window *nstack = new Window[i], *curr = nstack;
   Workspace *wkspc;
 
-  while (True) {
+  while (true) {
     *(curr++) = win->getFrameWindow();
     screen.updateNetizenWindowLower(win->getClientWindow());
 
     if (! win->isIconic()) {
       wkspc = screen.getWorkspace(win->getWorkspaceNumber());
-      wkspc->stackingList->remove(win);
-      wkspc->stackingList->insert(win);
+      wkspc->_zorder.remove(win);
+      wkspc->_zorder.push_back(win);
     }
 
     if (! win->getTransientFor())
@@ -267,48 +259,43 @@ void Workspace::lowerWindow(OpenboxWindow *w) {
 void Workspace::reconfigure(void) {
   clientmenu->reconfigure();
 
-  LinkedListIterator<OpenboxWindow> it(windowList);
-  for (OpenboxWindow *bw = it.current(); bw; it++, bw = it.current()) {
-    if (bw->validateClient())
-      bw->reconfigure();
-  }
+  winVect::iterator it;
+  for (it = _windows.begin(); it != _windows.end(); ++it)
+    if ((*it)->validateClient())
+      (*it)->reconfigure();
 }
 
 
 OpenboxWindow *Workspace::getWindow(int index) {
-  if ((index >= 0) && (index < windowList->count()))
-    return windowList->find(index);
+  if ((index >= 0) && (index < (signed)_windows.size()))
+    return _windows[index];
   else
-    return 0;
+    return (OpenboxWindow *) 0;
 }
 
 
-const int Workspace::getCount(void) {
-  return windowList->count();
+int Workspace::getCount(void) {
+  return (signed)_windows.size();
 }
 
 
 void Workspace::update(void) {
   clientmenu->update();
-  screen.getToolbar()->redrawWindowLabel(True);
+  screen.getToolbar()->redrawWindowLabel(true);
 }
 
 
-Bool Workspace::isCurrent(void) {
+bool Workspace::isCurrent(void) {
   return (id == screen.getCurrentWorkspaceID());
 }
 
 
-Bool Workspace::isLastWindow(OpenboxWindow *w) {
-  return (w == windowList->last());
-}
-
 void Workspace::setCurrent(void) {
   screen.changeWorkspaceID(id);
 }
 
 
-void Workspace::setName(char *new_name) {
+void Workspace::setName(const char *new_name) {
   if (name)
     delete [] name;
 
@@ -327,10 +314,8 @@ void Workspace::setName(char *new_name) {
 
 
 void Workspace::shutdown(void) {
-  while (windowList->count()) {
-    windowList->first()->restore();
-    delete windowList->first();
-  }
+  while (!_windows.empty())
+    _windows[0]->restore();
 }
 
 static rectList calcSpace(const Rect &win, const rectList &spaces) {
@@ -339,31 +324,31 @@ static rectList calcSpace(const Rect &win, const rectList &spaces) {
   for(siter=spaces.begin(); siter!=spaces.end(); ++siter) {
     if(win.Intersect(*siter)) {
       //Check for space to the left of the window
-      if(win.origin().x() > siter->x())
+      if(win.x() > siter->x())
         result.push_back(Rect(siter->x(), siter->y(),
-                              win.origin().x() - siter->x() - 1,
+                              win.x() - siter->x() - 1,
                               siter->h()));
       //Check for space above the window
-      if(win.origin().y() > siter->y())
+      if(win.y() > siter->y())
         result.push_back(Rect(siter->x(), siter->y(),
                               siter->w(),
-                              win.origin().y() - siter->y() - 1));
+                              win.y() - siter->y() - 1));
       //Check for space to the right of the window
-      if((win.origin().x()+win.size().w()) <
+      if((win.x()+win.w()) <
          (siter->x()+siter->w()))
-        result.push_back(Rect(win.origin().x() + win.size().w() + 1,
+        result.push_back(Rect(win.x() + win.w() + 1,
                               siter->y(),
                               siter->x() + siter->w() -
-                              win.origin().x() - win.size().w() - 1,
+                              win.x() - win.w() - 1,
                               siter->h()));
       //Check for space below the window
-      if((win.origin().y()+win.size().h()) <
+      if((win.y()+win.h()) <
          (siter->y()+siter->h()))
         result.push_back(Rect(siter->x(),
-                              win.origin().y() + win.size().h() + 1,
+                              win.y() + win.h() + 1,
                               siter->w(),
                               siter->y() + siter->h()-
-                              win.origin().y() - win.size().h() - 1));
+                              win.y() - win.h() - 1));
 
     }
     else
@@ -372,28 +357,52 @@ static rectList calcSpace(const Rect &win, const rectList &spaces) {
   return result;
 }
 
-
-bool incWidth(const Rect &first, const Rect &second) {
-  return first.x() < second.x();
+bool rowRLBT(const Rect &first, const Rect &second){
+  if (first.y()+first.h()==second.y()+second.h())
+     return first.x()+first.w()>second.x()+second.w();
+  return first.y()+first.h()>second.y()+second.h();
 }
-
-
-bool decWidth(const Rect &first, const Rect &second) {
-  if (second.x() == first.x())
-     return second.w() < first.w();
-  return second.x() < first.x();
+ 
+bool rowRLTB(const Rect &first, const Rect &second){
+  if (first.y()==second.y())
+     return first.x()+first.w()>second.x()+second.w();
+  return first.y()<second.y();
 }
 
-
-bool incHeight(const Rect &first, const Rect &second) {
-  return first.y() < second.y();
+bool rowLRBT(const Rect &first, const Rect &second){
+  if (first.y()+first.h()==second.y()+second.h())
+     return first.x()<second.x();
+  return first.y()+first.h()>second.y()+second.h();
+}
+ 
+bool rowLRTB(const Rect &first, const Rect &second){
+  if (first.y()==second.y())
+     return first.x()<second.x();
+  return first.y()<second.y();
+}
+ 
+bool colLRTB(const Rect &first, const Rect &second){
+  if (first.x()==second.x())
+     return first.y()<second.y();
+  return first.x()<second.x();
+}
+ 
+bool colLRBT(const Rect &first, const Rect &second){
+  if (first.x()==second.x())
+     return first.y()+first.h()>second.y()+second.h();
+  return first.x()<second.x();
 }
 
-
-bool decHeight(const Rect &first, const Rect &second) {
-  if (second.y() == first.y())
-     return second.h() < first.h();
-  return second.y() < first.y();
+bool colRLTB(const Rect &first, const Rect &second){
+  if (first.x()+first.w()==second.x()+second.w())
+     return first.y()<second.y();
+  return first.x()+first.w()>second.x()+second.w();
+}
+ 
+bool colRLBT(const Rect &first, const Rect &second){
+  if (first.x()+first.w()==second.x()+second.w())
+     return first.y()+first.h()>second.y()+second.h();
+  return first.x()+first.w()>second.x()+second.w();
 }
 
 
@@ -403,34 +412,23 @@ bool decHeight(const Rect &first, const Rect &second) {
 Point *Workspace::bestFitPlacement(const Size &win_size, const Rect &space) {
   const Rect *best;
   rectList spaces;
-  LinkedListIterator<OpenboxWindow> it(windowList);
   rectList::const_iterator siter;
   spaces.push_back(space); //initially the entire screen is free
-  it.reset();
   
   //Find Free Spaces
-  for (OpenboxWindow *cur=it.current(); cur!=NULL; it++, cur=it.current())
-     spaces = calcSpace(cur->area().Inflate(screen.getBorderWidth() * 4),
+  winVect::iterator it;
+  for (it = _windows.begin(); it != _windows.end(); ++it)
+     spaces = calcSpace((*it)->area().Inflate(screen.getBorderWidth() * 4),
                         spaces);
   
-  //Sort the spaces by placement choice
-  if (screen.rowPlacementDirection() == BScreen::TopBottom)
-     sort(spaces.begin(), spaces.end(), decHeight);
-  else
-     sort(spaces.begin(), spaces.end(), incHeight);
-  if (screen.colPlacementDirection() == BScreen::TopBottom)
-     stable_sort(spaces.begin(), spaces.end(), incHeight);
-  else
-     stable_sort(spaces.begin(), spaces.end(), decHeight);
-
   //Find first space that fits the window
   best = NULL;
   for (siter=spaces.begin(); siter!=spaces.end(); ++siter) {
     if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) {
       if (best==NULL)
-        best = siter;
+        best = &*siter;
       else if(siter->w()*siter->h()<best->h()*best->w())
-        best = siter;
+        best = &*siter;
     }
   }
   if (best != NULL) {
@@ -444,44 +442,63 @@ Point *Workspace::bestFitPlacement(const Size &win_size, const Rect &space) {
     return NULL; //fall back to cascade
 }
 
+Point *Workspace::underMousePlacement(const Size &win_size, const Rect &space) {
+  Point *pt;
+
+  int x, y, rx, ry;
+  Window c, r;
+  unsigned int m;
+  XQueryPointer(screen.getOpenbox().getXDisplay(), screen.getRootWindow(),
+                &r, &c, &rx, &ry, &x, &y, &m);
+  pt = new Point(rx - win_size.w() / 2, ry - win_size.h() / 2);
+
+  if (pt->x() < space.x())
+    pt->setX(space.x());
+  if (pt->y() < space.y())
+    pt->setY(space.y());
+  if (pt->x() + win_size.w() > space.x() + space.w())
+    pt->setX(space.x() + space.w() - win_size.w());
+  if (pt->y() + win_size.h() > space.y() + space.h())
+    pt->setY(space.y() + space.h() - win_size.h());
+  return pt;
+}
 
 Point *Workspace::rowSmartPlacement(const Size &win_size, const Rect &space) {
   const Rect *best;
   rectList spaces;
-  LinkedListIterator<OpenboxWindow> it(windowList);
+
   rectList::const_iterator siter;
   spaces.push_back(space); //initially the entire screen is free
-  it.reset();
   
   //Find Free Spaces
-  for (OpenboxWindow *cur=it.current(); cur!=NULL; it++, cur=it.current())
-     spaces = calcSpace(cur->area().Inflate(screen.getBorderWidth() * 4),
+  winVect::iterator it;
+  for (it = _windows.begin(); it != _windows.end(); ++it)
+     spaces = calcSpace((*it)->area().Inflate(screen.getBorderWidth() * 4),
                         spaces);
-  
-  //Sort the spaces by placement choice
-  if (screen.colPlacementDirection() == BScreen::LeftRight)
-     sort(spaces.begin(), spaces.end(), incWidth);
+  //Sort spaces by preference
+  if(screen.rowPlacementDirection() == BScreen::RightLeft)
+     if(screen.colPlacementDirection() == BScreen::TopBottom)
+        sort(spaces.begin(),spaces.end(),rowRLTB);
+     else
+        sort(spaces.begin(),spaces.end(),rowRLBT);
   else
-     sort(spaces.begin(), spaces.end(), decWidth);
-  if (screen.rowPlacementDirection() == BScreen::TopBottom)
-     stable_sort(spaces.begin(), spaces.end(), incHeight);
-  else
-     stable_sort(spaces.begin(), spaces.end(), decHeight);
-
-  //Find first space that fits the window
+     if(screen.colPlacementDirection() == BScreen::TopBottom)
+        sort(spaces.begin(),spaces.end(),rowLRTB);
+     else
+        sort(spaces.begin(),spaces.end(),rowLRBT);
   best = NULL;
   for (siter=spaces.begin(); siter!=spaces.end(); ++siter)
     if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) {
-      best = siter;
+      best = &*siter;
       break;
     }
 
   if (best != NULL) {
     Point *pt = new Point(best->origin());
     if (screen.colPlacementDirection() != BScreen::TopBottom)
-      pt->setY(pt->y() + (best->h() - win_size.h()));
+      pt->setY(best->y() + best->h() - win_size.h());
     if (screen.rowPlacementDirection() != BScreen::LeftRight)
-      pt->setX(pt->x() + (best->w() - win_size.w()));
+      pt->setX(best->x()+best->w()-win_size.w());
     return pt;
   } else
     return NULL; //fall back to cascade
@@ -490,27 +507,32 @@ Point *Workspace::rowSmartPlacement(const Size &win_size, const Rect &space) {
 Point *Workspace::colSmartPlacement(const Size &win_size, const Rect &space) {
   const Rect *best;
   rectList spaces;
-  LinkedListIterator<OpenboxWindow> it(windowList);
+
   rectList::const_iterator siter;
   spaces.push_back(space); //initially the entire screen is free
-  it.reset();
   
   //Find Free Spaces
-  for (OpenboxWindow *cur=it.current(); cur!=NULL; it++, cur=it.current())
-     spaces = calcSpace(cur->area().Inflate(screen.getBorderWidth() * 4),
+  winVect::iterator it;
+  for (it = _windows.begin(); it != _windows.end(); ++it)
+     spaces = calcSpace((*it)->area().Inflate(screen.getBorderWidth() * 4),
                         spaces);
-  
-  //Sort the spaces by placement choice
-  if (screen.rowPlacementDirection() == BScreen::LeftRight)
-     sort(spaces.begin(),spaces.end(),incWidth);
+  //Sort spaces by user preference
+  if(screen.colPlacementDirection() == BScreen::TopBottom)
+     if(screen.rowPlacementDirection() == BScreen::LeftRight)
+        sort(spaces.begin(),spaces.end(),colLRTB);
+     else
+        sort(spaces.begin(),spaces.end(),colRLTB);
   else
-     sort(spaces.begin(),spaces.end(),decWidth);
+     if(screen.rowPlacementDirection() == BScreen::LeftRight)
+        sort(spaces.begin(),spaces.end(),colLRBT);
+     else
+        sort(spaces.begin(),spaces.end(),colRLBT);
 
   //Find first space that fits the window
   best = NULL;
   for (siter=spaces.begin(); siter!=spaces.end(); ++siter)
     if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) {
-      best = siter;
+      best = &*siter;
       break;
     }
 
@@ -526,108 +548,30 @@ Point *Workspace::colSmartPlacement(const Size &win_size, const Rect &space) {
 }
 
 
-Point *const Workspace::cascadePlacement(const OpenboxWindow *const win){
-  if (((unsigned) cascade_x > (screen.size().w() / 2)) ||
-      ((unsigned) cascade_y > (screen.size().h() / 2)))
-    cascade_x = cascade_y = 32;
-
-  cascade_x += win->getTitleHeight();
-  cascade_y += win->getTitleHeight();
+Point *const Workspace::cascadePlacement(const OpenboxWindow &win,
+                                         const Rect &space) {
+  if ((cascade_x + win.area().w() + screen.getBorderWidth() * 2 >
+       (space.x() + space.w())) ||
+      (cascade_y + win.area().h() + screen.getBorderWidth() * 2 >
+       (space.y() + space.h())))
+    cascade_x = cascade_y = 0;
+  if (cascade_x < space.x() || cascade_y < space.y()) {
+    cascade_x = space.x();
+    cascade_y = space.y();
+  }
 
-  return new Point(cascade_x, cascade_y);
+  Point *p = new Point(cascade_x, cascade_y);
+  cascade_x += win.getTitleHeight();
+  cascade_y += win.getTitleHeight();
+  return p;
 }
 
 
-void Workspace::placeWindow(OpenboxWindow *win) {
-  ASSERT(win != NULL);
-
-  // the following code is temporary and will be taken care of by Screen in the
-  // future (with the NETWM 'strut')
-  Rect space(0, 0, screen.size().w(), screen.size().h());
-
-#ifdef    SLIT
-  Slit *slit = screen.getSlit();
-  Toolbar *toolbar = screen.getToolbar();
-  int tbarh = screen.hideToolbar() ? 0 :
-    toolbar->getExposedHeight() + screen.getBorderWidth() * 2;
-  bool tbartop;
-  switch (toolbar->placement()) {
-  case Toolbar::TopLeft:
-  case Toolbar::TopCenter:
-  case Toolbar::TopRight:
-    tbartop = true;
-    break;
-  case Toolbar::BottomLeft:
-  case Toolbar::BottomCenter:
-  case Toolbar::BottomRight:
-    tbartop = false;
-    break;
-  default:
-    ASSERT(false);      // unhandled placement
-  }
-  if ((slit->direction() == Slit::Horizontal &&
-       (slit->placement() == Slit::TopLeft ||
-        slit->placement() == Slit::TopRight)) ||
-      slit->placement() == Slit::TopCenter) {
-    // exclude top
-    if (tbartop) {
-      space.setY(slit->area().y());
-      space.setH(space.h() - space.y());
-    } else
-      space.setH(space.h() - tbarh);
-    space.setY(space.y() + slit->area().h() + screen.getBorderWidth() * 2);
-    space.setH(space.h() - (slit->area().h() + screen.getBorderWidth() * 2));
-  } else if ((slit->direction() == Slit::Vertical &&
-              (slit->placement() == Slit::TopRight ||
-               slit->placement() == Slit::BottomRight)) ||
-             slit->placement() == Slit::CenterRight) {
-    // exclude right
-    space.setW(space.w() - (slit->area().w() + screen.getBorderWidth() * 2));
-    if (tbartop)
-      space.setY(space.y() + tbarh);
-    space.setH(space.h() - tbarh);
-  } else if ((slit->direction() == Slit::Horizontal &&
-              (slit->placement() == Slit::BottomLeft ||
-               slit->placement() == Slit::BottomRight)) ||
-             slit->placement() == Slit::BottomCenter) {
-    // exclude bottom
-    space.setH(space.h() - (screen.size().h() - slit->area().y()));
-  } else {// if ((slit->direction() == Slit::Vertical &&
-    //      (slit->placement() == Slit::TopLeft ||
-    //       slit->placement() == Slit::BottomLeft)) ||
-    //     slit->placement() == Slit::CenterLeft)
-    // exclude left
-    space.setX(slit->area().w() + screen.getBorderWidth() * 2);
-    space.setW(space.w() - (slit->area().w() + screen.getBorderWidth() * 2));
-    if (tbartop)
-      space.setY(space.y() + tbarh);
-    space.setH(space.h() - tbarh);
-  }
-#else // !SLIT
-  Toolbar *toolbar = screen.getToolbar();
-  int tbarh = screen.hideToolbar() ? 0 :
-    toolbar->getExposedHeight() + screen.getBorderWidth() * 2;
-  switch (toolbar->placement()) {
-  case Toolbar::TopLeft:
-  case Toolbar::TopCenter:
-  case Toolbar::TopRight:
-    space.setY(toolbar->getExposedHeight());
-    space.setH(space.h() - toolbar->getExposedHeight());
-    break;
-  case Toolbar::BottomLeft:
-  case Toolbar::BottomCenter:
-  case Toolbar::BottomRight:
-    space.setH(space.h() - tbarh);
-    break;
-  default:
-    ASSERT(false);      // unhandled placement
-  }
-#endif // SLIT
-
-  const Size window_size(win->size().w()+screen.getBorderWidth() * 4,
-                         win->size().h()+screen.getBorderWidth() * 4);
+void Workspace::placeWindow(OpenboxWindow &win) {
+  Rect space = screen.availableArea();
+  const Size window_size(win.area().w()+screen.getBorderWidth() * 2,
+                         win.area().h()+screen.getBorderWidth() * 2);
   Point *place = NULL;
-  LinkedListIterator<OpenboxWindow> it(windowList);
 
   switch (screen.placementPolicy()) {
   case BScreen::BestFitPlacement:
@@ -639,17 +583,21 @@ void Workspace::placeWindow(OpenboxWindow *win) {
   case BScreen::ColSmartPlacement:
     place = colSmartPlacement(window_size, space);
     break;
+  case BScreen::UnderMousePlacement:
+  case BScreen::ClickMousePlacement:
+    place = underMousePlacement(window_size, space);
+    break;
   } // switch
 
   if (place == NULL)
-    place = cascadePlacement(win);
+    place = cascadePlacement(win, space);
  
   ASSERT(place != NULL);  
-  if (place->x() + window_size.w() > (signed) screen.size().w())
-    place->setX(((signed) screen.size().w() - window_size.w()) / 2);
-  if (place->y() + window_size.h() > (signed) screen.size().h())
-    place->setY(((signed) screen.size().h() - window_size.h()) / 2);
+  if (place->x() + window_size.w() > (signed) space.x() + space.w())
+    place->setX(((signed) space.x() + space.w() - window_size.w()) / 2);
+  if (place->y() + window_size.h() > (signed) space.y() + space.h())
+    place->setY(((signed) space.y() + space.h() - window_size.h()) / 2);
 
-  win->configure(place->x(), place->y(), win->size().w(), win->size().h());
+  win.configure(place->x(), place->y(), win.area().w(), win.area().h());
   delete place;
 }