9 files changed, 28 insertions, 156 deletions

diff --git a/src/ClientPattern.cc b/src/ClientPattern.cc
index 339092d..d644767 100644
--- a/src/ClientPattern.cc
+++ b/src/ClientPattern.cc
@@ -173,7 +173,7 @@ string ClientPattern::toString() const {
 
         switch ((*it)->prop) {
         case NAME:
-            // do nothing -> this is the default
+            pat.append("name=");
             break;
         case CLASS:
             pat.append("class=");
diff --git a/src/FbTk/Resource.cc b/src/FbTk/Resource.cc
index 5d2dc3b..cb45eac 100644
--- a/src/FbTk/Resource.cc
+++ b/src/FbTk/Resource.cc
@@ -24,6 +24,7 @@
 #include "XrmDatabaseHelper.hh"
 #include "Resource.hh"
 #include "I18n.hh"
+#include "StringUtil.hh"
 
 #include <iostream>
 #ifdef HAVE_CASSERT
@@ -61,7 +62,7 @@ bool ResourceManager::m_init = false;
   @return true on success else false
 */
 bool ResourceManager::load(const char *filename) {
-    m_filename = filename;
+    m_filename = StringUtil::expandFilename(filename).c_str();
 
     // force reload (lock will ensure it exists)
     if (m_database) {
@@ -106,6 +107,7 @@ bool ResourceManager::load(const char *filename) {
 */
 bool ResourceManager::save(const char *filename, const char *mergefilename) {
     assert(filename);
+    filename = StringUtil::expandFilename(filename).c_str();
 
     // empty database
     XrmDatabaseHelper database;
diff --git a/src/FocusControl.cc b/src/FocusControl.cc
index 71b289b..c5ee939 100644
--- a/src/FocusControl.cc
+++ b/src/FocusControl.cc
@@ -220,6 +220,16 @@ void FocusControl::setFocusBack(FluxboxWindow *fbwin) {
     if (m_focused_list.empty() || s_reverting)
         return;
 
+    // if the window isn't already in this list, we could accidentally add it
+    Focusables::iterator win_begin = m_focused_win_list.begin(),
+                         win_end = m_focused_win_list.end();
+    Focusables::iterator win_it = find(win_begin, win_end, fbwin);
+    if (win_it == win_end)
+        return;
+
+    m_focused_win_list.erase(win_it);
+    m_focused_win_list.push_back(fbwin);
+
     Focusables::iterator it = m_focused_list.begin();
     // use back to avoid an infinite loop
     Focusables::iterator it_back = --m_focused_list.end();
@@ -237,9 +247,6 @@ void FocusControl::setFocusBack(FluxboxWindow *fbwin) {
         m_focused_list.erase(it);
     }
 
-    m_focused_win_list.remove(fbwin);
-    m_focused_win_list.push_back(fbwin);
-
 }
     
 void FocusControl::stopCyclingFocus() {
diff --git a/src/Screen.cc b/src/Screen.cc
index c7b32db..071d253 100644
--- a/src/Screen.cc
+++ b/src/Screen.cc
@@ -699,15 +699,9 @@ void BScreen::initWindows() {
                 continue;
             }
 
-            if (attrib.map_state != IsUnmapped) {
-                FluxboxWindow *win = createWindow(children[i]);
+            if (attrib.map_state != IsUnmapped)
+                createWindow(children[i]);
 
-                if (win) {
-                    XMapRequestEvent mre;
-                    mre.window = children[i];
-                    win->mapRequestEvent(mre);
-                }
-            }
         }
         children[i] = None; // we dont need this anymore, since we already created a window for it
     }
diff --git a/src/Window.cc b/src/Window.cc
index d5f75e1..d942482 100644
--- a/src/Window.cc
+++ b/src/Window.cc
@@ -544,7 +544,8 @@ void FluxboxWindow::init() {
     if (iconic) {
         iconic = false;
         iconify();
-    }
+    } else
+        deiconify(false);
 
     sendConfigureNotify();
     // no focus default
@@ -2323,28 +2324,11 @@ void FluxboxWindow::mapRequestEvent(XMapRequestEvent &re) {
         return;
     }
 
-    // rest of current state checking is in initialisation
-    if (m_current_state == WithdrawnState)
-        withdraw(true);
-    else {
-
-        // if this window was destroyed while autogrouping
-        bool destroyed = false;
-
-        // check WM_CLASS only when we changed state to NormalState from
-        // WithdrawnState (ICCC 4.1.2.5)
-        client->updateWMClassHint();
+    // Note: this function never gets called from WithdrawnState
+    // initial state is handled in restoreAttributes() and init()
+    setCurrentClient(*client, false); // focus handled on MapNotify
+    deiconify(false);
 
-        Workspace *wsp = screen().getWorkspace(m_workspace_number);
-        if (wsp != 0 && isGroupable())
-            destroyed = wsp->checkGrouping(*this);
-
-        // if we weren't grouped with another window we deiconify ourself
-        // make sure iconified windows stay that way on fluxbox start
-        if (!destroyed && !(iconic && Fluxbox::instance()->isStartup()))
-            deiconify(false);
-
-    }
 }
 
 
diff --git a/src/Workspace.cc b/src/Workspace.cc
index e65a89f..05d8420 100644
--- a/src/Workspace.cc
+++ b/src/Workspace.cc
@@ -61,19 +61,15 @@
 #endif
 
 #include <algorithm>
-#include <iostream>
 
 using std::string;
-using std::vector;
-using std::ifstream;
 
 #ifdef DEBUG
+#include <iostream>
 using std::cerr;
 using std::endl;
 #endif // DEBUG
 
-Workspace::GroupList Workspace::m_groups;
-
 Workspace::Workspace(BScreen &scrn, const string &name, unsigned int id):
     m_screen(scrn),
     m_clientmenu(scrn, m_windowlist, &m_clientlist_sig),
@@ -181,100 +177,6 @@ size_t Workspace::numberOfWindows() const {
     return m_windowlist.size();
 }
 
-namespace {
-// helper class for checkGrouping
-class FindInGroup {
-public:
-    FindInGroup(const FluxboxWindow &w):m_w(w) { }
-    bool operator ()(const string &name) const {
-        return (name == m_w.winClient().getWMClassName());
-    }
-private:
-    const FluxboxWindow &m_w;
-};
-
-};
-
-//Note: this function doesn't check if the window is groupable
-bool Workspace::checkGrouping(FluxboxWindow &win) {
-    if (win.numClients() == 0)
-        return false;
-#ifdef DEBUG
-    cerr<<__FILE__<<"("<<__LINE__<<"): Checking grouping. ("<<win.title()<<")"<<endl;
-#endif // DEBUG
-    if (!win.isGroupable()) { // make sure this window can hold a tab
-#ifdef DEBUG
-        cerr<<__FILE__<<"("<<__LINE__<<"): window can't use a tab"<<endl;
-#endif // DEBUG
-        return false;
-    }
-
-    string instance_name = win.winClient().getWMClassName();
-
-    // go through every group and search for matching win instancename
-    GroupList::iterator g(m_groups.begin());
-    GroupList::iterator g_end(m_groups.end());
-    for (; g != g_end; ++g) {
-        Group::iterator name((*g).begin());
-        Group::iterator name_end((*g).end());
-        for (; name != name_end; ++name) {
-
-            if ((*name) != instance_name)
-                continue;
-
-            // find a window with the specific name
-            Windows::iterator wit(m_windowlist.begin());
-            Windows::iterator wit_end(m_windowlist.end());
-            for (; wit != wit_end; ++wit) {
-#ifdef DEBUG
-                cerr<<__FILE__<<" check group with : "<<(*wit)->winClient().getWMClassName()<<endl;
-#endif // DEBUG
-                if (find_if((*g).begin(),
-                            (*g).end(),
-                            FindInGroup(*(*wit))) != (*g).end()) {
-                    // make sure the window is groupable
-                    // and don't group with ourself
-                    if ( !(*wit)->isGroupable() || (*wit)->winClient().fbwindow() == &win)
-                        break; // try next name
-#ifdef DEBUG
-                    cerr<<__FILE__<<"("<<__FUNCTION__<<"): window ("<<*wit<<") attaching window ("<<&win<<")"<<endl;
-#endif // DEBUG
-                    (*wit)->attachClient(win.winClient());
-                    (*wit)->raise();
-                    return true; // grouping done
-
-                }
-
-            }
-
-        }
-
-    }
-
-    return false;
-}
-
-bool Workspace::loadGroups(const string &filename) {
-    string real_filename = FbTk::StringUtil::expandFilename(filename);
-    FbTk::StringUtil::removeTrailingWhitespace(real_filename);
-    ifstream infile(real_filename.c_str());
-    if (!infile)
-        return false;
-
-    m_groups.clear(); // erase old groups
-
-    // load new groups
-    while (!infile.eof()) {
-        string line;
-        vector<string> names;
-        getline(infile, line);
-        FbTk::StringUtil::stringtok(names, line);
-        m_groups.push_back(names);
-    }
-
-    return true;
-}
-
 void Workspace::setName(const string &name) {
     if (!name.empty() && name != "") {
         m_name = name;
diff --git a/src/Workspace.hh b/src/Workspace.hh
index e4fffd0..3f865ed 100644
--- a/src/Workspace.hh
+++ b/src/Workspace.hh
@@ -77,20 +77,12 @@ public:
     Windows &windowList() { return m_windowlist; }
 
     size_t numberOfWindows() const;
-    bool checkGrouping(FluxboxWindow &win);
-
-    static bool loadGroups(const std::string &filename);
 
 private:
     void placeWindow(FluxboxWindow &win);
 
     BScreen &m_screen;
 
-    typedef std::vector<std::string> Group;
-    typedef std::vector<Group> GroupList;
-
-    static GroupList m_groups; ///< handle auto groupings
-
     Windows m_windowlist;
     FbTk::Subject m_clientlist_sig;
     ClientMenu m_clientmenu;
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 2393837..4441a7d 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -218,7 +218,6 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
       m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"),
       m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"),
       m_rc_slitlistfile(m_resourcemanager, "~/.fluxbox/slitlist", "session.slitlistFile", "Session.SlitlistFile"),
-      m_rc_groupfile(m_resourcemanager, "~/.fluxbox/groups", "session.groupFile", "Session.GroupFile"),
       m_rc_appsfile(m_resourcemanager, "~/.fluxbox/apps", "session.appsFile", "Session.AppsFile"),
       m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "session.tabsAttachArea", "Session.TabsAttachArea"),
       m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"),
@@ -781,7 +780,6 @@ void Fluxbox::handleEvent(XEvent * const e) {
 #endif // DEBUG
 
         WinClient *winclient = searchWindow(e->xmaprequest.window);
-        FluxboxWindow *win = 0;
 
         if (! winclient) {
             BScreen *screen = 0;
@@ -807,15 +805,14 @@ void Fluxbox::handleEvent(XEvent * const e) {
             if (screen == 0) {
                 cerr<<"Fluxbox "<<_FB_CONSOLETEXT(Fluxbox, CantMapWindow, "Warning! Could not find screen to map window on!", "")<<endl;
             } else
-                win = screen->createWindow(e->xmaprequest.window);
+                screen->createWindow(e->xmaprequest.window);
 
         } else {
-            win = winclient->fbwindow();
+            // we don't handle MapRequest in FluxboxWindow::handleEvent
+            if (winclient->fbwindow())
+                winclient->fbwindow()->mapRequestEvent(e->xmaprequest);
         }
 
-        // we don't handle MapRequest in FluxboxWindow::handleEvent
-        if (win)
-            win->mapRequestEvent(e->xmaprequest);
     }
         break;
     case MapNotify:
@@ -1499,12 +1496,6 @@ void Fluxbox::load_rc() {
 
     if (m_rc_stylefile->empty())
         *m_rc_stylefile = DEFAULTSTYLE;
-
-    if (!Workspace::loadGroups(*m_rc_groupfile)) {
-#ifdef DEBUG
-        cerr<<_FB_CONSOLETEXT(Fluxbox, CantLoadGroupFile, "Failed to load groupfile", "Couldn't load the groupfile")<<": "<<*m_rc_groupfile<<endl;
-#endif // DEBUG
-    }
 }
 
 void Fluxbox::load_rc(BScreen &screen) {
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 66fdff5..db6270e 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -241,7 +241,7 @@ private:
     FbTk::Resource<std::string> m_rc_stylefile,
         m_rc_styleoverlayfile,
         m_rc_menufile, m_rc_keyfile, m_rc_slitlistfile,
-        m_rc_groupfile, m_rc_appsfile;
+        m_rc_appsfile;
 
 
     FbTk::Resource<TabsAttachArea> m_rc_tabs_attach_area;