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 65f323f15ce5ee5d5c1ed7e7e836922360e54a62..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();
 }
 
 
@@ -155,6 +154,9 @@ void Workspace::focusFallback(const BlackboxWindow *old_window) {
                                   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;
@@ -420,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();
 }
 
 
@@ -568,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(),