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());
return NULL; //fall back to cascade
}
+Point *Workspace::underMousePlacement(const Size &win_size, const Rect &space) {
+ Point *pt;
+
+ int x, y, rx, ry;
+ Window c, r;
+ unsigned int m;
+ XQueryPointer(screen.getOpenbox().getXDisplay(), screen.getRootWindow(),
+ &r, &c, &rx, &ry, &x, &y, &m);
+ pt = new Point(rx - win_size.w() / 2, ry - win_size.h() / 2);
+
+ if (pt->x() < space.x())
+ pt->setX(space.x());
+ if (pt->y() < space.y())
+ pt->setY(space.y());
+ if (pt->x() + win_size.w() > space.x() + space.w())
+ pt->setX(space.x() + space.w() - win_size.w());
+ if (pt->y() + win_size.h() > space.y() + space.h())
+ pt->setY(space.y() + space.h() - win_size.h());
+ return pt;
+}
Point *Workspace::rowSmartPlacement(const Size &win_size, const Rect &space) {
bool 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;
-
- cascade_x += win->getTitleHeight();
- cascade_y += win->getTitleHeight();
+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();
+ }
- return new Point(cascade_x, cascade_y);
+ Point *p = new Point(cascade_x, cascade_y);
+ cascade_x += win.getTitleHeight();
+ cascade_y += win.getTitleHeight();
+ return p;
}
-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());
-
-#ifdef SLIT
- Slit *slit = screen.getSlit();
- int slit_x = slit->autoHide() ? slit->hiddenOrigin().x() : slit->area().x(),
- slit_y = slit->autoHide() ? slit->hiddenOrigin().y() : slit->area().y();
- 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
- }
- if ((slit->direction() == Slit::Horizontal &&
- (slit->placement() == Slit::TopLeft ||
- slit->placement() == Slit::TopRight)) ||
- slit->placement() == Slit::TopCenter) {
- // exclude top
- if (tbartop && slit_y + slit->area().h() < tbarh) {
- space.setY(space.y() + tbarh);
- space.setH(space.h() - tbarh);
- } 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));
- 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
- 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)) ||
- // slit->placement() == Slit::CenterLeft)
- // exclude left
- space.setX(slit_x + slit->area().w() +
- screen.getBorderWidth() * 2);
- space.setW(space.w() - (slit_x + 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
-
- const Size window_size(win->area().w()+screen.getBorderWidth() * 4,
- win->area().h()+screen.getBorderWidth() * 4);
+void Workspace::placeWindow(OpenboxWindow &win) {
+ Rect space = screen.availableArea();
+ const Size window_size(win.area().w()+screen.getBorderWidth() * 2,
+ win.area().h()+screen.getBorderWidth() * 2);
Point *place = NULL;
LinkedListIterator<OpenboxWindow> it(windowList);
case BScreen::ColSmartPlacement:
place = colSmartPlacement(window_size, space);
break;
+ case BScreen::UnderMousePlacement:
+ place = underMousePlacement(window_size, space);
+ break;
} // switch
if (place == NULL)
- place = cascadePlacement(win);
+ place = cascadePlacement(win, space);
ASSERT(place != NULL);
- if (place->x() + window_size.w() > (signed) screen.size().w())
- place->setX(((signed) screen.size().w() - window_size.w()) / 2);
- if (place->y() + window_size.h() > (signed) screen.size().h())
- place->setY(((signed) screen.size().h() - window_size.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->area().w(), win->area().h());
+ win.configure(place->x(), place->y(), win.area().w(), win.area().h());
delete place;
}
projects / chaz / openbox / blobdiff