dont let focus fall back to strange windows like panels, only to normal windows and...

[chaz/openbox] / src / Workspace.cc

diff --git a/src/Workspace.cc b/src/Workspace.cc
index d2a43f440e209d44720ea7852bf378b0335b85b7..5c38cf05b9ecf47b8ebb6e15c5dc20abbb9f9692 100644 (file)
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -70,8 +70,7 @@ Workspace::Workspace(BScreen *scrn, unsigned int i) {
 
   lastfocus = (BlackboxWindow *) 0;
 
-  setName("");
-  fprintf(stderr, "WORKSPACE NAME: %s\n", name.c_str());
+  readName();
 }
 
 
@@ -103,19 +102,14 @@ unsigned int Workspace::removeWindow(BlackboxWindow *w) {
   // pass focus to the next appropriate window
   if ((w->isFocused() || w == lastfocus) &&
       ! screen->getBlackbox()->doShutdown()) {
-    if (id == screen->getCurrentWorkspaceID()) {
-      // The window is on the visible workspace
-      focusFallback(w);
-    } else {
-      // The window is not on the visible workspace.
-      if (lastfocus == w) {
-        // The window was the last-focus target, so we need to replace it.
-        setLastFocusedWindow(stackingList.front());
-      }
-      // if the window focused on the current workspace, then reapply that
-      // workspace's focus too
-      if (w->isFocused())
-        screen->getCurrentWorkspace()->focusFallback(w);
+    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);
     }
   }
 
@@ -141,31 +135,48 @@ unsigned int Workspace::removeWindow(BlackboxWindow *w) {
 void Workspace::focusFallback(const BlackboxWindow *old_window) {
   BlackboxWindow *newfocus = 0;
 
-  // if it's a transient, then try to focus its parent
-  if (old_window && old_window->isTransient()) {
-    newfocus = old_window->getTransientFor();
+  if (id == screen->getCurrentWorkspaceID()) {
+    // The window is on the visible workspace.
 
-    if (! newfocus ||
-        newfocus->isIconic() ||                  // do not focus icons
-        newfocus->getWorkspaceNumber() != id ||  // or other workspaces
-        ! newfocus->setInputFocus())
-      newfocus = 0;
-  }
+    // if it's a transient, then try to focus its parent
+    if (old_window && old_window->isTransient()) {
+      newfocus = old_window->getTransientFor();
 
-  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;
+      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->windowType() == BlackboxWindow::Type_Dialog ||
+               tmp->windowType() == BlackboxWindow::Type_Normal))
+          continue; // don't fallback to special windows
+        if (tmp && tmp->setInputFocus()) {
+          // we found our new focus target
+          newfocus = tmp;
+          break;
+        }
       }
     }
-  }
 
-  screen->getBlackbox()->setFocusedWindow(newfocus);
+    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);
+    }
+  }
 }
 
 
@@ -411,43 +422,48 @@ void Workspace::setCurrent(void) {
 }
 
 
-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) &&
       namesList.size() > id)
-    namesList[id] = name;
+    namesList[id] = new_name;
   else
-    namesList.push_back(name);
+    namesList.push_back(new_name);
 
   xatom->setValue(screen->getRootWindow(), XAtom::net_desktop_names,
                   XAtom::utf8, namesList);
-
-  clientmenu->setLabel(name);
-  clientmenu->update();
-  screen->saveWorkspaceNames();
 }
 
 
@@ -559,7 +575,8 @@ bool Workspace::smartPlacement(Rect& win, const Rect& availableArea) {
   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(),