X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FWorkspace.cc;h=5f8817cb4023e8d92ef2616f4538286b2317d782;hb=8e083798b5415eef7939242d1ca9e7a0776fa9df;hp=fa1f7990f06770ea7765121321d501e15c8cab1a;hpb=dfc5f034581f5a26cba5c4811500438f89f0634a;p=chaz%2Fopenbox

diff --git a/src/Workspace.cc b/src/Workspace.cc
index fa1f7990..5f8817cb 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -1,4 +1,5 @@
 // Workspace.cc for Openbox
+// Copyright (c) 2002 - 2002 Ben Jansens (ben@orodu.net)
 // Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org>
 // Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
 //
@@ -40,19 +41,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    STDC_HEADERS
+#ifdef    HAVE_STDLIB_H
+#  include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef    HAVE_STRING_H
 #  include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
 
+#include <vector>
+typedef vector<Rect> rectList;
 
-Workspace::Workspace(BScreen *scrn, int i) {
-  screen = scrn;
+Workspace::Workspace(BScreen &scrn, int i) : screen(scrn) {
 
   cascade_x = cascade_y = 32;
 
@@ -60,12 +69,12 @@ Workspace::Workspace(BScreen *scrn, int i) {
 
   stackingList = new LinkedList<OpenboxWindow>;
   windowList = new LinkedList<OpenboxWindow>;
-  clientmenu = new Clientmenu(this);
+  clientmenu = new Clientmenu(*this);
 
   lastfocus = (OpenboxWindow *) 0;
 
   name = (char *) 0;
-  char *tmp = screen->getNameOfWorkspace(id);
+  char *tmp = screen.getNameOfWorkspace(id);
   setName(tmp);
 }
 
@@ -94,7 +103,7 @@ const int Workspace::addWindow(OpenboxWindow *w, Bool place) {
   clientmenu->insert((const char **) w->getTitle());
   clientmenu->update();
 
-  screen->updateNetizenWindowAdd(w->getClientWindow(), id);
+  screen.updateNetizenWindowAdd(w->getClientWindow(), id);
 
   raiseWindow(w);
 
@@ -111,14 +120,14 @@ const int Workspace::removeWindow(OpenboxWindow *w) {
     if (w->isTransient() && w->getTransientFor() &&
 	w->getTransientFor()->isVisible()) {
       w->getTransientFor()->setInputFocus();
-    } else if (screen->isSloppyFocus()) {
-      screen->getOpenbox()->setFocusedWindow((OpenboxWindow *) 0);
+    } 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(),
+	screen.getOpenbox().setFocusedWindow((OpenboxWindow *) 0);
+	XSetInputFocus(screen.getOpenbox().getXDisplay(),
+		       screen.getToolbar()->getWindowID(),
 		       RevertToParent, CurrentTime);
       }
     }
@@ -131,7 +140,7 @@ const int Workspace::removeWindow(OpenboxWindow *w) {
   clientmenu->remove(w->getWindowNumber());
   clientmenu->update();
 
-  screen->updateNetizenWindowDel(w->getClientWindow());
+  screen.updateNetizenWindowDel(w->getClientWindow());
 
   LinkedListIterator<OpenboxWindow> it(windowList);
   OpenboxWindow *bw = it.current();
@@ -190,10 +199,10 @@ void Workspace::raiseWindow(OpenboxWindow *w) {
   win = bottom;
   while (True) {
     *(curr++) = win->getFrameWindow();
-    screen->updateNetizenWindowRaise(win->getClientWindow());
+    screen.updateNetizenWindowRaise(win->getClientWindow());
 
     if (! win->isIconic()) {
-      wkspc = screen->getWorkspace(win->getWorkspaceNumber());
+      wkspc = screen.getWorkspace(win->getWorkspaceNumber());
       wkspc->stackingList->remove(win);
       wkspc->stackingList->insert(win, 0);
     }
@@ -204,7 +213,7 @@ void Workspace::raiseWindow(OpenboxWindow *w) {
     win = win->getTransient();
   }
 
-  screen->raiseWindows(nstack, i);
+  screen.raiseWindows(nstack, i);
 
   delete [] nstack;
 }
@@ -229,10 +238,10 @@ void Workspace::lowerWindow(OpenboxWindow *w) {
 
   while (True) {
     *(curr++) = win->getFrameWindow();
-    screen->updateNetizenWindowLower(win->getClientWindow());
+    screen.updateNetizenWindowLower(win->getClientWindow());
 
     if (! win->isIconic()) {
-      wkspc = screen->getWorkspace(win->getWorkspaceNumber());
+      wkspc = screen.getWorkspace(win->getWorkspaceNumber());
       wkspc->stackingList->remove(win);
       wkspc->stackingList->insert(win);
     }
@@ -243,12 +252,12 @@ void Workspace::lowerWindow(OpenboxWindow *w) {
     win = win->getTransientFor();
   }
 
-  screen->getOpenbox()->grab();
+  screen.getOpenbox().grab();
 
-  XLowerWindow(screen->getBaseDisplay()->getXDisplay(), *nstack);
-  XRestackWindows(screen->getBaseDisplay()->getXDisplay(), nstack, i);
+  XLowerWindow(screen.getBaseDisplay().getXDisplay(), *nstack);
+  XRestackWindows(screen.getBaseDisplay().getXDisplay(), nstack, i);
 
-  screen->getOpenbox()->ungrab();
+  screen.getOpenbox().ungrab();
 
   delete [] nstack;
 }
@@ -280,12 +289,12 @@ const int Workspace::getCount(void) {
 
 void Workspace::update(void) {
   clientmenu->update();
-  screen->getToolbar()->redrawWindowLabel(True);
+  screen.getToolbar()->redrawWindowLabel(True);
 }
 
 
 Bool Workspace::isCurrent(void) {
-  return (id == screen->getCurrentWorkspaceID());
+  return (id == screen.getCurrentWorkspaceID());
 }
 
 
@@ -294,7 +303,7 @@ Bool Workspace::isLastWindow(OpenboxWindow *w) {
 }
 
 void Workspace::setCurrent(void) {
-  screen->changeWorkspaceID(id);
+  screen.changeWorkspaceID(id);
 }
 
 
@@ -312,6 +321,7 @@ void Workspace::setName(char *new_name) {
   
   clientmenu->setLabel(name);
   clientmenu->update();
+  screen.saveWorkspaceNames();
 }
 
 
@@ -322,181 +332,332 @@ void Workspace::shutdown(void) {
   }
 }
 
-void Workspace::placeWindow(OpenboxWindow *win) {
-  Bool placed = False;
+static rectList calcSpace(const Rect &win, const rectList &spaces) {
+  rectList result;
+  rectList::const_iterator siter;
+  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())
+        result.push_back(Rect(siter->x(), siter->y(),
+                              win.origin().x() - siter->x() - 1,
+                              siter->h()));
+      //Check for space above the window
+      if(win.origin().y() > siter->y())
+        result.push_back(Rect(siter->x(), siter->y(),
+                              siter->w(),
+                              win.origin().y() - siter->y() - 1));
+      //Check for space to the right of the window
+      if((win.origin().x()+win.size().w()) <
+         (siter->x()+siter->w()))
+        result.push_back(Rect(win.origin().x() + win.size().w() + 1,
+                              siter->y(),
+                              siter->x() + siter->w() -
+                              win.origin().x() - win.size().w() - 1,
+                              siter->h()));
+      //Check for space below the window
+      if((win.origin().y()+win.size().h()) <
+         (siter->y()+siter->h()))
+        result.push_back(Rect(siter->x(),
+                              win.origin().y() + win.size().h() + 1,
+                              siter->w(),
+                              siter->y() + siter->h()-
+                              win.origin().y() - win.size().h() - 1));
 
-  const int win_w = win->getWidth() + (screen->getBorderWidth() * 4),
-    win_h = win->getHeight() + (screen->getBorderWidth() * 4),
-#ifdef    SLIT
-    slit_x = screen->getSlit()->getX() - screen->getBorderWidth(),
-    slit_y = screen->getSlit()->getY() - screen->getBorderWidth(),
-    slit_w = screen->getSlit()->getWidth() +
-      (screen->getBorderWidth() * 4),
-    slit_h = screen->getSlit()->getHeight() +
-      (screen->getBorderWidth() * 4),
-#endif // SLIT
-    toolbar_x = screen->getToolbar()->getX() - screen->getBorderWidth(),
-    toolbar_y = screen->getToolbar()->getY() - screen->getBorderWidth(),
-    toolbar_w = screen->getToolbar()->getWidth() +
-      (screen->getBorderWidth() * 4),
-    toolbar_h = screen->getToolbar()->getHeight() + 
-      (screen->getBorderWidth() * 4),
-    start_pos = 0,
-    change_y =
-      ((screen->getColPlacementDirection() == BScreen::TopBottom) ? 1 : -1),
-    change_x =
-      ((screen->getRowPlacementDirection() == BScreen::LeftRight) ? 1 : -1),
-    delta_x = 8, delta_y = 8;
+    }
+    else
+      result.push_back(*siter);
+  }
+  return result;
+}
 
+//BestFitPlacement finds the smallest free space that fits the window
+//to be placed. It currentl ignores whether placement is right to left or top
+//to bottom.
+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),
+                        spaces);
+  
+  //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;
+  }
+
+  if (best != NULL)
+    return new Point(best->origin());
+  else
+    return NULL; //fall back to cascade
+}
+
+inline Point *Workspace::rowSmartPlacement(const Size &win_size,
+                                           const Rect &space){
+  bool placed=false;
   int test_x, test_y, place_x = 0, place_y = 0;
+  int start_pos = 0;
+  int change_y =
+     ((screen.colPlacementDirection() == BScreen::TopBottom) ? 1 : -1);
+  int change_x =
+     ((screen.rowPlacementDirection() == BScreen::LeftRight) ? 1 : -1);
+  int delta_x = 8, delta_y = 8;
   LinkedListIterator<OpenboxWindow> it(windowList);
 
-  switch (screen->getPlacementPolicy()) {
-  case BScreen::RowSmartPlacement: {
-    test_y = (screen->getColPlacementDirection() == BScreen::TopBottom) ?
-      start_pos : screen->getHeight() - win_h - start_pos;
+  test_y = (screen.colPlacementDirection() == BScreen::TopBottom) ?
+    start_pos : screen.size().h() - win_size.h() - start_pos;
 
+  while(!placed &&
+        ((screen.colPlacementDirection() == BScreen::BottomTop) ?
+         test_y > 0 : test_y + win_size.h() < (signed) space.h())) {
+    test_x = (screen.rowPlacementDirection() == BScreen::LeftRight) ?
+      start_pos : space.w() - win_size.w() - start_pos;
     while (!placed &&
-	   ((screen->getColPlacementDirection() == BScreen::BottomTop) ?
-	    test_y > 0 : test_y + win_h < (signed) screen->getHeight())) {
-      test_x = (screen->getRowPlacementDirection() == BScreen::LeftRight) ?
-	start_pos : screen->getWidth() - win_w - start_pos;
-
-      while (!placed &&
-	     ((screen->getRowPlacementDirection() == BScreen::RightLeft) ?
-	      test_x > 0 : test_x + win_w < (signed) screen->getWidth())) {
-        placed = True;
-
-        it.reset();
-        for (OpenboxWindow *curr = it.current(); placed && curr;
-	     it++, curr = it.current()) {
-          if (curr->isMaximizedFull()) // fully maximized, ignore it
-            continue;
-          int curr_w = curr->getWidth() + (screen->getBorderWidth() * 4);
-          int curr_h =
-	    ((curr->isShaded()) ? curr->getTitleHeight() : curr->getHeight()) +
-            (screen->getBorderWidth() * 4);
-	  
-          if (curr->getXFrame() < test_x + win_w &&
-              curr->getXFrame() + curr_w > test_x &&
-              curr->getYFrame() < test_y + win_h &&
-              curr->getYFrame() + curr_h > test_y) {
-            placed = False;
-	  }
+           ((screen.rowPlacementDirection() == BScreen::RightLeft) ?
+            test_x > 0 : test_x + win_size.w() < (signed) space.w())) {
+      placed = true;
+
+      it.reset();
+      for (OpenboxWindow *curr = it.current(); placed && curr;
+           it++, curr = it.current()) {
+        int curr_w = curr->size().w() + (screen.getBorderWidth() * 4);
+        int curr_h = curr->size().h() + (screen.getBorderWidth() * 4);
+
+        if (curr->origin().x() < test_x + win_size.w() &&
+            curr->origin().x() + curr_w > test_x &&
+            curr->origin().y() < test_y + win_size.h() &&
+            curr->origin().y() + curr_h > test_y) {
+          placed = false;
         }
+      }
 
-        if (placed &&
-	    (toolbar_x < test_x + win_w &&
-             toolbar_x + toolbar_w > test_x &&
-             toolbar_y < test_y + win_h &&
-             toolbar_y + toolbar_h > test_y)
-#ifdef    SLIT
-             ||
-            (slit_x < test_x + win_w &&
-             slit_x + slit_w > test_x &&
-             slit_y < test_y + win_h &&
-             slit_y + slit_h > test_y)
-#endif // SLIT
-	    )
-          placed = False;
+      // Removed code for checking toolbar and slit
+      // The space passed in should not include either
+
+      if (placed) {
+        place_x = test_x;
+        place_y = test_y;
+
+        break;
+      }   
+
+      test_x += (change_x * delta_x);
+    }
+
+    test_y += (change_y * delta_y);
+  }
+  if (placed)
+    return new Point(place_x, place_y);
+  else
+    return NULL; // fall back to cascade
+}
+
+inline Point * Workspace::colSmartPlacement(const Size &win_size,
+                                            const Rect &space){
+  Point *pt;
+  bool placed=false;
+  int test_x, test_y;
+  int start_pos = 0;
+  int change_y =
+    ((screen.colPlacementDirection() == BScreen::TopBottom) ? 1 : -1);
+  int change_x =
+    ((screen.rowPlacementDirection() == BScreen::LeftRight) ? 1 : -1);
+  int delta_x = 8, delta_y = 8;
+  LinkedListIterator<OpenboxWindow> it(windowList);
+
+  test_x = (screen.rowPlacementDirection() == BScreen::LeftRight) ?
+    start_pos : screen.size().w() - win_size.w() - start_pos;
+
+  while(!placed &&
+        ((screen.rowPlacementDirection() == BScreen::RightLeft) ?
+         test_x > 0 : test_x + win_size.w() < (signed) space.w())) {
+    test_y = (screen.colPlacementDirection() == BScreen::TopBottom) ?
+      start_pos : screen.size().h() - win_size.h() - start_pos;
+
+    while(!placed &&
+          ((screen.colPlacementDirection() == BScreen::BottomTop) ?
+           test_y > 0 : test_y + win_size.h() < (signed) space.h())){
 
-        if (placed) {
-          place_x = test_x;
-          place_y = test_y;
+      placed = true;
 
-          break;
+      it.reset();
+      for (OpenboxWindow *curr = it.current(); placed && curr;
+           it++, curr = it.current()) {
+        int curr_w = curr->size().w() + (screen.getBorderWidth() * 4);
+        int curr_h = curr->size().h() + (screen.getBorderWidth() * 4);
+
+        if (curr->origin().x() < test_x + win_size.w() &&
+            curr->origin().x() + curr_w > test_x &&
+            curr->origin().y() < test_y + win_size.h() &&
+            curr->origin().y() + curr_h > test_y) {
+          placed = False;
         }
+      }
+
+      // Removed code checking for intersection with Toolbar and Slit
+      // The space passed to this method should not include either
+
+      if (placed) {
+        pt= new Point(test_x,test_y);
 
-	test_x += (change_x * delta_x);
+        break;
       }
 
       test_y += (change_y * delta_y);
     }
 
-    break;
+    test_x += (change_x * delta_x);
   }
+  if (placed)
+    return pt;
+  else
+    return NULL;
+}
 
-  case BScreen::ColSmartPlacement: {
-    test_x = (screen->getRowPlacementDirection() == BScreen::LeftRight) ?
-      start_pos : screen->getWidth() - win_w - start_pos;
-
-    while (!placed &&
-	   ((screen->getRowPlacementDirection() == BScreen::RightLeft) ?
-	    test_x > 0 : test_x + win_w < (signed) screen->getWidth())) {
-      test_y = (screen->getColPlacementDirection() == BScreen::TopBottom) ?
-	start_pos : screen->getHeight() - win_h - start_pos;
-      
-      while (!placed &&
-	     ((screen->getColPlacementDirection() == BScreen::BottomTop) ?
-	      test_y > 0 : test_y + win_h < (signed) screen->getHeight())) {
-        placed = True;
-
-        it.reset();
-        for (OpenboxWindow *curr = it.current(); placed && curr;
-	     it++, curr = it.current()) {
-          if (curr->isMaximizedFull()) // fully maximized, ignore it
-            continue;
-          int curr_w = curr->getWidth() + (screen->getBorderWidth() * 4);
-          int curr_h =
-            ((curr->isShaded()) ? curr->getTitleHeight() : curr->getHeight()) +
-            (screen->getBorderWidth() * 4);
-
-          if (curr->getXFrame() < test_x + win_w &&
-              curr->getXFrame() + curr_w > test_x &&
-              curr->getYFrame() < test_y + win_h &&
-              curr->getYFrame() + curr_h > test_y) {
-            placed = False;
-	  }
-        }
+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;
 
-        if (placed &&
-	    (toolbar_x < test_x + win_w &&
-	     toolbar_x + toolbar_w > test_x &&
-	     toolbar_y < test_y + win_h &&
-	     toolbar_y + toolbar_h > test_y)
-#ifdef    SLIT
-	    ||
-	    (slit_x < test_x + win_w &&
-	     slit_x + slit_w > test_x &&
-	     slit_y < test_y + win_h &&
-	     slit_y + slit_h > test_y)
-#endif // SLIT
-	    )
-	  placed = False;
+  cascade_x += win->getTitleHeight();
+  cascade_y += win->getTitleHeight();
 
-	if (placed) {
-	  place_x = test_x;
-	  place_y = test_y;
+  return new Point(cascade_x, cascade_y);
+}
 
-	  break;
-	}
 
-	test_y += (change_y * delta_y);
-      }
+void Workspace::placeWindow(OpenboxWindow *win) {
+  ASSERT(win != NULL);
 
-      test_x += (change_x * delta_x);
-    }
+  // 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
   }
-  } // switch
+  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
 
-  if (! placed) {
-    if (((unsigned) cascade_x > (screen->getWidth() / 2)) ||
-	((unsigned) cascade_y > (screen->getHeight() / 2)))
-      cascade_x = cascade_y = 32;
+  const int win_w = win->size().w() + (screen.getBorderWidth() * 4),
+  win_h = win->size().h() + (screen.getBorderWidth() * 4),
+  start_pos = 0,
+  change_y =
+    ((screen.colPlacementDirection() == BScreen::TopBottom) ? 1 : -1),
+  change_x =
+    ((screen.rowPlacementDirection() == BScreen::LeftRight) ? 1 : -1),
+    delta_x = 8, delta_y = 8;
 
-    place_x = cascade_x;
-    place_y = cascade_y;
+  LinkedListIterator<OpenboxWindow> it(windowList);
 
-    cascade_x += win->getTitleHeight();
-    cascade_y += win->getTitleHeight();
-  }
-  
-  if (place_x + win_w > (signed) screen->getWidth())
-    place_x = (((signed) screen->getWidth()) - win_w) / 2;
-  if (place_y + win_h > (signed) screen->getHeight())
-    place_y = (((signed) screen->getHeight()) - win_h) / 2;
+  Size window_size(win->size().w()+screen.getBorderWidth() * 4,
+                   win->size().h()+screen.getBorderWidth() * 4);
+  Point *place = NULL;
+
+  switch (screen.placementPolicy()) {
+  case BScreen::BestFitPlacement:
+    place = bestFitPlacement(window_size, space);
+    break;
+  case BScreen::RowSmartPlacement:
+    place = rowSmartPlacement(window_size, space);
+    break;
+  case BScreen::ColSmartPlacement:
+    place = colSmartPlacement(window_size, space);
+    break;
+  } // switch
 
-  win->configure(place_x, place_y, win->getWidth(), win->getHeight());
+  if (place == NULL)
+    place = cascadePlacement(win);
+ 
+  ASSERT(place != NULL);  
+  if (place->x() + win_w > (signed) screen.size().w())
+    place->setX(((signed) screen.size().w() - win_w) / 2);
+  if (place->y() + win_h > (signed) screen.size().h())
+    place->setY(((signed) screen.size().h() - win_h) / 2);
+
+  win->configure(place->x(), place->y(), win->size().w(), win->size().h());
+  delete place;
 }