lastfocus = (BlackboxWindow *) 0;
- setName("");
+ readName();
}
if (place) placeWindow(w);
- w->setWorkspace(id);
- w->setWindowNumber(windowList.size());
-
stackingList.push_front(w);
- windowList.push_back(w);
+
+ if (w->isNormal()) {
+ w->setWorkspace(id);
+ w->setWindowNumber(windowList.size());
- clientmenu->insert(w->getTitle());
- clientmenu->update();
+ windowList.push_back(w);
+
+ clientmenu->insert(w->getTitle());
+ clientmenu->update();
+
+ screen->updateNetizenWindowAdd(w->getClientWindow(), id);
- screen->updateNetizenWindowAdd(w->getClientWindow(), id);
+ if (id != screen->getCurrentWorkspaceID() &&
+ screen->doFocusNew()) {
+ /*
+ not on the focused workspace, so the window is not going to get focus
+ but if the user wants new windows focused, then it should get focus
+ when this workspace does become focused.
+ */
+ lastfocus = w;
+ }
+ }
- raiseWindow(w);
+ if (! w->isDesktop())
+ raiseWindow(w);
+ else
+ lowerWindow(w);
}
-unsigned int Workspace::removeWindow(BlackboxWindow *w) {
+void Workspace::removeWindow(BlackboxWindow *w) {
assert(w != 0);
stackingList.remove(w);
// pass focus to the next appropriate window
if ((w->isFocused() || w == lastfocus) &&
! screen->getBlackbox()->doShutdown()) {
- BlackboxWindow *newfocus = 0;
- if (w->isTransient())
- newfocus = w->getTransientFor();
- if (! newfocus && ! stackingList.empty())
- newfocus = stackingList.front();
-
- assert(newfocus != w); // this would be very wrong.
-
- if (id == screen->getCurrentWorkspaceID()) {
- /*
- if the window is on the visible workspace, then try focus it, and fall
- back to the default focus target if the window won't focus.
- */
- if (! newfocus || ! newfocus->setInputFocus())
- screen->getBlackbox()->setFocusedWindow(0);
- } else if (lastfocus == w) {
- /*
- If this workspace is not the current one do not assume that
- w == lastfocus. If a sticky window is removed on a workspace other
- than where it originated, it will fire the removeWindow on a
- non-visible workspace.
- */
-
- /*
- If the window isn't on the visible workspace, don't focus the new one,
- just mark it to be focused when the workspace comes into view.
- */
- setLastFocusedWindow(newfocus);
+ focusFallback(w);
+
+ // if the window is sticky, then it needs to be removed on all other
+ // workspaces too!
+ if (w->isStuck()) {
+ for (unsigned int i = 0; i < screen->getWorkspaceCount(); ++i)
+ if (i != id)
+ screen->getWorkspace(i)->focusFallback(w);
}
}
+ if (! w->isNormal()) return;
+
windowList.remove(w);
clientmenu->remove(w->getWindowNumber());
clientmenu->update();
if (i == 0)
cascade_x = cascade_y = 32;
+}
+
+
+void Workspace::focusFallback(const BlackboxWindow *old_window) {
+ BlackboxWindow *newfocus = 0;
+
+ if (id == screen->getCurrentWorkspaceID()) {
+ // The window is on the visible workspace.
- return i;
+ // if it's a transient, then try to focus its parent
+ if (old_window && old_window->isTransient()) {
+ newfocus = old_window->getTransientFor();
+
+ if (! newfocus ||
+ newfocus->isIconic() || // do not focus icons
+ newfocus->getWorkspaceNumber() != id || // or other workspaces
+ ! newfocus->setInputFocus())
+ newfocus = 0;
+ }
+
+ if (! newfocus) {
+ BlackboxWindowList::iterator it = stackingList.begin(),
+ end = stackingList.end();
+ for (; it != end; ++it) {
+ BlackboxWindow *tmp = *it;
+ if (tmp && tmp->isNormal() && tmp->setInputFocus()) {
+ // we found our new focus target
+ newfocus = tmp;
+ break;
+ }
+ }
+ }
+
+ screen->getBlackbox()->setFocusedWindow(newfocus);
+ } else {
+ // The window is not on the visible workspace.
+
+ if (old_window && lastfocus == old_window) {
+ // The window was the last-focus target, so we need to replace it.
+ BlackboxWindow *win = (BlackboxWindow*) 0;
+ if (! stackingList.empty())
+ win = stackingList.front();
+ setLastFocusedWindow(win);
+ }
+ }
}
void Workspace::showAll(void) {
- std::for_each(stackingList.begin(), stackingList.end(),
- std::mem_fun(&BlackboxWindow::show));
+ BlackboxWindowList::iterator it = stackingList.begin();
+ const BlackboxWindowList::iterator end = stackingList.end();
+ for (; it != end; ++it) {
+ BlackboxWindow *bw = *it;
+ if (! bw->isStuck())
+ bw->show();
+ }
}
void Workspace::hideAll(void) {
// withdraw in reverse order to minimize the number of Expose events
-
- BlackboxWindowList lst(stackingList.rbegin(), stackingList.rend());
-
- BlackboxWindowList::iterator it = lst.begin();
- const BlackboxWindowList::iterator end = lst.end();
- for (; it != end; ++it) {
+ BlackboxWindowList::reverse_iterator it = stackingList.rbegin();
+ const BlackboxWindowList::reverse_iterator end = stackingList.rend();
+ while (it != end) {
BlackboxWindow *bw = *it;
+ ++it; // withdraw removes the current item from the list so we need the next
+ // iterator before that happens
if (! bw->isStuck())
bw->withdraw();
}
void Workspace::raiseWindow(BlackboxWindow *w) {
BlackboxWindow *win = w;
+ if (win->isDesktop()) return;
+
// walk up the transient_for's to the window that is not a transient
- while (win->isTransient()) {
+ while (win->isTransient() && ! win->isDesktop()) {
if (! win->getTransientFor()) break;
win = win->getTransientFor();
}
*(stack++) = win->getFrameWindow();
screen->updateNetizenWindowRaise(win->getClientWindow());
- if (! win->isIconic()) {
+ if (! (win->isIconic() || win->isDesktop())) {
Workspace *wkspc = screen->getWorkspace(win->getWorkspaceNumber());
wkspc->stackingList.remove(win);
wkspc->stackingList.push_front(win);
BlackboxWindow *win = w;
// walk up the transient_for's to the window that is not a transient
- while (win->isTransient()) {
+ while (win->isTransient() && ! win->isDesktop()) {
if (! win->getTransientFor()) break;
win = win->getTransientFor();
}
*(stack++) = win->getFrameWindow();
screen->updateNetizenWindowLower(win->getClientWindow());
- if (! win->isIconic()) {
+ if (! (win->isIconic() || win->isDesktop())) {
Workspace *wkspc = screen->getWorkspace(win->getWorkspaceNumber());
wkspc->stackingList.remove(win);
wkspc->stackingList.push_back(win);
}
- XLowerWindow(screen->getBaseDisplay()->getXDisplay(), stack_vector.front());
- XRestackWindows(screen->getBaseDisplay()->getXDisplay(),
- &stack_vector[0], stack_vector.size());
- screen->lowerDesktops();
+ screen->lowerWindows(&stack_vector[0], stack_vector.size());
}
}
-void Workspace::updateFocusModel(void) {
- std::for_each(windowList.begin(), windowList.end(),
- std::mem_fun(&BlackboxWindow::updateFocusModel));
-}
-
-
BlackboxWindow *Workspace::getWindow(unsigned int index) {
if (index < windowList.size()) {
BlackboxWindowList::iterator it = windowList.begin();
void Workspace::appendStackOrder(BlackboxWindowList &stack_order) const {
- BlackboxWindowList::const_iterator it = stackingList.begin();
- const BlackboxWindowList::const_iterator end = stackingList.end();
+ BlackboxWindowList::const_reverse_iterator it = stackingList.rbegin();
+ const BlackboxWindowList::const_reverse_iterator end = stackingList.rend();
for (; it != end; ++it)
- stack_order.push_back(*it);
+ if ((*it)->isNormal())
+ stack_order.push_back(*it);
}
}
-void Workspace::setName(const string& new_name) {
- if (! new_name.empty()) {
- name = new_name;
+void Workspace::readName(void) {
+ XAtom::StringVect namesList;
+ unsigned long numnames = id + 1;
+
+ // attempt to get from the _NET_WM_DESKTOP_NAMES property
+ if (xatom->getValue(screen->getRootWindow(), XAtom::net_desktop_names,
+ XAtom::utf8, numnames, namesList) &&
+ namesList.size() > id) {
+ name = namesList[id];
+
+ clientmenu->setLabel(name);
+ clientmenu->update();
} else {
- // attempt to get from the _NET_WM_DESKTOP_NAMES property
- XAtom::StringVect namesList;
- unsigned long numnames = id + 1;
- if (xatom->getValue(screen->getRootWindow(), XAtom::net_desktop_names,
- XAtom::utf8, numnames, namesList) &&
- namesList.size() > id) {
- name = namesList[id];
- } else {
- string tmp =i18n(WorkspaceSet, WorkspaceDefaultNameFormat,
- "Workspace %d");
- assert(tmp.length() < 32);
- char default_name[32];
- sprintf(default_name, tmp.c_str(), id + 1);
- name = default_name;
- }
+ /*
+ Use a default name. This doesn't actually change the class. That will
+ happen after the setName changes the root property, and that change
+ makes its way back to this function.
+ */
+ string tmp =i18n(WorkspaceSet, WorkspaceDefaultNameFormat,
+ "Workspace %d");
+ assert(tmp.length() < 32);
+ char default_name[32];
+ sprintf(default_name, tmp.c_str(), id + 1);
+
+ setName(default_name); // save this into the _NET_WM_DESKTOP_NAMES property
}
-
- // reset the property with the new name
+}
+
+
+void Workspace::setName(const string& new_name) {
+ // set the _NET_WM_DESKTOP_NAMES property with the new name
XAtom::StringVect namesList;
unsigned long numnames = (unsigned) -1;
if (xatom->getValue(screen->getRootWindow(), XAtom::net_desktop_names,
- XAtom::utf8, numnames, namesList)) {
- if (namesList.size() > id)
- namesList[id] = name;
- else
- namesList.push_back(name);
- }
+ XAtom::utf8, numnames, namesList) &&
+ namesList.size() > id)
+ namesList[id] = new_name;
+ else
+ namesList.push_back(new_name);
+
xatom->setValue(screen->getRootWindow(), XAtom::net_desktop_names,
XAtom::utf8, namesList);
-
- clientmenu->setLabel(name);
- clientmenu->update();
- screen->saveWorkspaceNames();
}
for (; wit != end; ++wit) {
const BlackboxWindow* const curr = *wit;
- if (curr->isShaded()) continue;
+ if (curr->isShaded() && screen->getPlaceIgnoreShaded()) continue;
+ if (curr->isMaximizedFull() && screen->getPlaceIgnoreMaximized()) continue;
tmp.setRect(curr->frameRect().x(), curr->frameRect().y(),
curr->frameRect().width() + screen->getBorderWidth(),
placed = smartPlacement(new_win, availableArea);
break;
case BScreen::UnderMousePlacement:
+ case BScreen::ClickMousePlacement:
placed = underMousePlacement(new_win, availableArea);
default:
break; // handled below
projects / chaz / openbox / blobdiff