aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc33
1 files changed, 14 insertions, 19 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 4f41e4d..d7907be 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -239,21 +239,20 @@ Fluxbox::Fluxbox(int argc, char **argv,
239 239
240 m_RC_PATH(rc_path), 240 m_RC_PATH(rc_path),
241 m_RC_INIT_FILE("init"), 241 m_RC_INIT_FILE("init"),
242 m_rc_ignoreborder(m_resourcemanager, false, "ignoreBorder", "IgnoreBorder"), 242 m_rc_ignoreborder(m_resourcemanager, false, "ignoreBorder"),
243 m_rc_pseudotrans(m_resourcemanager, false, "forcePseudoTransparency", "forcePseudoTransparency"), 243 m_rc_pseudotrans(m_resourcemanager, false, "forcePseudoTransparency"),
244 m_rc_colors_per_channel(m_resourcemanager, 4, 244 m_rc_colors_per_channel(m_resourcemanager, 4, "colorsPerChannel", RangedIntTraits(2, 6)),
245 "colorsPerChannel", "ColorsPerChannel"), 245 m_rc_double_click_interval(m_resourcemanager, 250, "doubleClickInterval"),
246 m_rc_double_click_interval(m_resourcemanager, 250, "doubleClickInterval", "DoubleClickInterval"), 246 m_rc_tabs_padding(m_resourcemanager, 0, "tabPadding"),
247 m_rc_tabs_padding(m_resourcemanager, 0, "tabPadding", "TabPadding"), 247 m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "styleFile"),
248 m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "styleFile", "StyleFile"), 248 m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay"),
249 m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay", "StyleOverlay"), 249 m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu2", "menuFile"),
250 m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu2", "menuFile", "MenuFile"), 250 m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "keyFile"),
251 m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "keyFile", "KeyFile"), 251 m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile"),
252 m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile", "AppsFile"), 252 m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea"),
253 m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea", "TabsAttachArea"), 253 m_rc_cache_life(m_resourcemanager, 5, "cacheLife"),
254 m_rc_cache_life(m_resourcemanager, 5, "cacheLife", "CacheLife"), 254 m_rc_cache_max(m_resourcemanager, 200, "cacheMax"),
255 m_rc_cache_max(m_resourcemanager, 200, "cacheMax", "CacheMax"), 255 m_rc_auto_raise_delay(m_resourcemanager, 250, "autoRaiseDelay"),
256 m_rc_auto_raise_delay(m_resourcemanager, 250, "autoRaiseDelay", "AutoRaiseDelay"),
257 m_masked_window(0), 256 m_masked_window(0),
258 m_mousescreen(0), 257 m_mousescreen(0),
259 m_keyscreen(0), 258 m_keyscreen(0),
@@ -1176,10 +1175,6 @@ void Fluxbox::load_rc() {
1176 if (m_rc_menufile->empty()) 1175 if (m_rc_menufile->empty())
1177 m_rc_menufile.setDefaultValue(); 1176 m_rc_menufile.setDefaultValue();
1178 1177
1179 FbTk::Transparent::usePseudoTransparent(*m_rc_pseudotrans);
1180
1181 *m_rc_colors_per_channel = FbTk::Util::clamp(*m_rc_colors_per_channel, 2, 6);
1182
1183 if (m_rc_stylefile->empty()) 1178 if (m_rc_stylefile->empty())
1184 *m_rc_stylefile = DEFAULTSTYLE; 1179 *m_rc_stylefile = DEFAULTSTYLE;
1185} 1180}