diff options
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 1dfcab8..37eb0e1 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -242,21 +242,20 @@ Fluxbox::Fluxbox(int argc, char **argv, | |||
242 | m_resourcemanager("session", *m_l), | 242 | m_resourcemanager("session", *m_l), |
243 | 243 | ||
244 | m_RC_PATH(rc_path), | 244 | m_RC_PATH(rc_path), |
245 | m_rc_ignoreborder(m_resourcemanager, false, "ignoreBorder", "IgnoreBorder"), | 245 | m_rc_ignoreborder(m_resourcemanager, false, "ignoreBorder"), |
246 | m_rc_pseudotrans(m_resourcemanager, false, "forcePseudoTransparency", "forcePseudoTransparency"), | 246 | m_rc_pseudotrans(m_resourcemanager, false, "forcePseudoTransparency"), |
247 | m_rc_colors_per_channel(m_resourcemanager, 4, | 247 | m_rc_colors_per_channel(m_resourcemanager, 4, "colorsPerChannel", RangedIntTraits(2, 6)), |
248 | "colorsPerChannel", "ColorsPerChannel"), | 248 | m_rc_double_click_interval(m_resourcemanager, 250, "doubleClickInterval"), |
249 | m_rc_double_click_interval(m_resourcemanager, 250, "doubleClickInterval", "DoubleClickInterval"), | 249 | m_rc_tabs_padding(m_resourcemanager, 0, "tabPadding"), |
250 | m_rc_tabs_padding(m_resourcemanager, 0, "tabPadding", "TabPadding"), | 250 | m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "styleFile"), |
251 | m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "styleFile", "StyleFile"), | 251 | m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay"), |
252 | m_rc_styleoverlayfile(m_resourcemanager, m_RC_PATH + "/overlay", "styleOverlay", "StyleOverlay"), | 252 | m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu2", "menuFile"), |
253 | m_rc_menufile(m_resourcemanager, m_RC_PATH + "/menu2", "menuFile", "MenuFile"), | 253 | m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "keyFile"), |
254 | m_rc_keyfile(m_resourcemanager, m_RC_PATH + "/keys", "keyFile", "KeyFile"), | 254 | m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile"), |
255 | m_rc_appsfile(m_resourcemanager, m_RC_PATH + "/apps", "appsFile", "AppsFile"), | 255 | m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea"), |
256 | m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "tabsAttachArea", "TabsAttachArea"), | 256 | m_rc_cache_life(m_resourcemanager, 5, "cacheLife"), |
257 | m_rc_cache_life(m_resourcemanager, 5, "cacheLife", "CacheLife"), | 257 | m_rc_cache_max(m_resourcemanager, 200, "cacheMax"), |
258 | m_rc_cache_max(m_resourcemanager, 200, "cacheMax", "CacheMax"), | 258 | m_rc_auto_raise_delay(m_resourcemanager, 250, "autoRaiseDelay"), |
259 | m_rc_auto_raise_delay(m_resourcemanager, 250, "autoRaiseDelay", "AutoRaiseDelay"), | ||
260 | m_masked_window(0), | 259 | m_masked_window(0), |
261 | m_mousescreen(0), | 260 | m_mousescreen(0), |
262 | m_keyscreen(0), | 261 | m_keyscreen(0), |
@@ -1184,10 +1183,6 @@ void Fluxbox::load_rc() { | |||
1184 | if (m_rc_menufile->empty()) | 1183 | if (m_rc_menufile->empty()) |
1185 | m_rc_menufile.setDefaultValue(); | 1184 | m_rc_menufile.setDefaultValue(); |
1186 | 1185 | ||
1187 | FbTk::Transparent::usePseudoTransparent(*m_rc_pseudotrans); | ||
1188 | |||
1189 | *m_rc_colors_per_channel = FbTk::Util::clamp(*m_rc_colors_per_channel, 2, 6); | ||
1190 | |||
1191 | if (m_rc_stylefile->empty()) | 1186 | if (m_rc_stylefile->empty()) |
1192 | *m_rc_stylefile = DEFAULTSTYLE; | 1187 | *m_rc_stylefile = DEFAULTSTYLE; |
1193 | } | 1188 | } |