X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2FWorkspace.cc;h=65f323f15ce5ee5d5c1ed7e7e836922360e54a62;hb=c6a826bf663d3cb286025642f5e2a725b5d1c660;hp=309ea950f156b9c0e8945c6ff36a3ff750c6881e;hpb=eb136b9629b61d43c00c3cf105ff170fb8c75ad1;p=chaz%2Fopenbox

diff --git a/src/Workspace.cc b/src/Workspace.cc
index 309ea950..65f323f1 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -71,6 +71,7 @@ Workspace::Workspace(BScreen *scrn, unsigned int i) {
   lastfocus = (BlackboxWindow *) 0;
 
   setName("");
+  fprintf(stderr, "WORKSPACE NAME: %s\n", name.c_str());
 }
 
 
@@ -102,34 +103,14 @@ unsigned int Workspace::removeWindow(BlackboxWindow *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);
     }
   }
 
@@ -152,6 +133,51 @@ unsigned int Workspace::removeWindow(BlackboxWindow *w) {
 }
 
 
+void Workspace::focusFallback(const BlackboxWindow *old_window) {
+  BlackboxWindow *newfocus = 0;
+
+  if (id == screen->getCurrentWorkspaceID()) {
+    // The window is on the visible workspace.
+
+    // 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->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));
@@ -306,10 +332,7 @@ void Workspace::lowerWindow(BlackboxWindow *w) {
     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());
 }
 
 
@@ -320,12 +343,6 @@ void Workspace::reconfigure(void) {
 }
 
 
-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();
@@ -381,8 +398,8 @@ unsigned int Workspace::getCount(void) const {
 
 
 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);
 }
@@ -428,12 +445,12 @@ void Workspace::setName(const string& 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] = name;
+  else
+    namesList.push_back(name);
+
   xatom->setValue(screen->getRootWindow(), XAtom::net_desktop_names,
                   XAtom::utf8, namesList);