Make session.screenX.workspace_names a real FbTk::Resource

instead of the add-on hack it was.
This also fixes a lot of problems with saving of config.

1 files changed, 0 insertions, 79 deletions

diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 0c391dc..162a409 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -1131,36 +1131,6 @@ void Fluxbox::save_rc() {
         cerr<<_FB_CONSOLETEXT(Fluxbox, BadRCFile, "rc filename is invalid!", "Bad settings file")<<endl;
 
 
-    ScreenList::iterator it = m_screen_list.begin();
-    ScreenList::iterator it_end = m_screen_list.end();
-    for (; it != it_end; ++it) {
-        BScreen *screen = *it;
-
-        std::string workspaces_string("screen");
-        workspaces_string += FbTk::StringUtil::number2String(screen->screenNumber());
-        workspaces_string += ".workspaceNames: ";
-
-        // these are static, but may not be saved in the users resource file,
-        // writing these resources will allow the user to edit them at a later
-        // time... but loading the defaults before saving allows us to rewrite the
-        // users changes...
-
-        const BScreen::WorkspaceNames& names = screen->getWorkspaceNames();
-        for (size_t i=0; i < names.size(); i++) {
-            workspaces_string += FbTk::FbStringUtil::FbStrToLocale(names[i]);
-            workspaces_string += ',';
-        }
-
-        XrmPutLineResource(&new_rc, workspaces_string.c_str());
-
-    }
-
-    XrmDatabase old_rc = XrmGetFileDatabase(dbfile.c_str());
-
-    XrmMergeDatabases(new_rc, &old_rc);
-    XrmPutFileDatabase(old_rc, dbfile.c_str());
-    XrmDestroyDatabase(old_rc);
-
     fbdbg<<__FILE__<<"("<<__LINE__<<"): ------------ SAVING DONE"<<endl;
 
 }
@@ -1218,50 +1188,6 @@ void Fluxbox::load_rc() {
         *m_rc_stylefile = DEFAULTSTYLE;
 }
 
-void Fluxbox::load_rc(BScreen &screen) {
-    //get resource filename
-    _FB_USES_NLS;
-    string dbfile(getRcFilename());
-
-    XrmDatabaseHelper database;
-
-    // XXX make this a regular resource
-    database = XrmGetFileDatabase(dbfile.c_str());
-    if (database==0)
-        database = XrmGetFileDatabase(DEFAULT_INITFILE);
-
-
-    screen.removeWorkspaceNames();
-
-    std::string screen_number = FbTk::StringUtil::number2String(screen.screenNumber());
-
-    std::string name_lookup("screen");
-    name_lookup += screen_number;
-    name_lookup += ".workspaceNames";
-    std::string class_lookup("screen");
-    class_lookup += screen_number;
-    class_lookup += ".WorkspaceNames";
-
-    XrmValue value;
-    char *value_type;
-    if (XrmGetResource(*database, name_lookup.c_str(), class_lookup.c_str(), &value_type,
-                       &value)) {
-
-        string values(value.addr);
-        BScreen::WorkspaceNames names;
-
-        StringUtil::removeTrailingWhitespace(values);
-        StringUtil::removeFirstWhitespace(values);
-        StringUtil::stringtok<BScreen::WorkspaceNames>(names, values, ",");
-        BScreen::WorkspaceNames::iterator it;
-        for(it = names.begin(); it != names.end(); it++) {
-            if (!(*it).empty() && (*it) != "")
-            screen.addWorkspaceName((*it).c_str());
-        }
-
-    }
-}
-
 void Fluxbox::reconfigure() {
     load_rc();
     m_reconfigure_wait = true;
@@ -1273,11 +1199,6 @@ void Fluxbox::real_reconfigure() {
 
     FbTk::Transparent::usePseudoTransparent(*m_rc_pseudotrans);
 
-    ScreenList::iterator screen_it = m_screen_list.begin();
-    ScreenList::iterator screen_it_end = m_screen_list.end();
-    for (; screen_it != screen_it_end; ++screen_it)
-        load_rc(*(*screen_it));
-
     STLUtil::forAll(m_screen_list, mem_fun(&BScreen::reconfigure));
     m_key->reconfigure();
     STLUtil::forAll(m_atomhandler, mem_fun(&AtomHandler::reconfigure));