diff options
author | Pavel Labath <pavelo@centrum.sk> | 2011-06-12 13:17:47 (GMT) |
---|---|---|
committer | Paul Tagliamonte <paultag@fluxbox.org> | 2012-04-07 02:10:41 (GMT) |
commit | 872c5e3d744341c5bc91f4559e20d249651ed77e (patch) | |
tree | a17cbba1de4f699c3f8163dae696a4fc2f4a022d /src/fluxbox.cc | |
parent | 850cecfd7694bcce692f9b7a584f9c3e55892a0c (diff) | |
download | fluxbox_paul-872c5e3d744341c5bc91f4559e20d249651ed77e.zip fluxbox_paul-872c5e3d744341c5bc91f4559e20d249651ed77e.tar.bz2 |
Factor out "session." from resource names
this reduces typing and it makes more sense in lua, since there the resources are implemented as
hierarchical tables and the topmost table has to be handled a bit specially.
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 77b9881..2645d7d 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -228,28 +228,28 @@ Fluxbox::Fluxbox(int argc, char **argv, | |||
228 | const std::string& rc_path, const std::string& rc_filename, bool xsync) | 228 | const std::string& rc_path, const std::string& rc_filename, bool xsync) |
229 | : FbTk::App(dpy_name.c_str()), | 229 | : FbTk::App(dpy_name.c_str()), |
230 | m_fbatoms(FbAtoms::instance()), | 230 | m_fbatoms(FbAtoms::instance()), |
231 | m_resourcemanager(rc_filename.c_str(), true), | 231 | m_resourcemanager("session", "Session", rc_filename.c_str(), true), |
232 | // TODO: shouldn't need a separate one for screen | 232 | // TODO: shouldn't need a separate one for screen |
233 | m_screen_rm(m_resourcemanager), | 233 | m_screen_rm(m_resourcemanager), |
234 | 234 | ||
235 | m_RC_PATH(rc_path), | 235 | m_RC_PATH(rc_path), |
236 | m_RC_INIT_FILE("init"), | 236 | m_RC_INIT_FILE("init"), |
237 | m_rc_ignoreborder(m_resourcemanager, false, "session.ignoreBorder", "Session.IgnoreBorder"), | 237 | m_rc_ignoreborder(m_resourcemanager, false, "ignoreBorder", "IgnoreBorder"), |
238 | m_rc_pseudotrans(m_resourcemanager, false, "session.forcePseudoTransparency", "Session.forcePseudoTransparency"), | 238 | m_rc_pseudotrans(m_resourcemanager, false, "forcePseudoTransparency", "forcePseudoTransparency"), |
239 | m_rc_colors_per_channel(m_resourcemanager, 4, | 239 | m_rc_colors_per_channel(m_resourcemanager, 4, |
240 | "session.colorsPerChannel", "Session.ColorsPerChannel"), | 240 | "colorsPerChannel", "ColorsPerChannel"), |
241 | m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"), | 241 | m_rc_double_click_interval(m_resourcemanager, 250, "doubleClickInterval", "DoubleClickInterval"), |
242 | m_rc_tabs_padding(m_resourcemanager, 0, "session.tabPadding", "Session.TabPadding"), | 242 | m_rc_tabs_padding(m_resourcemanager, 0, "tabPadding", "TabPadding"), |
243 | m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"), | 243 | m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "styleFile", "StyleFile"), |
244 | m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "session.styleOverlay", "Session.StyleOverlay"), | 244 | m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay", "StyleOverlay"), |
245 | m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu", "session.menuFile", "Session.MenuFile"), | 245 | m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu", "menuFile", "MenuFile"), |
246 | m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "session.keyFile", "Session.KeyFile"), | 246 | m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "keyFile", "KeyFile"), |
247 | m_rc_slitlistfile(m_resourcemanager, m_RC_PATH + "/slitlist", "session.slitlistFile", "Session.SlitlistFile"), | 247 | m_rc_slitlistfile(m_resourcemanager, m_RC_PATH + "/slitlist", "slitlistFile", "SlitlistFile"), |
248 | m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "session.appsFile", "Session.AppsFile"), | 248 | m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile", "AppsFile"), |
249 | m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "session.tabsAttachArea", "Session.TabsAttachArea"), | 249 | m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea", "TabsAttachArea"), |
250 | m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"), | 250 | m_rc_cache_life(m_resourcemanager, 5, "cacheLife", "CacheLife"), |
251 | m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"), | 251 | m_rc_cache_max(m_resourcemanager, 200, "cacheMax", "CacheMax"), |
252 | m_rc_auto_raise_delay(m_resourcemanager, 250, "session.autoRaiseDelay", "Session.AutoRaiseDelay"), | 252 | m_rc_auto_raise_delay(m_resourcemanager, 250, "autoRaiseDelay", "AutoRaiseDelay"), |
253 | m_masked_window(0), | 253 | m_masked_window(0), |
254 | m_mousescreen(0), | 254 | m_mousescreen(0), |
255 | m_keyscreen(0), | 255 | m_keyscreen(0), |
@@ -397,8 +397,8 @@ Fluxbox::Fluxbox(int argc, char **argv, | |||
397 | for (size_t s = 0; s < screens.size(); s++) { | 397 | for (size_t s = 0; s < screens.size(); s++) { |
398 | std::string sc_nr = FbTk::StringUtil::number2String(screens[s]); | 398 | std::string sc_nr = FbTk::StringUtil::number2String(screens[s]); |
399 | BScreen *screen = new BScreen(m_screen_rm.lock(), | 399 | BScreen *screen = new BScreen(m_screen_rm.lock(), |
400 | std::string("session.screen") + sc_nr, | 400 | std::string("screen") + sc_nr, |
401 | std::string("session.Screen") + sc_nr, | 401 | std::string("Screen") + sc_nr, |
402 | screens[s], ::ResourceLayer::NUM_LAYERS); | 402 | screens[s], ::ResourceLayer::NUM_LAYERS); |
403 | 403 | ||
404 | // already handled | 404 | // already handled |
@@ -1146,7 +1146,7 @@ void Fluxbox::save_rc() { | |||
1146 | for (; it != it_end; ++it) { | 1146 | for (; it != it_end; ++it) { |
1147 | BScreen *screen = *it; | 1147 | BScreen *screen = *it; |
1148 | 1148 | ||
1149 | std::string workspaces_string("session.screen"); | 1149 | std::string workspaces_string("screen"); |
1150 | workspaces_string += FbTk::StringUtil::number2String(screen->screenNumber()); | 1150 | workspaces_string += FbTk::StringUtil::number2String(screen->screenNumber()); |
1151 | workspaces_string += ".workspaceNames: "; | 1151 | workspaces_string += ".workspaceNames: "; |
1152 | 1152 | ||
@@ -1239,10 +1239,10 @@ void Fluxbox::load_rc(BScreen &screen) { | |||
1239 | 1239 | ||
1240 | std::string screen_number = FbTk::StringUtil::number2String(screen.screenNumber()); | 1240 | std::string screen_number = FbTk::StringUtil::number2String(screen.screenNumber()); |
1241 | 1241 | ||
1242 | std::string name_lookup("session.screen"); | 1242 | std::string name_lookup("screen"); |
1243 | name_lookup += screen_number; | 1243 | name_lookup += screen_number; |
1244 | name_lookup += ".workspaceNames"; | 1244 | name_lookup += ".workspaceNames"; |
1245 | std::string class_lookup("session.screen"); | 1245 | std::string class_lookup("screen"); |
1246 | class_lookup += screen_number; | 1246 | class_lookup += screen_number; |
1247 | class_lookup += ".WorkspaceNames"; | 1247 | class_lookup += ".WorkspaceNames"; |
1248 | 1248 | ||