diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-06-16 20:36:18 (GMT) |
---|---|---|
committer | Paul Tagliamonte <paultag@fluxbox.org> | 2012-04-07 02:11:28 (GMT) |
commit | dbb84308855de040c043cf1c1f0ab941d6bd3be7 (patch) | |
tree | a46416d288c0d66f6113600c5bcb61f0339009f0 /src/fluxbox.cc | |
parent | fadff675a5163dea6f78c53d7b157faed42f02ec (diff) | |
download | fluxbox_paul-dbb84308855de040c043cf1c1f0ab941d6bd3be7.zip fluxbox_paul-dbb84308855de040c043cf1c1f0ab941d6bd3be7.tar.bz2 |
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.
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index efb89b8..cda71ba 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -1131,36 +1131,6 @@ void Fluxbox::save_rc() { | |||
1131 | cerr<<_FB_CONSOLETEXT(Fluxbox, BadRCFile, "rc filename is invalid!", "Bad settings file")<<endl; | 1131 | cerr<<_FB_CONSOLETEXT(Fluxbox, BadRCFile, "rc filename is invalid!", "Bad settings file")<<endl; |
1132 | 1132 | ||
1133 | 1133 | ||
1134 | ScreenList::iterator it = m_screen_list.begin(); | ||
1135 | ScreenList::iterator it_end = m_screen_list.end(); | ||
1136 | for (; it != it_end; ++it) { | ||
1137 | BScreen *screen = *it; | ||
1138 | |||
1139 | std::string workspaces_string("screen"); | ||
1140 | workspaces_string += FbTk::StringUtil::number2String(screen->screenNumber()); | ||
1141 | workspaces_string += ".workspaceNames: "; | ||
1142 | |||
1143 | // these are static, but may not be saved in the users resource file, | ||
1144 | // writing these resources will allow the user to edit them at a later | ||
1145 | // time... but loading the defaults before saving allows us to rewrite the | ||
1146 | // users changes... | ||
1147 | |||
1148 | const BScreen::WorkspaceNames& names = screen->getWorkspaceNames(); | ||
1149 | for (size_t i=0; i < names.size(); i++) { | ||
1150 | workspaces_string += FbTk::FbStringUtil::FbStrToLocale(names[i]); | ||
1151 | workspaces_string += ','; | ||
1152 | } | ||
1153 | |||
1154 | XrmPutLineResource(&new_rc, workspaces_string.c_str()); | ||
1155 | |||
1156 | } | ||
1157 | |||
1158 | XrmDatabase old_rc = XrmGetFileDatabase(dbfile.c_str()); | ||
1159 | |||
1160 | XrmMergeDatabases(new_rc, &old_rc); | ||
1161 | XrmPutFileDatabase(old_rc, dbfile.c_str()); | ||
1162 | XrmDestroyDatabase(old_rc); | ||
1163 | |||
1164 | fbdbg<<__FILE__<<"("<<__LINE__<<"): ------------ SAVING DONE"<<endl; | 1134 | fbdbg<<__FILE__<<"("<<__LINE__<<"): ------------ SAVING DONE"<<endl; |
1165 | 1135 | ||
1166 | } | 1136 | } |
@@ -1273,11 +1243,6 @@ void Fluxbox::real_reconfigure() { | |||
1273 | 1243 | ||
1274 | FbTk::Transparent::usePseudoTransparent(*m_rc_pseudotrans); | 1244 | FbTk::Transparent::usePseudoTransparent(*m_rc_pseudotrans); |
1275 | 1245 | ||
1276 | ScreenList::iterator screen_it = m_screen_list.begin(); | ||
1277 | ScreenList::iterator screen_it_end = m_screen_list.end(); | ||
1278 | for (; screen_it != screen_it_end; ++screen_it) | ||
1279 | load_rc(*(*screen_it)); | ||
1280 | |||
1281 | STLUtil::forAll(m_screen_list, mem_fun(&BScreen::reconfigure)); | 1246 | STLUtil::forAll(m_screen_list, mem_fun(&BScreen::reconfigure)); |
1282 | m_key->reconfigure(); | 1247 | m_key->reconfigure(); |
1283 | STLUtil::forAll(m_atomhandler, mem_fun(&AtomHandler::reconfigure)); | 1248 | STLUtil::forAll(m_atomhandler, mem_fun(&AtomHandler::reconfigure)); |