aboutsummaryrefslogtreecommitdiff
path: root/src/fluxbox.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r--src/fluxbox.cc15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 45a67bc..8d2d57c 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -22,7 +22,7 @@
22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 22// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
23// DEALINGS IN THE SOFTWARE. 23// DEALINGS IN THE SOFTWARE.
24 24
25// $Id: fluxbox.cc,v 1.64 2002/08/04 15:00:50 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.65 2002/08/11 20:38:23 fluxgen Exp $
26 26
27//Use GNU extensions 27//Use GNU extensions
28#ifndef _GNU_SOURCE 28#ifndef _GNU_SOURCE
@@ -306,6 +306,7 @@ m_rc_stylefile(m_resourcemanager, "", "session.styleFile", "Session.StyleFile"),
306m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"), 306m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"),
307m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"), 307m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"),
308m_rc_slitlistfile(m_resourcemanager, "", "session.slitlistFile", "Session.SlitlistFile"), 308m_rc_slitlistfile(m_resourcemanager, "", "session.slitlistFile", "Session.SlitlistFile"),
309m_rc_groupfile(m_resourcemanager, "", "session.groupFile", "Session.GroupFile"),
309m_rc_titlebar_left(m_resourcemanager, TitlebarList(&m_titlebar_left[0], &m_titlebar_left[1]), "session.titlebar.left", "Session.Titlebar.Left"), 310m_rc_titlebar_left(m_resourcemanager, TitlebarList(&m_titlebar_left[0], &m_titlebar_left[1]), "session.titlebar.left", "Session.Titlebar.Left"),
310m_rc_titlebar_right(m_resourcemanager, TitlebarList(&m_titlebar_right[0], &m_titlebar_right[3]), "session.titlebar.right", "Session.Titlebar.Right"), 311m_rc_titlebar_right(m_resourcemanager, TitlebarList(&m_titlebar_right[0], &m_titlebar_right[3]), "session.titlebar.right", "Session.Titlebar.Right"),
311m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"), 312m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"),
@@ -584,7 +585,7 @@ void Fluxbox::process_event(XEvent *e) {
584#ifdef KDE 585#ifdef KDE
585 //Check and see if client is KDE dock applet. 586 //Check and see if client is KDE dock applet.
586 //If so add to Slit 587 //If so add to Slit
587 bool iskdedockapp = False; 588 bool iskdedockapp = false;
588 Atom ajunk; 589 Atom ajunk;
589 int ijunk; 590 int ijunk;
590 unsigned long *data = (unsigned long *) 0, uljunk; 591 unsigned long *data = (unsigned long *) 0, uljunk;
@@ -2018,6 +2019,16 @@ void Fluxbox::load_rc(void) {
2018 (resource.auto_raise_delay.tv_sec * 1000); 2019 (resource.auto_raise_delay.tv_sec * 1000);
2019 resource.auto_raise_delay.tv_usec *= 1000; 2020 resource.auto_raise_delay.tv_usec *= 1000;
2020 2021
2022 { // expand tilde
2023 auto_ptr<char> tmpvar(StringUtil::expandFilename(m_rc_groupfile->c_str()));
2024 *m_rc_groupfile = (tmpvar.get()==0 ? "" : tmpvar.get());
2025 }
2026#ifdef DEBUG
2027 cerr<<__FILE__<<": Loading groups ("<<*m_rc_groupfile<<")"<<endl;
2028#endif // DEBUG
2029 if (!Workspace::loadGroups(*m_rc_groupfile)) {
2030 cerr<<"Faild to load groupfile: "<<*m_rc_groupfile<<endl;
2031 }
2021} 2032}
2022 2033
2023void Fluxbox::load_rc(BScreen *screen) { 2034void Fluxbox::load_rc(BScreen *screen) {