#endif // HAVE_STRING_H
#include <vector>
+#include <algorithm>
typedef vector<Rect> rectList;
Workspace::Workspace(BScreen &scrn, int i) : screen(scrn) {
- cascade_x = cascade_y = 32;
+ cascade_x = cascade_y = 0;
id = i;
const 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());
}
}
-static rectList calcSpace(const OpenboxWindow &win, const rectList &spaces) {
+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.area().Intersect(*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
return result;
}
+
+bool incWidth(const Rect &first, const Rect &second) {
+ return first.x() < second.x();
+}
+
+
+bool decWidth(const Rect &first, const Rect &second) {
+ if (second.x() == first.x())
+ return second.w() < first.w();
+ return second.x() < first.x();
+}
+
+
+bool incHeight(const Rect &first, const Rect &second) {
+ return first.y() < second.y();
+}
+
+
+bool decHeight(const Rect &first, const Rect &second) {
+ if (second.y() == first.y())
+ return second.h() < first.h();
+ return second.y() < first.y();
+}
+
+
//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)
-{
+Point *Workspace::bestFitPlacement(const Size &win_size, const Rect &space) {
const Rect *best;
rectList spaces;
LinkedListIterator<OpenboxWindow> it(windowList);
//Find Free Spaces
for (OpenboxWindow *cur=it.current(); cur!=NULL; it++, cur=it.current())
- spaces = calcSpace(*cur, spaces);
+ spaces = calcSpace(cur->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()))
- best = siter;
+ if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) {
+ if (best==NULL)
+ best = siter;
+ else if(siter->w()*siter->h()<best->h()*best->w())
+ best = siter;
+ }
}
-
- if (best != NULL)
- return new Point(best->origin());
- else
+ if (best != NULL) {
+ Point *pt = new Point(best->origin());
+ if (screen.colPlacementDirection() != BScreen::TopBottom)
+ pt->setY(pt->y() + (best->h() - win_size.h()));
+ if (screen.rowPlacementDirection() != BScreen::LeftRight)
+ pt->setX(pt->x() + (best->w() - win_size.w()));
+ return pt;
+ } else
return NULL; //fall back to cascade
}
-inline Point *Workspace::rowSmartPlacement(const Size &win_size,
- const Rect &space){
+
+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;
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);
+ int curr_w = curr->area().w() + (screen.getBorderWidth() * 4);
+ int curr_h = curr->area().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) {
+ if (curr->area().x() < test_x + win_size.w() &&
+ curr->area().x() + curr_w > test_x &&
+ curr->area().y() < test_y + win_size.h() &&
+ curr->area().y() + curr_h > test_y) {
placed = false;
}
}
return NULL; // fall back to cascade
}
-inline Point * Workspace::colSmartPlacement(const Size &win_size,
- const Rect &space){
+Point *Workspace::colSmartPlacement(const Size &win_size, const Rect &space) {
Point *pt;
bool placed=false;
int test_x, test_y;
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);
+ int curr_w = curr->area().w() + (screen.getBorderWidth() * 4);
+ int curr_h = curr->area().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) {
+ if (curr->area().x() < test_x + win_size.w() &&
+ curr->area().x() + curr_w > test_x &&
+ curr->area().y() < test_y + win_size.h() &&
+ curr->area().y() + curr_h > test_y) {
placed = False;
}
}
return NULL;
}
-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();
-
- return new Point(cascade_x, cascade_y);
-}
-
-
-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());
-
- cout << "space: x: " << space.x() << " y: " << space.y() << " w: " << space.w() << " h: " << space.h() << endl;
-#ifdef SLIT
- Slit *slit = screen.getSlit();
- int remove; // 0 - top/2 - right/2 - bottom/3 - left
- if ((slit->direction() == Slit::Horizontal &&
- (slit->placement() == Slit::TopLeft ||
- slit->placement() == Slit::TopRight)) ||
- slit->placement() == Slit::TopCenter)
- remove = 0;
- else if ((slit->direction() == Slit::Vertical &&
- (slit->placement() == Slit::TopRight ||
- slit->placement() == Slit::BottomRight)) ||
- slit->placement() == Slit::CenterRight)
- remove = 1;
- else if ((slit->direction() == Slit::Horizontal &&
- (slit->placement() == Slit::BottomLeft ||
- slit->placement() == Slit::BottomRight)) ||
- slit->placement() == Slit::TopCenter)
- remove = 2;
- else// if ((slit->direction() == Slit::Vertical &&
- // (slit->placement() == Slit::TopLeft ||
- // slit->placement() == Slit::BottomLeft)) ||
- // slit->placement() == Slit::CenterLeft)
- remove = 3;
- switch (remove) {
- case 0: // top
- space.setY(slit->area().h() + screen.getBorderWidth() * 2);
- break;
- case 1: // right
- space.setW(screen.size().w() -
- (slit->area().w() + screen.getBorderWidth() * 2));
- break;
- case 2: // bottom
- space.setH(screen.size().h() -
- (slit->area().h() + screen.getBorderWidth() * 2));
- break;
- case 3: // left
- space.setX(slit->area().w() + screen.getBorderWidth() * 2);
- break;
- }
-#endif
-
- cout << "space: x: " << space.x() << " y: " << space.y() << " w: " << space.w() << " h: " << space.h() << endl;
- 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:
- if (tbarh > space.y())
- space.setY(toolbar->getExposedHeight());
- break;
- case Toolbar::BottomLeft:
- case Toolbar::BottomCenter:
- case Toolbar::BottomRight:
- if (screen.size().h() - tbarh < space.h())
- space.setH(screen.size().h() - tbarh);
- break;
- default:
- ASSERT(false); // unhandled placement
+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();
}
- cout << "space: x: " << space.x() << " y: " << space.y() << " w: " << space.w() << " h: " << space.h() << endl;
- 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;
+ Point *p = new Point(cascade_x, cascade_y);
+ cascade_x += win.getTitleHeight();
+ cascade_y += win.getTitleHeight();
+ return p;
+}
- LinkedListIterator<OpenboxWindow> it(windowList);
- 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() * 4,
+ win.area().h()+screen.getBorderWidth() * 4);
Point *place = NULL;
+ LinkedListIterator<OpenboxWindow> it(windowList);
switch (screen.placementPolicy()) {
case BScreen::BestFitPlacement:
} // switch
if (place == NULL)
- place = cascadePlacement(win);
+ place = cascadePlacement(win, space);
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);
+ 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;
}
projects / chaz / openbox / blobdiff