1 files changed, 8 insertions, 271 deletions

diff --git a/src/Workspace.cc b/src/Workspace.cc
index 07e76f0..7d53381 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -33,6 +33,7 @@
 #include "FbWinFrame.hh"
 #include "WindowCmd.hh"
 #include "FocusControl.hh"
+#include "PlacementStrategy.hh"
 
 #include "FbTk/I18n.hh"
 #include "FbTk/MenuItem.hh"
@@ -140,21 +141,13 @@ Workspace::Workspace(BScreen &scrn, FbTk::MultLayers &layermanager,
     m_name(name),
     m_id(id) {
 
-
-    m_cascade_x = new int[scrn.numHeads() + 1];
-    m_cascade_y = new int[scrn.numHeads() + 1];
-    for (int i=0; i < scrn.numHeads()+1; i++) {
-        m_cascade_x[i] = 32 + scrn.getHeadX(i);
-        m_cascade_y[i] = 32 + scrn.getHeadY(i);
-    }
     menu().setInternalMenu();
     setName(name);
+
 }
 
 
 Workspace::~Workspace() {
-    delete [] m_cascade_x;
-    delete [] m_cascade_y;
 }
 
 void Workspace::setLastFocusedWindow(FluxboxWindow *win) {
@@ -427,268 +420,12 @@ void Workspace::updateClientmenu() {
 }
 
 void Workspace::placeWindow(FluxboxWindow &win) {
-
-    bool placed = false;
-
-    // restrictions
-    int head = (signed) screen().getCurrHead();
-    int head_left = (signed) screen().maxLeft(head);
-    int head_right = (signed) screen().maxRight(head);
-    int head_top = (signed) screen().maxTop(head);
-    int head_bot = (signed) screen().maxBottom(head);
-
-    int place_x = head_left, place_y = head_top, change_x = 1, change_y = 1;
-
-    if (screen().getColPlacementDirection() == BScreen::BOTTOMTOP)
-        change_y = -1;
-    if (screen().getRowPlacementDirection() == BScreen::RIGHTLEFT)
-        change_x = -1;
-
-    int win_w = win.width() + win.fbWindow().borderWidth()*2,
-        win_h = win.height() + win.fbWindow().borderWidth()*2;
-
-
-    int test_x, test_y, curr_x, curr_y, curr_w, curr_h;
-
-    switch (screen().getPlacementPolicy()) {
-    case BScreen::UNDERMOUSEPLACEMENT: {
-        int root_x, root_y, ignore_i;
-
-        unsigned int ignore_ui;
-
-        Window ignore_w;
-
-        XQueryPointer(FbTk::App::instance()->display(),
-                      screen().rootWindow().window(), &ignore_w, 
-                      &ignore_w, &root_x, &root_y,
-                      &ignore_i, &ignore_i, &ignore_ui);
-
-        test_x = root_x - (win_w / 2);
-        test_y = root_y - (win_h / 2);
-
-        // keep the window inside the screen
-
-        if (test_x < head_left)
-            test_x = head_left;
-
-        if (test_x + win_w > head_right)
-            test_x = head_right - win_w;
-
-        if (test_y < head_top)
-            test_y = head_top;
-
-        if (test_y + win_h > head_bot)
-            test_y = head_bot - win_h;
-
-        place_x = test_x;
-        place_y = test_y;
-
-        placed = true;
-
-        break; 
-    } // end case UNDERMOUSEPLACEMENT
-
-    case BScreen::ROWSMARTPLACEMENT: {
-        int next_x, next_y;
-        bool top_bot = screen().getColPlacementDirection() == BScreen::TOPBOTTOM;
-        bool left_right = screen().getRowPlacementDirection() == BScreen::LEFTRIGHT;
-
-        if (top_bot)
-            test_y = head_top;
-        else
-            test_y = head_bot - win_h;
-
-        while (!placed && 
-               (top_bot ? test_y + win_h <= head_bot
-                        : test_y >= head_top)) {
-
-            if (left_right)
-                test_x = head_left;
-            else
-                test_x = head_right - win_w;
-
-            // The trick here is that we set it to the furthest away one,
-            // then the code brings it back down to the safest one that
-            // we can go to (i.e. the next untested area)
-            if (top_bot)
-                next_y = head_bot;  // will be shrunk
-            else
-                next_y = head_top-1;
-
-            while (!placed &&
-                   (left_right ? test_x + win_w <= head_right
-                    : test_x >= head_left)) {
-
-                placed = true;
-
-                next_x = test_x + change_x;
-
-                Windows::iterator win_it = m_windowlist.begin();
-                const Windows::iterator win_it_end = m_windowlist.end();
-
-                for (; win_it != win_it_end && placed; ++win_it) {
-                    FluxboxWindow &window = **win_it;
-
-                    curr_x = window.x();
-                    curr_y = window.y();
-                    curr_w = window.width() + window.fbWindow().borderWidth()*2;
-                    curr_h = window.height() + window.fbWindow().borderWidth()*2;
-
-                    if (curr_x < test_x + win_w &&
-                        curr_x + curr_w > test_x &&
-                        curr_y < test_y + win_h &&
-                        curr_y + curr_h > test_y) {
-                        // this window is in the way
-                        placed = false;
-
-                        // we find the next x that we can go to (a window will be in the way
-                        // all the way to its far side)
-                        if (left_right) {
-                            if (curr_x + curr_w > next_x) 
-                                next_x = curr_x + curr_w;
-                        } else {
-                            if (curr_x - win_w < next_x)
-                                next_x = curr_x - win_w;
-                        }
-
-                        // but we can only go to the nearest y, since that is where the 
-                        // next time current windows in the way will change
-                        if (top_bot) {
-                            if (curr_y + curr_h < next_y)
-                                next_y = curr_y + curr_h;
-                        } else {
-                            if (curr_y - win_h > next_y)
-                                next_y = curr_y - win_h;
-                        }
-                    }
-                }
-
-
-                if (placed) {
-                    place_x = test_x;
-                    place_y = test_y;
-
-                    break;
-                }
-
-                test_x = next_x;
-            } // end while
-
-            test_y = next_y;
-        } // end while
-
-        break; 
-    } // end case ROWSMARTPLACEMENT
-
-    case BScreen::COLSMARTPLACEMENT: {
-        int next_x, next_y;
-        bool top_bot = screen().getColPlacementDirection() == BScreen::TOPBOTTOM;
-        bool left_right = screen().getRowPlacementDirection() == BScreen::LEFTRIGHT;
-
-        if (left_right)
-            test_x = head_left;
-        else
-            test_x = head_right - win_w;
-
-        while (!placed &&
-               (left_right ? test_x + win_w <= head_right
-                : test_x >= head_left)) {
-                
-            if (left_right)
-                next_x = head_right; // it will get shrunk
-            else 
-                next_x = head_left-1;
-
-            if (top_bot)
-                test_y = head_top;
-            else
-                test_y = head_bot - win_h;
-
-            while (!placed && 
-                   (top_bot ? test_y + win_h <= head_bot
-                            : test_y >= head_top)) {
-                placed = True;
-
-                next_y = test_y + change_y;
-
-                Windows::iterator it = m_windowlist.begin();
-                Windows::iterator it_end = m_windowlist.end();
-                for (; it != it_end && placed; ++it) {
-                    curr_x = (*it)->x();
-                    curr_y = (*it)->y();
-                    curr_w = (*it)->width()  + (*it)->fbWindow().borderWidth()*2;
-                    curr_h = (*it)->height() + (*it)->fbWindow().borderWidth()*2;
-
-                    if (curr_x < test_x + win_w &&
-                        curr_x + curr_w > test_x &&
-                        curr_y < test_y + win_h &&
-                        curr_y + curr_h > test_y) {
-                        // this window is in the way
-                        placed = False;
-
-                        // we find the next y that we can go to (a window will be in the way
-                        // all the way to its bottom)
-                        if (top_bot) {
-                            if (curr_y + curr_h > next_y)
-                                next_y = curr_y + curr_h;
-                        } else {
-                            if (curr_y - win_h < next_y)
-                                next_y = curr_y - win_h;
-                        }
-
-                        // but we can only go to the nearest x, since that is where the 
-                        // next time current windows in the way will change
-                        if (left_right) {
-                            if (curr_x + curr_w < next_x) 
-                                next_x = curr_x + curr_w;
-                        } else {
-                            if (curr_x - win_w > next_x)
-                                next_x = curr_x - win_w;
-                        }
-                    }
-                }
-
-                if (placed) {
-                    place_x = test_x;
-                    place_y = test_y;
-                }
-
-                test_y = next_y;
-            } // end while
-
-            test_x = next_x;
-        } // end while
-
-        break; 
-    } // end COLSMARTPLACEMENT
-
-    }
-
-    // cascade placement or smart placement failed
-    if (! placed) {
-
-        if ((m_cascade_x[head] > ((head_left + head_right) / 2)) ||
-            (m_cascade_y[head] > ((head_top + head_bot) / 2))) {
-            m_cascade_x[head] = head_left + 32;
-            m_cascade_y[head] = head_top + 32;
-        }
-
-        place_x = m_cascade_x[head];
-        place_y = m_cascade_y[head];
-
-        // just one borderwidth, so they can share a borderwidth (looks better)
-        int titlebar_height = win.titlebarHeight() + win.fbWindow().borderWidth();
-        if (titlebar_height < 4) // make sure it is not insignificant
-            titlebar_height = 32;
-        m_cascade_x[head] += titlebar_height;
-        m_cascade_y[head] += titlebar_height;
-    }
-
-    if (place_x + win_w > head_right)
-        place_x = (head_right - win_w) / 2;
-    if (place_y + win_h > head_bot)
-        place_y = (head_bot - win_h) / 2;
-
+    int place_x, place_y;
+    // we ignore the return value, 
+    // the screen placement strategy is guaranteed to succeed.
+    screen().placementStrategy().placeWindow(m_windowlist,
+                                             win,
+                                             place_x, place_y);
 
     win.moveResize(place_x, place_y, win.width(), win.height());
 }