diff options
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index ef90d4e..94020f2 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -205,6 +205,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
205 | m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"), | 205 | m_rc_numlayers(m_resourcemanager, 13, "session.numLayers", "Session.NumLayers"), |
206 | m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"), | 206 | m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"), |
207 | m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"), | 207 | m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"), |
208 | m_rc_styleoverlayfile(m_resourcemanager, "~/.fluxbox/ovrd_style", "session.styleOverlay", "Session.StyleOverlay"), | ||
208 | m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"), | 209 | m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"), |
209 | m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"), | 210 | m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"), |
210 | m_rc_slitlistfile(m_resourcemanager, "~/.fluxbox/slitlist", "session.slitlistFile", "Session.SlitlistFile"), | 211 | m_rc_slitlistfile(m_resourcemanager, "~/.fluxbox/slitlist", "session.slitlistFile", "Session.SlitlistFile"), |
@@ -299,7 +300,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
299 | 300 | ||
300 | load_rc(); | 301 | load_rc(); |
301 | // setup theme manager to have our style file ready to be scanned | 302 | // setup theme manager to have our style file ready to be scanned |
302 | FbTk::ThemeManager::instance().load(getStyleFilename()); | 303 | FbTk::ThemeManager::instance().load(getStyleFilename(), getStyleOverlayFilename()); |
303 | 304 | ||
304 | // setup atom handlers before we create any windows | 305 | // setup atom handlers before we create any windows |
305 | #ifdef REMEMBER | 306 | #ifdef REMEMBER |
@@ -377,9 +378,9 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
377 | } | 378 | } |
378 | 379 | ||
379 | m_keyscreen = m_mousescreen = m_screen_list.front(); | 380 | m_keyscreen = m_mousescreen = m_screen_list.front(); |
380 | 381 | ||
381 | // setup theme manager to have our style file ready to be scanned | 382 | // setup theme manager to have our style file ready to be scanned |
382 | FbTk::ThemeManager::instance().load(FbTk::StringUtil::expandFilename(getStyleFilename())); | 383 | FbTk::ThemeManager::instance().load(getStyleFilename(), getStyleOverlayFilename()); |
383 | 384 | ||
384 | //XSynchronize(disp, False); | 385 | //XSynchronize(disp, False); |
385 | sync(false); | 386 | sync(false); |
@@ -1587,7 +1588,7 @@ void Fluxbox::load_rc(BScreen &screen) { | |||
1587 | if (!(*it).empty() && (*it) != "") | 1588 | if (!(*it).empty() && (*it) != "") |
1588 | screen.addWorkspaceName((*it).c_str()); | 1589 | screen.addWorkspaceName((*it).c_str()); |
1589 | } | 1590 | } |
1590 | 1591 | ||
1591 | } | 1592 | } |
1592 | 1593 | ||
1593 | FbTk::Image::removeAllSearchPaths(); | 1594 | FbTk::Image::removeAllSearchPaths(); |