X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2FWorkspace.cc;h=619b520548e8f6b6e12e7b4fd775ae04f91f2526;hb=f75083669f65aadd6b32f8ed25880ca362296a2f;hp=d87373481e061776dd101e82c04b49c8bcccdc6a;hpb=098fae70a6d8d15877938080437f0fc20f52bbf5;p=chaz%2Fopenbox diff --git a/src/Workspace.cc b/src/Workspace.cc index d8737348..619b5205 100644 --- a/src/Workspace.cc +++ b/src/Workspace.cc @@ -31,6 +31,18 @@ # include "../config.h" #endif // HAVE_CONFIG_H +#ifdef HAVE_STDIO_H +# include +#endif // HAVE_STDIO_H + +#ifdef HAVE_STDLIB_H +# include +#endif // HAVE_STDLIB_H + +#ifdef HAVE_STRING_H +# include +#endif // HAVE_STRING_H + #include #include @@ -41,47 +53,27 @@ #include "Toolbar.h" #include "Window.h" #include "Workspace.h" - #include "Windowmenu.h" #include "Geometry.h" #include "Util.h" -#ifdef HAVE_STDIO_H -# include -#endif // HAVE_STDIO_H - -#ifdef HAVE_STDLIB_H -# include -#endif // HAVE_STDLIB_H - -#ifdef HAVE_STRING_H -# include -#endif // HAVE_STRING_H - #include #include typedef std::vector rectList; Workspace::Workspace(BScreen &scrn, int i) : screen(scrn) { cascade_x = cascade_y = 0; - _focused = (OpenboxWindow *) 0; + _focused = _last = (OpenboxWindow *) 0; id = i; - stackingList = new LinkedList; - windowList = new LinkedList; clientmenu = new Clientmenu(*this); - lastfocus = (OpenboxWindow *) 0; - name = (char *) 0; - char *tmp = screen.getNameOfWorkspace(id); - setName(tmp); + setName(screen.getNameOfWorkspace(id)); } Workspace::~Workspace(void) { - delete stackingList; - delete windowList; delete clientmenu; if (name) @@ -89,16 +81,16 @@ Workspace::~Workspace(void) { } -const int Workspace::addWindow(OpenboxWindow *w, Bool place) { +int Workspace::addWindow(OpenboxWindow *w, bool place) { if (! w) return -1; if (place) placeWindow(*w); w->setWorkspace(id); - w->setWindowNumber(windowList->count()); + w->setWindowNumber(_windows.size()); - stackingList->insert(w, 0); - windowList->insert(w); + _zorder.push_front(w); + _windows.push_back(w); clientmenu->insert((const char **) w->getTitle()); clientmenu->update(); @@ -111,43 +103,39 @@ const int Workspace::addWindow(OpenboxWindow *w, Bool place) { } -const int Workspace::removeWindow(OpenboxWindow *w) { +int Workspace::removeWindow(OpenboxWindow *w) { if (! w) return -1; - stackingList->remove(w); + _zorder.remove(w); if (w->isFocused()) { + if (w == _last) + _last = (OpenboxWindow *) 0; + + OpenboxWindow *fw = (OpenboxWindow *) 0; if (w->isTransient() && w->getTransientFor() && - w->getTransientFor()->isVisible()) { - w->getTransientFor()->setInputFocus(); - } else if (screen.sloppyFocus()) { - screen.getOpenbox().focusWindow((OpenboxWindow *) 0); - } else { - OpenboxWindow *top = stackingList->first(); - if (! top || ! top->setInputFocus()) { - screen.getOpenbox().focusWindow((OpenboxWindow *) 0); - XSetInputFocus(screen.getOpenbox().getXDisplay(), - screen.getToolbar()->getWindowID(), - RevertToParent, CurrentTime); - } - } + w->getTransientFor()->isVisible()) + fw = w->getTransientFor(); + else if (screen.sloppyFocus()) // sloppy focus + fw = (OpenboxWindow *) 0; + else if (!_zorder.empty()) // click focus + fw = _zorder.front(); + + if (!(fw != (OpenboxWindow *) 0 && fw->setInputFocus())) + screen.getOpenbox().focusWindow(0); } - if (lastfocus == w) - lastfocus = (OpenboxWindow *) 0; - - windowList->remove(w->getWindowNumber()); + _windows.erase(_windows.begin() + w->getWindowNumber()); clientmenu->remove(w->getWindowNumber()); clientmenu->update(); screen.updateNetizenWindowDel(w->getClientWindow()); - LinkedListIterator it(windowList); - OpenboxWindow *bw = it.current(); - for (int i = 0; bw; it++, i++, bw = it.current()) - bw->setWindowNumber(i); + winVect::iterator it = _windows.begin(); + for (int i=0; it != _windows.end(); ++it, ++i) + (*it)->setWindowNumber(i); - return windowList->count(); + return _windows.size(); } @@ -157,34 +145,30 @@ void Workspace::focusWindow(OpenboxWindow *win) { if (_focused != (OpenboxWindow *) 0) clientmenu->setItemSelected(_focused->getWindowNumber(), false); _focused = win; + if (win != (OpenboxWindow *) 0) + _last = win; } void Workspace::showAll(void) { - LinkedListIterator it(stackingList); - for (OpenboxWindow *bw = it.current(); bw; it++, bw = it.current()) - bw->deiconify(False, False); + winList::iterator it; + for (it = _zorder.begin(); it != _zorder.end(); ++it) + (*it)->deiconify(false, false); } void Workspace::hideAll(void) { - LinkedList lst; - - LinkedListIterator it(stackingList); - for (OpenboxWindow *bw = it.current(); bw; it++, bw = it.current()) - lst.insert(bw, 0); - - LinkedListIterator it2(&lst); - for (OpenboxWindow *bw = it2.current(); bw; it2++, bw = it2.current()) - if (! bw->isStuck()) - bw->withdraw(); + winList::reverse_iterator it; + for (it = _zorder.rbegin(); it != _zorder.rend(); ++it) + if (!(*it)->isStuck()) + (*it)->withdraw(); } void Workspace::removeAll(void) { - LinkedListIterator it(windowList); - for (OpenboxWindow *bw = it.current(); bw; it++, bw = it.current()) - bw->iconify(); + winVect::iterator it; + for (it = _windows.begin(); it != _windows.end(); ++it) + (*it)->iconify(); } @@ -206,14 +190,14 @@ void Workspace::raiseWindow(OpenboxWindow *w) { Workspace *wkspc; win = bottom; - while (True) { + while (true) { *(curr++) = win->getFrameWindow(); screen.updateNetizenWindowRaise(win->getClientWindow()); if (! win->isIconic()) { wkspc = screen.getWorkspace(win->getWorkspaceNumber()); - wkspc->stackingList->remove(win); - wkspc->stackingList->insert(win, 0); + wkspc->_zorder.remove(win); + wkspc->_zorder.push_front(win); } if (! win->hasTransient() || ! win->getTransient()) @@ -245,14 +229,14 @@ void Workspace::lowerWindow(OpenboxWindow *w) { Window *nstack = new Window[i], *curr = nstack; Workspace *wkspc; - while (True) { + while (true) { *(curr++) = win->getFrameWindow(); screen.updateNetizenWindowLower(win->getClientWindow()); if (! win->isIconic()) { wkspc = screen.getWorkspace(win->getWorkspaceNumber()); - wkspc->stackingList->remove(win); - wkspc->stackingList->insert(win); + wkspc->_zorder.remove(win); + wkspc->_zorder.push_back(win); } if (! win->getTransientFor()) @@ -275,48 +259,43 @@ void Workspace::lowerWindow(OpenboxWindow *w) { void Workspace::reconfigure(void) { clientmenu->reconfigure(); - LinkedListIterator it(windowList); - for (OpenboxWindow *bw = it.current(); bw; it++, bw = it.current()) { - if (bw->validateClient()) - bw->reconfigure(); - } + winVect::iterator it; + for (it = _windows.begin(); it != _windows.end(); ++it) + if ((*it)->validateClient()) + (*it)->reconfigure(); } OpenboxWindow *Workspace::getWindow(int index) { - if ((index >= 0) && (index < windowList->count())) - return windowList->find(index); + if ((index >= 0) && (index < (signed)_windows.size())) + return _windows[index]; else - return 0; + return (OpenboxWindow *) 0; } -const int Workspace::getCount(void) { - return windowList->count(); +int Workspace::getCount(void) { + return (signed)_windows.size(); } void Workspace::update(void) { clientmenu->update(); - screen.getToolbar()->redrawWindowLabel(True); + screen.getToolbar()->redrawWindowLabel(true); } -Bool Workspace::isCurrent(void) { +bool Workspace::isCurrent(void) { return (id == screen.getCurrentWorkspaceID()); } -Bool Workspace::isLastWindow(OpenboxWindow *w) { - return (w == windowList->last()); -} - void Workspace::setCurrent(void) { screen.changeWorkspaceID(id); } -void Workspace::setName(char *new_name) { +void Workspace::setName(const char *new_name) { if (name) delete [] name; @@ -335,10 +314,8 @@ void Workspace::setName(char *new_name) { void Workspace::shutdown(void) { - while (windowList->count()) { - windowList->first()->restore(); - delete windowList->first(); - } + while (!_windows.empty()) + _windows[0]->restore(); } static rectList calcSpace(const Rect &win, const rectList &spaces) { @@ -435,14 +412,13 @@ bool colRLBT(const Rect &first, const Rect &second){ Point *Workspace::bestFitPlacement(const Size &win_size, const Rect &space) { const Rect *best; rectList spaces; - LinkedListIterator 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), + winVect::iterator it; + for (it = _windows.begin(); it != _windows.end(); ++it) + spaces = calcSpace((*it)->area().Inflate(screen.getBorderWidth() * 4), spaces); //Find first space that fits the window @@ -490,15 +466,14 @@ Point *Workspace::underMousePlacement(const Size &win_size, const Rect &space) { Point *Workspace::rowSmartPlacement(const Size &win_size, const Rect &space) { const Rect *best; rectList spaces; - LinkedListIterator 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), + winVect::iterator it; + for (it = _windows.begin(); it != _windows.end(); ++it) + spaces = calcSpace((*it)->area().Inflate(screen.getBorderWidth() * 4), spaces); //Sort spaces by preference if(screen.rowPlacementDirection() == BScreen::RightLeft) @@ -532,15 +507,14 @@ Point *Workspace::rowSmartPlacement(const Size &win_size, const Rect &space) { Point *Workspace::colSmartPlacement(const Size &win_size, const Rect &space) { const Rect *best; rectList spaces; - LinkedListIterator 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), + winVect::iterator it; + for (it = _windows.begin(); it != _windows.end(); ++it) + spaces = calcSpace((*it)->area().Inflate(screen.getBorderWidth() * 4), spaces); //Sort spaces by user preference if(screen.colPlacementDirection() == BScreen::TopBottom) @@ -598,7 +572,6 @@ void Workspace::placeWindow(OpenboxWindow &win) { const Size window_size(win.area().w()+screen.getBorderWidth() * 2, win.area().h()+screen.getBorderWidth() * 2); Point *place = NULL; - LinkedListIterator it(windowList); switch (screen.placementPolicy()) { case BScreen::BestFitPlacement: