#include "i18n.hh"
#include "blackbox.hh"
#include "Clientmenu.hh"
+#include "Font.hh"
#include "Netizen.hh"
#include "Screen.hh"
#include "Toolbar.hh"
screen = scrn;
xatom = screen->getBlackbox()->getXAtom();
- cascade_x = cascade_y = 32;
+ cascade_x = cascade_y = 0;
+#ifdef XINERAMA
+ cascade_region = 0;
+#endif // XINERAMA
id = i;
}
-void Workspace::addWindow(BlackboxWindow *w, bool place) {
+void Workspace::addWindow(BlackboxWindow *w, bool place, bool sticky) {
assert(w != 0);
if (place) placeWindow(w);
stackingList.push_front(w);
if (w->isNormal()) {
- w->setWorkspace(id);
- w->setWindowNumber(windowList.size());
+ if (! sticky) {
+ w->setWorkspace(id);
+ w->setWindowNumber(windowList.size());
+ }
windowList.push_back(w);
clientmenu->insert(w->getTitle());
clientmenu->update();
- 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;
+ if (! sticky)
+ screen->updateNetizenWindowAdd(w->getClientWindow(), id);
+
+ if (screen->doFocusNew() || (w->isTransient() && w->getTransientFor() &&
+ w->getTransientFor()->isFocused())) {
+ if (id == screen->getCurrentWorkspaceID())
+ w->setInputFocus();
+ else {
+ /*
+ 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;
+ }
}
}
}
-void Workspace::removeWindow(BlackboxWindow *w) {
+void Workspace::removeWindow(BlackboxWindow *w, bool sticky) {
assert(w != 0);
stackingList.remove(w);
if ((w->isFocused() || w == lastfocus) &&
! screen->getBlackbox()->doShutdown()) {
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());
+ BlackboxWindowList::iterator it, end = windowList.end();
+ int i;
+ for (i = 0, it = windowList.begin(); it != end; ++it, ++i)
+ if (*it == w)
+ break;
+ assert(it != end);
+
+ windowList.erase(it);
+ clientmenu->remove(i);
clientmenu->update();
- screen->updateNetizenWindowDel(w->getClientWindow());
+ if (! sticky) {
+ screen->updateNetizenWindowDel(w->getClientWindow());
- BlackboxWindowList::iterator it = windowList.begin();
- const BlackboxWindowList::iterator end = windowList.end();
- unsigned int i = 0;
- for (; it != end; ++it, ++i)
- (*it)->setWindowNumber(i);
+ BlackboxWindowList::iterator it = windowList.begin();
+ const BlackboxWindowList::iterator end = windowList.end();
+ unsigned int i = 0;
+ for (; it != end; ++it, ++i)
+ (*it)->setWindowNumber(i);
+ }
- if (i == 0)
- cascade_x = cascade_y = 32;
+ if (i == 0) {
+ cascade_x = cascade_y = 0;
+#ifdef XINERAMA
+ cascade_region = 0;
+#endif // XINERAMA
+ }
}
}
+void Workspace::setFocused(const BlackboxWindow *w, bool focused) {
+ BlackboxWindowList::iterator it, end = windowList.end();
+ int i;
+ for (i = 0, it = windowList.begin(); it != end; ++it, ++i)
+ if (*it == w)
+ break;
+ // if its == end, then a window thats not in the windowList
+ // got focused, such as a !isNormal() window.
+ if (it != end)
+ clientmenu->setItemSelected(i, focused);
+}
+
+
void Workspace::showAll(void) {
BlackboxWindowList::iterator it = stackingList.begin();
const BlackboxWindowList::iterator end = stackingList.end();
for (; it != end; ++it) {
BlackboxWindow *bw = *it;
- if (! bw->isStuck())
+ // not normal windows cant focus from mouse enters anyways, so we dont
+ // need to unmap/remap them on workspace changes
+ if (! bw->isStuck() || bw->isNormal())
bw->show();
}
}
BlackboxWindow *bw = *it;
++it; // withdraw removes the current item from the list so we need the next
// iterator before that happens
- if (! bw->isStuck())
+ // not normal windows cant focus from mouse enters anyways, so we dont
+ // need to unmap/remap them on workspace changes
+ if (! bw->isStuck() || bw->isNormal())
bw->withdraw();
}
}
if (screen->isXineramaActive() &&
screen->getBlackbox()->doXineramaPlacement()) {
RectList availableAreas = screen->allAvailableAreas();
- assert(availableAreas.size() > 0);
RectList::iterator it, end = availableAreas.end();
for (it = availableAreas.begin(); it != end; ++it)
for (; wit != end; ++wit) {
const BlackboxWindow* const curr = *wit;
- if (curr->isShaded() && screen->getPlaceIgnoreShaded()) continue;
- if (curr->isMaximizedFull() && screen->getPlaceIgnoreMaximized()) continue;
+ // watch for shaded windows and full-maxed windows
+ if (curr->isShaded()) {
+ if (screen->getPlaceIgnoreShaded()) continue;
+ } else if (curr->isMaximizedFull()) {
+ if (screen->getPlaceIgnoreMaximized()) continue;
+ }
tmp.setRect(curr->frameRect().x(), curr->frameRect().y(),
curr->frameRect().width() + screen->getBorderWidth(),
if (screen->isXineramaActive() &&
screen->getBlackbox()->doXineramaPlacement()) {
RectList availableAreas = screen->allAvailableAreas();
- assert(availableAreas.size() > 0);
RectList::iterator it, end = availableAreas.end();
for (it = availableAreas.begin(); it != end; ++it)
}
-bool Workspace::cascadePlacement(Rect &win) {
- const Rect &availableArea = screen->availableArea();
+bool Workspace::cascadePlacement(Rect &win, const int offset) {
+ Rect area;
+
+#ifdef XINERAMA
+ if (screen->isXineramaActive() &&
+ screen->getBlackbox()->doXineramaPlacement()) {
+ area = screen->allAvailableAreas()[cascade_region];
+ } else
+#endif // XINERAMA
+ area = screen->availableArea();
- if ((cascade_x > static_cast<signed>(availableArea.width() / 2)) ||
- (cascade_y > static_cast<signed>(availableArea.height() / 2)))
- cascade_x = cascade_y = 32;
+ if ((static_cast<signed>(cascade_x + win.width()) > area.right() + 1) ||
+ (static_cast<signed>(cascade_y + win.height()) > area.bottom() + 1)) {
+ cascade_x = cascade_y = 0;
+#ifdef XINERAMA
+ if (screen->isXineramaActive() &&
+ screen->getBlackbox()->doXineramaPlacement()) {
+ // go to the next xinerama region, and use its area
+ if (++cascade_region >= screen->allAvailableAreas().size())
+ cascade_region = 0;
+ area = screen->allAvailableAreas()[cascade_region];
+ }
+#endif // XINERAMA
+ }
- if (cascade_x == 32) {
- cascade_x += availableArea.x();
- cascade_y += availableArea.y();
+ if (cascade_x == 0) {
+ cascade_x = area.x() + offset;
+ cascade_y = area.y() + offset;
}
win.setPos(cascade_x, cascade_y);
+ cascade_x += offset;
+ cascade_y += offset;
+
return True;
}
break; // handled below
} // switch
- if (placed == False) {
- cascadePlacement(new_win);
- cascade_x += win->getTitleHeight() + (screen->getBorderWidth() * 2);
- cascade_y += win->getTitleHeight() + (screen->getBorderWidth() * 2);
- }
+ if (placed == False)
+ cascadePlacement(new_win, (win->getTitleHeight() +
+ screen->getBorderWidth() * 2));
- // make sure the placement was valid
- assert(screen->availableArea().contains(new_win));
+ if (new_win.right() > screen->availableArea().right())
+ new_win.setX(screen->availableArea().left());
+ if (new_win.bottom() > screen->availableArea().bottom())
+ new_win.setY(screen->availableArea().top());
win->configure(new_win.x(), new_win.y(), new_win.width(), new_win.height());
}
projects / chaz / openbox / blobdiff