X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FWorkspace.cc;h=41eb3ef0a37dc1ab8f950b090556b7ed1f20b006;hb=d99593673cf29b0b01d83a49353de30a70141cca;hp=6dcd197420745e3d8fa0a6396b587291321bdd0f;hpb=9bf23ee332b5fb2d8093337c84d19d5b7a8e27ca;p=chaz%2Fopenbox diff --git a/src/Workspace.cc b/src/Workspace.cc index 6dcd1974..41eb3ef0 100644 --- a/src/Workspace.cc +++ b/src/Workspace.cc @@ -41,8 +41,10 @@ #include "Toolbar.h" #include "Window.h" #include "Workspace.h" + #include "Windowmenu.h" #include "Geometry.h" +#include "Util.h" #ifdef HAVE_STDIO_H # include @@ -52,9 +54,9 @@ # include #endif // HAVE_STDLIB_H -#ifdef STDC_HEADERS +#ifdef HAVE_STRING_H # include -#endif // STDC_HEADERS +#endif // HAVE_STRING_H #include typedef vector rectList; @@ -118,7 +120,7 @@ const int Workspace::removeWindow(OpenboxWindow *w) { if (w->isTransient() && w->getTransientFor() && w->getTransientFor()->isVisible()) { w->getTransientFor()->setInputFocus(); - } else if (screen.isSloppyFocus()) { + } else if (screen.sloppyFocus()) { screen.getOpenbox().setFocusedWindow((OpenboxWindow *) 0); } else { OpenboxWindow *top = stackingList->first(); @@ -319,6 +321,7 @@ void Workspace::setName(char *new_name) { clientmenu->setLabel(name); clientmenu->update(); + screen.saveWorkspaceNames(); } @@ -333,33 +336,33 @@ static rectList calcSpace(const OpenboxWindow &win, const rectList &spaces) { rectList result; rectList::const_iterator siter; for(siter=spaces.begin(); siter!=spaces.end(); ++siter) { - if(win.getArea().Intersect(*siter)) { + if(win.area().Intersect(*siter)) { //Check for space to the left of the window - if(win.getXFrame() > siter->x()) + if(win.origin().x() > siter->x()) result.push_back(Rect(siter->x(), siter->y(), - win.getXFrame() - siter->x() - 1, + win.origin().x() - siter->x() - 1, siter->h())); //Check for space above the window - if(win.getYFrame() > siter->y()) + if(win.origin().y() > siter->y()) result.push_back(Rect(siter->x(), siter->y(), siter->w(), - win.getYFrame() - siter->y() - 1)); + win.origin().y() - siter->y() - 1)); //Check for space to the right of the window - if((win.getXFrame()+win.getWidth()) < + if((win.origin().x()+win.size().w()) < (siter->x()+siter->w())) - result.push_back(Rect(win.getXFrame() + win.getWidth() + 1, + result.push_back(Rect(win.origin().x() + win.size().w() + 1, siter->y(), siter->x() + siter->w() - - win.getXFrame() - win.getWidth() - 1, + win.origin().x() - win.size().w() - 1, siter->h())); //Check for space below the window - if((win.getYFrame()+win.getHeight()) < + if((win.origin().y()+win.size().h()) < (siter->y()+siter->h())) result.push_back(Rect(siter->x(), - win.getYFrame() + win.getHeight() + 1, + win.origin().y() + win.size().h() + 1, siter->w(), siter->y() + siter->h()- - win.getYFrame() - win.getHeight() - 1)); + win.origin().y() - win.size().h() - 1)); } else @@ -385,17 +388,17 @@ Point *Workspace::bestFitPlacement(const Size &win_size, const Rect &space) spaces = calcSpace(*cur, spaces); //Find first space that fits the window - best = 0; + best = NULL; for (siter=spaces.begin(); siter!=spaces.end(); ++siter) { if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) best = siter; } - if (best != 0) + if (best != NULL) return new Point(best->origin()); else - return new Point(200, 0); + return NULL; //fall back to cascade } inline Point *Workspace::rowSmartPlacement(const Size &win_size, @@ -404,72 +407,145 @@ inline Point *Workspace::rowSmartPlacement(const Size &win_size, int test_x, test_y, place_x = 0, place_y = 0; int start_pos = 0; int change_y = - ((screen.getColPlacementDirection() == BScreen::TopBottom) ? 1 : -1); + ((screen.colPlacementDirection() == BScreen::TopBottom) ? 1 : -1); int change_x = - ((screen.getRowPlacementDirection() == BScreen::LeftRight) ? 1 : -1); + ((screen.rowPlacementDirection() == BScreen::LeftRight) ? 1 : -1); int delta_x = 8, delta_y = 8; LinkedListIterator it(windowList); - test_y = (screen.getColPlacementDirection() == BScreen::TopBottom) ? - start_pos : screen.getHeight() - win_size.h() - start_pos; + test_y = (screen.colPlacementDirection() == BScreen::TopBottom) ? + start_pos : screen.size().h() - win_size.h() - start_pos; while(!placed && - ((screen.getColPlacementDirection() == BScreen::BottomTop) ? + ((screen.colPlacementDirection() == BScreen::BottomTop) ? test_y > 0 : test_y + win_size.h() < (signed) space.h())) { - test_x = (screen.getRowPlacementDirection() == BScreen::LeftRight) ? - start_pos : space.w() - win_size.w() - start_pos; - while (!placed && - ((screen.getRowPlacementDirection() == 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->getWidth() + (screen.getBorderWidth() * 4); - int curr_h = - ((curr->isShaded()) ? curr->getTitleHeight() : curr->getHeight()) + - (screen.getBorderWidth() * 4); - - if (curr->getXFrame() < test_x + win_size.w() && - curr->getXFrame() + curr_w > test_x && - curr->getYFrame() < test_y + win_size.h() && - curr->getYFrame() + curr_h > test_y) { - placed = false; - } + 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->size().w() + (screen.getBorderWidth() * 4); + int curr_h = curr->size().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) { + 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); - } + } - test_y += (change_y * delta_y); + // 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); + } + + test_y += (change_y * delta_y); } - return new Point(place_x, place_y); + if (placed) + return new Point(place_x, place_y); + else + return NULL; // fall back to cascade } -void Workspace::placeWindow(OpenboxWindow *win) { - assert(win != NULL); +inline 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 it(windowList); + + 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->size().w() + (screen.getBorderWidth() * 4); + int curr_h = curr->size().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) { + 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); + } + + test_x += (change_x * delta_x); + } + if (placed) + return pt; + else + return NULL; +} - 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; - const int win_w = win->getWidth() + (screen.getBorderWidth() * 4), - win_h = win->getHeight() + (screen.getBorderWidth() * 4), + cascade_x += win->getTitleHeight(); + cascade_y += win->getTitleHeight(); + + return new Point(cascade_x, cascade_y); +} + + +void Workspace::placeWindow(OpenboxWindow *win) { + ASSERT(win != NULL); + + const int win_w = win->size().w() + (screen.getBorderWidth() * 4), + win_h = win->size().h() + (screen.getBorderWidth() * 4), #ifdef SLIT - slit_x = screen.getSlit()->getX() - screen.getBorderWidth(), - slit_y = screen.getSlit()->getY() - screen.getBorderWidth(), - slit_w = screen.getSlit()->getWidth() + + slit_x = screen.getSlit()->area().x() - screen.getBorderWidth(), + slit_y = screen.getSlit()->area().y() - screen.getBorderWidth(), + slit_w = screen.getSlit()->area().w() + (screen.getBorderWidth() * 4), - slit_h = screen.getSlit()->getHeight() + + slit_h = screen.getSlit()->area().h() + (screen.getBorderWidth() * 4), #endif // SLIT toolbar_x = screen.getToolbar()->getX() - screen.getBorderWidth(), @@ -480,123 +556,42 @@ void Workspace::placeWindow(OpenboxWindow *win) { (screen.getBorderWidth() * 4), start_pos = 0, change_y = - ((screen.getColPlacementDirection() == BScreen::TopBottom) ? 1 : -1), + ((screen.colPlacementDirection() == BScreen::TopBottom) ? 1 : -1), change_x = - ((screen.getRowPlacementDirection() == BScreen::LeftRight) ? 1 : -1), + ((screen.rowPlacementDirection() == BScreen::LeftRight) ? 1 : -1), delta_x = 8, delta_y = 8; - int test_x, test_y, place_x = 0, place_y = 0; LinkedListIterator it(windowList); Rect space(0, 0, - screen.getWidth(), - screen.getHeight() + screen.size().w(), + screen.size().h() ); - Size window_size(win_w, win_h); - - switch (screen.getPlacementPolicy()) { - case BScreen::BestFitPlacement: { - Point *spot = bestFitPlacement(window_size, space); - if (spot != NULL) { - place_x=spot->x(); - place_y=spot->y(); - delete spot; - placed=true; - } + Size window_size(win->size().w()+screen.getBorderWidth() * 4, + win->size().h()+screen.getBorderWidth() * 4); + Point *place = NULL; + + switch (screen.placementPolicy()) { + case BScreen::BestFitPlacement: + place = bestFitPlacement(window_size, space); break; - } - case BScreen::RowSmartPlacement: { - Point *spot=rowSmartPlacement(window_size, space); - if (spot != NULL) { - place_x=spot->x(); - place_y=spot->y(); - delete spot; - placed=true; - } + case BScreen::RowSmartPlacement: + place = rowSmartPlacement(window_size, space); break; - } - - case BScreen::ColSmartPlacement: { - 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())) { - 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; - } - } - - 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); - } - - test_x += (change_x * delta_x); - } - + case BScreen::ColSmartPlacement: + place = colSmartPlacement(window_size, space); break; - } } // switch - if (! placed) { - if (((unsigned) cascade_x > (screen.getWidth() / 2)) || - ((unsigned) cascade_y > (screen.getHeight() / 2))) - cascade_x = cascade_y = 32; - - place_x = cascade_x; - place_y = cascade_y; - - cascade_x += win->getTitleHeight(); - cascade_y += win->getTitleHeight(); - } - - 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()); + if (place == NULL) + place = cascadePlacement(win); + + 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); + + win->configure(place->x(), place->y(), win->size().w(), win->size().h()); + delete place; }