// Workspace.cc for Openbox
+// Copyright (c) 2002 - 2002 Ben Jansens (ben@orodu.net)
// Copyright (c) 2001 Sean 'Shaleh' Perry <shaleh@debian.org>
// Copyright (c) 1997 - 2000 Brad Hughes (bhughes@tcac.net)
//
#include "Toolbar.h"
#include "Window.h"
#include "Workspace.h"
+
#include "Windowmenu.h"
+#include "Geometry.h"
+#include "Util.h"
#ifdef HAVE_STDIO_H
# include <stdio.h>
#endif // HAVE_STDIO_H
-#ifdef STDC_HEADERS
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif // HAVE_STDLIB_H
+
+#ifdef HAVE_STRING_H
# include <string.h>
-#endif // STDC_HEADERS
+#endif // HAVE_STRING_H
+#include <vector>
+#include <algorithm>
+typedef vector<Rect> rectList;
-Workspace::Workspace(BScreen *scrn, int i) {
- screen = scrn;
+Workspace::Workspace(BScreen &scrn, int i) : screen(scrn) {
- cascade_x = cascade_y = 32;
+ cascade_x = cascade_y = 0;
id = i;
stackingList = new LinkedList<OpenboxWindow>;
windowList = new LinkedList<OpenboxWindow>;
- clientmenu = new Clientmenu(this);
+ clientmenu = new Clientmenu(*this);
lastfocus = (OpenboxWindow *) 0;
name = (char *) 0;
- char *tmp = screen->getNameOfWorkspace(id);
+ char *tmp = screen.getNameOfWorkspace(id);
setName(tmp);
}
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());
clientmenu->insert((const char **) w->getTitle());
clientmenu->update();
- screen->updateNetizenWindowAdd(w->getClientWindow(), id);
+ screen.updateNetizenWindowAdd(w->getClientWindow(), id);
raiseWindow(w);
if (w->isTransient() && w->getTransientFor() &&
w->getTransientFor()->isVisible()) {
w->getTransientFor()->setInputFocus();
- } else if (screen->isSloppyFocus()) {
- screen->getOpenbox()->setFocusedWindow((OpenboxWindow *) 0);
+ } else if (screen.sloppyFocus()) {
+ screen.getOpenbox().setFocusedWindow((OpenboxWindow *) 0);
} else {
OpenboxWindow *top = stackingList->first();
if (! top || ! top->setInputFocus()) {
- screen->getOpenbox()->setFocusedWindow((OpenboxWindow *) 0);
- XSetInputFocus(screen->getOpenbox()->getXDisplay(),
- screen->getToolbar()->getWindowID(),
+ screen.getOpenbox().setFocusedWindow((OpenboxWindow *) 0);
+ XSetInputFocus(screen.getOpenbox().getXDisplay(),
+ screen.getToolbar()->getWindowID(),
RevertToParent, CurrentTime);
}
}
clientmenu->remove(w->getWindowNumber());
clientmenu->update();
- screen->updateNetizenWindowDel(w->getClientWindow());
+ screen.updateNetizenWindowDel(w->getClientWindow());
LinkedListIterator<OpenboxWindow> it(windowList);
OpenboxWindow *bw = it.current();
win = bottom;
while (True) {
*(curr++) = win->getFrameWindow();
- screen->updateNetizenWindowRaise(win->getClientWindow());
+ screen.updateNetizenWindowRaise(win->getClientWindow());
if (! win->isIconic()) {
- wkspc = screen->getWorkspace(win->getWorkspaceNumber());
+ wkspc = screen.getWorkspace(win->getWorkspaceNumber());
wkspc->stackingList->remove(win);
wkspc->stackingList->insert(win, 0);
}
win = win->getTransient();
}
- screen->raiseWindows(nstack, i);
+ screen.raiseWindows(nstack, i);
delete [] nstack;
}
while (True) {
*(curr++) = win->getFrameWindow();
- screen->updateNetizenWindowLower(win->getClientWindow());
+ screen.updateNetizenWindowLower(win->getClientWindow());
if (! win->isIconic()) {
- wkspc = screen->getWorkspace(win->getWorkspaceNumber());
+ wkspc = screen.getWorkspace(win->getWorkspaceNumber());
wkspc->stackingList->remove(win);
wkspc->stackingList->insert(win);
}
win = win->getTransientFor();
}
- screen->getOpenbox()->grab();
+ screen.getOpenbox().grab();
- XLowerWindow(screen->getBaseDisplay()->getXDisplay(), *nstack);
- XRestackWindows(screen->getBaseDisplay()->getXDisplay(), nstack, i);
+ XLowerWindow(screen.getBaseDisplay().getXDisplay(), *nstack);
+ XRestackWindows(screen.getBaseDisplay().getXDisplay(), nstack, i);
- screen->getOpenbox()->ungrab();
+ screen.getOpenbox().ungrab();
delete [] nstack;
}
void Workspace::update(void) {
clientmenu->update();
- screen->getToolbar()->redrawWindowLabel(True);
+ screen.getToolbar()->redrawWindowLabel(True);
}
Bool Workspace::isCurrent(void) {
- return (id == screen->getCurrentWorkspaceID());
+ return (id == screen.getCurrentWorkspaceID());
}
}
void Workspace::setCurrent(void) {
- screen->changeWorkspaceID(id);
+ screen.changeWorkspaceID(id);
}
clientmenu->setLabel(name);
clientmenu->update();
+ screen.saveWorkspaceNames();
}
}
}
-void Workspace::placeWindow(OpenboxWindow *win) {
- Bool placed = False;
-
- const int win_w = win->getWidth() + (screen->getBorderWidth() * 4),
- win_h = win->getHeight() + (screen->getBorderWidth() * 4),
-#ifdef SLIT
- slit_x = screen->getSlit()->getX() - screen->getBorderWidth(),
- slit_y = screen->getSlit()->getY() - screen->getBorderWidth(),
- slit_w = screen->getSlit()->getWidth() +
- (screen->getBorderWidth() * 4),
- slit_h = screen->getSlit()->getHeight() +
- (screen->getBorderWidth() * 4),
-#endif // SLIT
- toolbar_x = screen->getToolbar()->getX() - screen->getBorderWidth(),
- toolbar_y = screen->getToolbar()->getY() - screen->getBorderWidth(),
- toolbar_w = screen->getToolbar()->getWidth() +
- (screen->getBorderWidth() * 4),
- toolbar_h = screen->getToolbar()->getHeight() +
- (screen->getBorderWidth() * 4),
- start_pos = 0,
- change_y =
- ((screen->getColPlacementDirection() == BScreen::TopBottom) ? 1 : -1),
- change_x =
- ((screen->getRowPlacementDirection() == BScreen::LeftRight) ? 1 : -1),
- delta_x = 8, delta_y = 8;
+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.Intersect(*siter)) {
+ //Check for space to the left of the window
+ if(win.x() > siter->x())
+ result.push_back(Rect(siter->x(), siter->y(),
+ win.x() - siter->x() - 1,
+ siter->h()));
+ //Check for space above the window
+ if(win.y() > siter->y())
+ result.push_back(Rect(siter->x(), siter->y(),
+ siter->w(),
+ win.y() - siter->y() - 1));
+ //Check for space to the right of the window
+ if((win.x()+win.w()) <
+ (siter->x()+siter->w()))
+ result.push_back(Rect(win.x() + win.w() + 1,
+ siter->y(),
+ siter->x() + siter->w() -
+ win.x() - win.w() - 1,
+ siter->h()));
+ //Check for space below the window
+ if((win.y()+win.h()) <
+ (siter->y()+siter->h()))
+ result.push_back(Rect(siter->x(),
+ win.y() + win.h() + 1,
+ siter->w(),
+ siter->y() + siter->h()-
+ win.y() - win.h() - 1));
+
+ }
+ else
+ result.push_back(*siter);
+ }
+ 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) {
+ const Rect *best;
+ rectList spaces;
+ 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::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())) {
+ if (best==NULL)
+ best = siter;
+ else if(siter->w()*siter->h()<best->h()*best->w())
+ best = siter;
+ }
+ }
+ 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
+}
+
+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;
+ 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);
- switch (screen->getPlacementPolicy()) {
- case BScreen::RowSmartPlacement: {
- test_y = (screen->getColPlacementDirection() == BScreen::TopBottom) ?
- start_pos : screen->getHeight() - win_h - start_pos;
+ 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->getColPlacementDirection() == BScreen::BottomTop) ?
- test_y > 0 : test_y + win_h < (signed) screen->getHeight())) {
- test_x = (screen->getRowPlacementDirection() == BScreen::LeftRight) ?
- start_pos : screen->getWidth() - win_w - start_pos;
-
- while (!placed &&
- ((screen->getRowPlacementDirection() == BScreen::RightLeft) ?
- test_x > 0 : test_x + win_w < (signed) screen->getWidth())) {
- placed = True;
-
- it.reset();
- for (OpenboxWindow *curr = it.current(); placed && curr;
- it++, curr = it.current()) {
- if (curr->isMaximizedFull()) // fully maximized, ignore it
- continue;
- int curr_w = curr->getWidth() + (screen->getBorderWidth() * 4);
- int curr_h =
- ((curr->isShaded()) ? curr->getTitleHeight() : curr->getHeight()) +
- (screen->getBorderWidth() * 4);
-
- if (curr->getXFrame() < test_x + win_w &&
- curr->getXFrame() + curr_w > test_x &&
- curr->getYFrame() < test_y + win_h &&
- curr->getYFrame() + curr_h > test_y) {
- placed = False;
- }
+ ((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;
}
+ }
- if (placed &&
- (toolbar_x < test_x + win_w &&
- toolbar_x + toolbar_w > test_x &&
- toolbar_y < test_y + win_h &&
- toolbar_y + toolbar_h > test_y)
-#ifdef SLIT
- ||
- (slit_x < test_x + win_w &&
- slit_x + slit_w > test_x &&
- slit_y < test_y + win_h &&
- slit_y + slit_h > test_y)
-#endif // SLIT
- )
- placed = False;
-
- if (placed) {
- place_x = test_x;
- place_y = test_y;
+ // Removed code for checking toolbar and slit
+ // The space passed in should not include either
- break;
- }
+ if (placed) {
+ place_x = test_x;
+ place_y = test_y;
- test_x += (change_x * delta_x);
- }
+ break;
+ }
- test_y += (change_y * delta_y);
+ test_x += (change_x * delta_x);
}
- break;
+ test_y += (change_y * delta_y);
}
+ if (placed)
+ return new Point(place_x, place_y);
+ else
+ return NULL; // fall back to cascade
+}
- case BScreen::ColSmartPlacement: {
- test_x = (screen->getRowPlacementDirection() == BScreen::LeftRight) ?
- start_pos : screen->getWidth() - win_w - start_pos;
+Point *Workspace::colSmartPlacement(const Size &win_size, const Rect &space) {
+ 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);
- while (!placed &&
- ((screen->getRowPlacementDirection() == BScreen::RightLeft) ?
- test_x > 0 : test_x + win_w < (signed) screen->getWidth())) {
- test_y = (screen->getColPlacementDirection() == BScreen::TopBottom) ?
- start_pos : screen->getHeight() - win_h - start_pos;
-
- while (!placed &&
- ((screen->getColPlacementDirection() == BScreen::BottomTop) ?
- test_y > 0 : test_y + win_h < (signed) screen->getHeight())) {
- placed = True;
-
- it.reset();
- for (OpenboxWindow *curr = it.current(); placed && curr;
- it++, curr = it.current()) {
- if (curr->isMaximizedFull()) // fully maximized, ignore it
- continue;
- int curr_w = curr->getWidth() + (screen->getBorderWidth() * 4);
- int curr_h =
- ((curr->isShaded()) ? curr->getTitleHeight() : curr->getHeight()) +
- (screen->getBorderWidth() * 4);
-
- if (curr->getXFrame() < test_x + win_w &&
- curr->getXFrame() + curr_w > test_x &&
- curr->getYFrame() < test_y + win_h &&
- curr->getYFrame() + curr_h > test_y) {
- placed = False;
- }
+ 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 &&
- (toolbar_x < test_x + win_w &&
- toolbar_x + toolbar_w > test_x &&
- toolbar_y < test_y + win_h &&
- toolbar_y + toolbar_h > test_y)
-#ifdef SLIT
- ||
- (slit_x < test_x + win_w &&
- slit_x + slit_w > test_x &&
- slit_y < test_y + win_h &&
- slit_y + slit_h > test_y)
-#endif // SLIT
- )
- placed = False;
-
- if (placed) {
- place_x = test_x;
- place_y = test_y;
-
- break;
- }
-
- test_y += (change_y * delta_y);
+ if (placed) {
+ pt= new Point(test_x,test_y);
+
+ break;
}
- test_x += (change_x * delta_x);
+ test_y += (change_y * delta_y);
}
- break;
+ test_x += (change_x * delta_x);
}
- } // switch
-
- if (! placed) {
- if (((unsigned) cascade_x > (screen->getWidth() / 2)) ||
- ((unsigned) cascade_y > (screen->getHeight() / 2)))
- cascade_x = cascade_y = 32;
+ if (placed)
+ return pt;
+ else
+ return NULL;
+}
- place_x = cascade_x;
- place_y = cascade_y;
- 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();
}
-
- if (place_x + win_w > (signed) screen->getWidth())
- place_x = (((signed) screen->getWidth()) - win_w) / 2;
- if (place_y + win_h > (signed) screen->getHeight())
- place_y = (((signed) screen->getHeight()) - win_h) / 2;
- win->configure(place_x, place_y, win->getWidth(), win->getHeight());
+ Point *p = new Point(cascade_x, cascade_y);
+ cascade_x += win.getTitleHeight();
+ cascade_y += win.getTitleHeight();
+ return p;
+}
+
+
+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:
+ place = bestFitPlacement(window_size, space);
+ break;
+ case BScreen::RowSmartPlacement:
+ place = rowSmartPlacement(window_size, space);
+ break;
+ case BScreen::ColSmartPlacement:
+ place = colSmartPlacement(window_size, space);
+ break;
+ } // switch
+
+ if (place == NULL)
+ place = cascadePlacement(win, space);
+
+ ASSERT(place != NULL);
+ 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());
+ delete place;
}
projects / chaz / openbox / blobdiff