Added a fallback for Best Fit to cascade. Also, moved cascade to its own

[chaz/openbox] / src / Workspace.cc

diff --git a/src/Workspace.cc b/src/Workspace.cc
index 0d996632689a699099b6716054e188687067c267..df8133deee7ad5d64c701e74da0168e1baef8cd7 100644 (file)
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -41,6 +41,7 @@
 #include "Toolbar.h"
 #include "Window.h"
 #include "Workspace.h"
+
 #include "Windowmenu.h"
 #include "Geometry.h"
 #include "Util.h"
@@ -386,17 +387,17 @@ Point *Workspace::bestFitPlacement(const Size &win_size, const Rect &space)
      spaces = calcSpace(*cur, spaces);
   
   //Find first space that fits the window
-  best = 0;
+  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 != 0)
+  if (best != NULL)
     return new Point(best->origin());
   else
-    return new Point(200, 0);
+    return NULL; //fall back to cascade
 }
 
 inline Point *Workspace::rowSmartPlacement(const Size &win_size,
@@ -464,11 +465,11 @@ void Workspace::placeWindow(OpenboxWindow *win) {
   const int win_w = win->size().w() + (screen.getBorderWidth() * 4),
     win_h = win->size().h() + (screen.getBorderWidth() * 4),
 #ifdef    SLIT
-    slit_x = screen.getSlit()->getX() - screen.getBorderWidth(),
-    slit_y = screen.getSlit()->getY() - screen.getBorderWidth(),
-    slit_w = screen.getSlit()->getWidth() +
+    slit_x = screen.getSlit()->area().x() - screen.getBorderWidth(),
+    slit_y = screen.getSlit()->area().y() - screen.getBorderWidth(),
+    slit_w = screen.getSlit()->area().w() +
       (screen.getBorderWidth() * 4),
-    slit_h = screen.getSlit()->getHeight() +
+    slit_h = screen.getSlit()->area().h() +
       (screen.getBorderWidth() * 4),
 #endif // SLIT
     toolbar_x = screen.getToolbar()->getX() - screen.getBorderWidth(),
@@ -501,7 +502,9 @@ void Workspace::placeWindow(OpenboxWindow *win) {
       place_y=spot->y();
       delete spot;
       placed=true;
-    }
+    }else
+      placed=false;
+      
     break;
   }
   case BScreen::RowSmartPlacement: {
@@ -581,15 +584,10 @@ void Workspace::placeWindow(OpenboxWindow *win) {
   } // switch
 
   if (! placed) {
-    if (((unsigned) cascade_x > (screen.size().w() / 2)) ||
-       ((unsigned) cascade_y > (screen.size().h() / 2)))
-      cascade_x = cascade_y = 32;
-
-    place_x = cascade_x;
-    place_y = cascade_y;
-
-    cascade_x += win->getTitleHeight();
-    cascade_y += win->getTitleHeight();
+    Point *p = cascade(win);
+    place_x=p->x();
+    place_y=p->y();
+    delete p;
   }
   
   if (place_x + win_w > (signed) screen.size().w())
@@ -599,3 +597,14 @@ void Workspace::placeWindow(OpenboxWindow *win) {
 
   win->configure(place_x, place_y, win->size().w(), win->size().h());
 }
+
+Point *Workspace::cascade(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();
+
+  return new Point(cascade_x, cascade_y);
+}