Workspace::Workspace(BScreen &scrn, int i) : screen(scrn) {
cascade_x = cascade_y = 0;
- _focused = (OpenboxWindow *) 0;
+ _focused = _last = (OpenboxWindow *) 0;
id = i;
clientmenu = new Clientmenu(*this);
- lastfocus = (OpenboxWindow *) 0;
-
name = (char *) 0;
- char *tmp = screen.getNameOfWorkspace(id);
- setName(tmp);
+ setName(screen.getNameOfWorkspace(id));
}
}
-const int Workspace::addWindow(OpenboxWindow *w, Bool place) {
+int Workspace::addWindow(OpenboxWindow *w, bool place) {
if (! w) return -1;
if (place) placeWindow(*w);
}
-const int Workspace::removeWindow(OpenboxWindow *w) {
+int Workspace::removeWindow(OpenboxWindow *w) {
if (! w) return -1;
+ winVect::iterator winit = std::find(_windows.begin(), _windows.end(), w);
+
+ if (winit == _windows.end()) {
+ if (w == _last)
+ _last = (OpenboxWindow *) 0;
+ if (w == _focused)
+ _focused = (OpenboxWindow *) 0;
+ return _windows.size();
+ }
+
_zorder.remove(w);
- if (w->isFocused()) {
+ if (w == _last)
+ _last = (OpenboxWindow *) 0;
+ if (w == _focused) {
+ OpenboxWindow *fw = (OpenboxWindow *) 0;
if (w->isTransient() && w->getTransientFor() &&
- w->getTransientFor()->isVisible()) {
- w->getTransientFor()->setInputFocus();
- } else {
- if (screen.sloppyFocus() || // sloppy focus
- _zorder.empty() || // click focus but no windows
- !_zorder.front()->setInputFocus()) { // tried window, but wont focus
- screen.getOpenbox().focusWindow((OpenboxWindow *) 0);
- XSetInputFocus(screen.getOpenbox().getXDisplay(),
- PointerRoot, None, 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;
-
- _windows.erase(_windows.begin() + w->getWindowNumber());
+ _windows.erase(winit);
clientmenu->remove(w->getWindowNumber());
clientmenu->update();
void Workspace::focusWindow(OpenboxWindow *win) {
- if (win != (OpenboxWindow *) 0)
- clientmenu->setItemSelected(win->getWindowNumber(), true);
if (_focused != (OpenboxWindow *) 0)
clientmenu->setItemSelected(_focused->getWindowNumber(), false);
_focused = win;
+ // make sure the focused window belongs to this workspace before highlighting
+ // it in the menu (sticky windows arent in this workspace's menu).
+ if (_focused != (OpenboxWindow *) 0 && _focused->getWorkspaceNumber() == id)
+ clientmenu->setItemSelected(_focused->getWindowNumber(), true);
+ if (win != (OpenboxWindow *) 0)
+ _last = win;
}
Workspace *wkspc;
win = bottom;
- while (True) {
+ while (true) {
*(curr++) = win->getFrameWindow();
screen.updateNetizenWindowRaise(win->getClientWindow());
Window *nstack = new Window[i], *curr = nstack;
Workspace *wkspc;
- while (True) {
+ while (true) {
*(curr++) = win->getFrameWindow();
screen.updateNetizenWindowLower(win->getClientWindow());
OpenboxWindow *Workspace::getWindow(int index) {
- if ((index >= 0) && (index < _windows.size()))
+ if ((index >= 0) && (index < (signed)_windows.size()))
return _windows[index];
else
return (OpenboxWindow *) 0;
}
-const int Workspace::getCount(void) {
- return _windows.size();
+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());
}
}
-void Workspace::setName(char *new_name) {
+void Workspace::setName(const char *new_name) {
if (name)
delete [] name;
name = bstrdup(new_name);
} else {
name = new char[128];
- sprintf(name, i18n->getMessage(WorkspaceSet, WorkspaceDefaultNameFormat,
- "Workspace %d"), id + 1);
+ sprintf(name, i18n(WorkspaceSet, WorkspaceDefaultNameFormat,
+ "Workspace %d"), id + 1);
}
-
+
clientmenu->setLabel(name);
clientmenu->update();
screen.saveWorkspaceNames();
void Workspace::shutdown(void) {
- while (!_windows.empty()) {
+ while (!_windows.empty())
_windows[0]->restore();
- delete _windows[0];
- }
}
static rectList calcSpace(const Rect &win, const rectList &spaces) {
bool rowRLBT(const Rect &first, const Rect &second){
if (first.y()+first.h()==second.y()+second.h())
- return first.x()+first.w()>second.x()+second.w();
+ return first.x()+first.w()>second.x()+second.w();
return first.y()+first.h()>second.y()+second.h();
}
-
+
bool rowRLTB(const Rect &first, const Rect &second){
if (first.y()==second.y())
- return first.x()+first.w()>second.x()+second.w();
+ return first.x()+first.w()>second.x()+second.w();
return first.y()<second.y();
}
bool rowLRBT(const Rect &first, const Rect &second){
if (first.y()+first.h()==second.y()+second.h())
- return first.x()<second.x();
+ return first.x()<second.x();
return first.y()+first.h()>second.y()+second.h();
}
-
+
bool rowLRTB(const Rect &first, const Rect &second){
if (first.y()==second.y())
- return first.x()<second.x();
+ return first.x()<second.x();
return first.y()<second.y();
}
-
+
bool colLRTB(const Rect &first, const Rect &second){
if (first.x()==second.x())
- return first.y()<second.y();
+ return first.y()<second.y();
return first.x()<second.x();
}
-
+
bool colLRBT(const Rect &first, const Rect &second){
if (first.x()==second.x())
- return first.y()+first.h()>second.y()+second.h();
+ return first.y()+first.h()>second.y()+second.h();
return first.x()<second.x();
}
bool colRLTB(const Rect &first, const Rect &second){
if (first.x()+first.w()==second.x()+second.w())
- return first.y()<second.y();
+ return first.y()<second.y();
return first.x()+first.w()>second.x()+second.w();
}
-
+
bool colRLBT(const Rect &first, const Rect &second){
if (first.x()+first.w()==second.x()+second.w())
- return first.y()+first.h()>second.y()+second.h();
+ return first.y()+first.h()>second.y()+second.h();
return first.x()+first.w()>second.x()+second.w();
}
rectList spaces;
rectList::const_iterator siter;
spaces.push_back(space); //initially the entire screen is free
-
+
//Find Free Spaces
- for (winVect::iterator it = _windows.begin(); it != _windows.end(); ++it)
- spaces = calcSpace((*it)->area().Inflate(screen.getBorderWidth() * 4),
- spaces);
-
+ 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
best = NULL;
for (siter=spaces.begin(); siter!=spaces.end(); ++siter) {
rectList::const_iterator siter;
spaces.push_back(space); //initially the entire screen is free
-
+
//Find Free Spaces
- for (winVect::iterator it = _windows.begin(); it != _windows.end(); ++it)
- spaces = calcSpace((*it)->area().Inflate(screen.getBorderWidth() * 4),
- spaces);
+ 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)
- if(screen.colPlacementDirection() == BScreen::TopBottom)
- sort(spaces.begin(),spaces.end(),rowRLTB);
- else
- sort(spaces.begin(),spaces.end(),rowRLBT);
+ if(screen.colPlacementDirection() == BScreen::TopBottom)
+ sort(spaces.begin(),spaces.end(),rowRLTB);
+ else
+ sort(spaces.begin(),spaces.end(),rowRLBT);
else
- if(screen.colPlacementDirection() == BScreen::TopBottom)
- sort(spaces.begin(),spaces.end(),rowLRTB);
- else
- sort(spaces.begin(),spaces.end(),rowLRBT);
+ if(screen.colPlacementDirection() == BScreen::TopBottom)
+ sort(spaces.begin(),spaces.end(),rowLRTB);
+ else
+ sort(spaces.begin(),spaces.end(),rowLRBT);
best = NULL;
for (siter=spaces.begin(); siter!=spaces.end(); ++siter)
if ((siter->w() >= win_size.w()) && (siter->h() >= win_size.h())) {
rectList::const_iterator siter;
spaces.push_back(space); //initially the entire screen is free
-
+
//Find Free Spaces
- for (winVect::iterator it = _windows.begin(); it != _windows.end(); ++it)
- spaces = calcSpace((*it)->area().Inflate(screen.getBorderWidth() * 4),
- spaces);
+ 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)
- if(screen.rowPlacementDirection() == BScreen::LeftRight)
- sort(spaces.begin(),spaces.end(),colLRTB);
- else
- sort(spaces.begin(),spaces.end(),colRLTB);
+ if(screen.rowPlacementDirection() == BScreen::LeftRight)
+ sort(spaces.begin(),spaces.end(),colLRTB);
+ else
+ sort(spaces.begin(),spaces.end(),colRLTB);
else
- if(screen.rowPlacementDirection() == BScreen::LeftRight)
- sort(spaces.begin(),spaces.end(),colLRBT);
- else
- sort(spaces.begin(),spaces.end(),colRLBT);
+ if(screen.rowPlacementDirection() == BScreen::LeftRight)
+ sort(spaces.begin(),spaces.end(),colLRBT);
+ else
+ sort(spaces.begin(),spaces.end(),colRLBT);
//Find first space that fits the window
best = NULL;
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);