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
Point *Workspace::rowSmartPlacement(const Size &win_size, const Rect &space) {
- const Rect *best;
- rectList spaces;
+ 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);
- 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);
-
- //Sort the spaces by placement choice
- if (screen.colPlacementDirection() == BScreen::LeftRight)
- sort(spaces.begin(), spaces.end(), incWidth);
- 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
- best = NULL;
- for (siter=spaces.begin(); siter!=spaces.end(); ++siter)
- if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) {
- best = siter;
- break;
+ 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.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->area().w() + (screen.getBorderWidth() * 4);
+ int curr_h = curr->area().h() + (screen.getBorderWidth() * 4);
+
+ 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;
+ }
+ }
+
+ // 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);
}
- 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
+ test_y += (change_y * delta_y);
+ }
+ if (placed)
+ return new Point(place_x, place_y);
+ else
+ return NULL; // fall back to cascade
}
Point *Workspace::colSmartPlacement(const Size &win_size, const Rect &space) {
- const Rect *best;
- rectList spaces;
+ 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);
- 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);
-
- //Sort the spaces by placement choice
- if (screen.rowPlacementDirection() == BScreen::LeftRight)
- sort(spaces.begin(),spaces.end(),incWidth);
- else
- sort(spaces.begin(),spaces.end(),decWidth);
- //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;
- break;
+ 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())){
+
+ placed = true;
+
+ it.reset();
+ for (OpenboxWindow *curr = it.current(); placed && curr;
+ it++, curr = it.current()) {
+ int curr_w = curr->area().w() + (screen.getBorderWidth() * 4);
+ int curr_h = curr->area().h() + (screen.getBorderWidth() * 4);
+
+ 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;
+ }
+ }
+
+ // 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);
+
+ break;
+ }
+
+ test_y += (change_y * delta_y);
}
- 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()));
+ test_x += (change_x * delta_x);
+ }
+ if (placed)
return pt;
- } else
- return NULL; //fall back to cascade
+ else
+ return NULL;
}
slit->placement() == Slit::TopRight)) ||
slit->placement() == Slit::TopCenter) {
// exclude top
- if (tbartop)
- space.setH(space.h() - slit_y);
- else
+ if (tbartop && slit_y + slit->area().h() < tbarh) {
+ space.setY(space.y() + tbarh);
space.setH(space.h() - tbarh);
- space.setY(space.y() + slit_y + slit->area().h() +
- screen.getBorderWidth() * 2);
- space.setH(space.h() - (slit_y + slit->area().h() +
- screen.getBorderWidth() * 2));
+ } else {
+ space.setY(space.y() + (slit_y + slit->area().h() +
+ screen.getBorderWidth() * 2));
+ space.setH(space.h() - (slit_y + slit->area().h() +
+ screen.getBorderWidth() * 2));
+ if (!tbartop)
+ space.setH(space.h() - tbarh);
+ }
} else if ((slit->direction() == Slit::Vertical &&
(slit->placement() == Slit::TopRight ||
slit->placement() == Slit::BottomRight)) ||
slit->placement() == Slit::CenterRight) {
// exclude right
- space.setW(space.w() - (screen.size().w() - slit_x +
- screen.getBorderWidth() * 2));
+ space.setW(space.w() - (screen.size().w() - slit_x));
if (tbartop)
space.setY(space.y() + tbarh);
space.setH(space.h() - tbarh);
slit->placement() == Slit::BottomRight)) ||
slit->placement() == Slit::BottomCenter) {
// exclude bottom
- space.setH(space.h() - ((screen.size().h() - slit_y) > tbarh ?
- screen.size().h() - slit_y : tbarh));
+ if (!tbartop && (screen.size().h() - slit_y) < tbarh) {
+ space.setH(space.h() - tbarh);
+ } else {
+ space.setH(space.h() - (screen.size().h() - slit_y));
+ if (tbartop) {
+ space.setY(space.y() + tbarh);
+ space.setH(space.h() - tbarh);
+ }
+ }
} else {// if ((slit->direction() == Slit::Vertical &&
// (slit->placement() == Slit::TopLeft ||
// slit->placement() == Slit::BottomLeft)) ||
projects / chaz / openbox / blobdiff