diff options
Diffstat (limited to 'src/fluxbox.cc')
-rw-r--r-- | src/fluxbox.cc | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc index 57597a2..bad558b 100644 --- a/src/fluxbox.cc +++ b/src/fluxbox.cc | |||
@@ -202,11 +202,11 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
202 | m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"), | 202 | m_rc_double_click_interval(m_resourcemanager, 250, "session.doubleClickInterval", "Session.DoubleClickInterval"), |
203 | m_rc_tabs_padding(m_resourcemanager, 0, "session.tabPadding", "Session.TabPadding"), | 203 | m_rc_tabs_padding(m_resourcemanager, 0, "session.tabPadding", "Session.TabPadding"), |
204 | m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"), | 204 | m_rc_stylefile(m_resourcemanager, DEFAULTSTYLE, "session.styleFile", "Session.StyleFile"), |
205 | m_rc_styleoverlayfile(m_resourcemanager, "~/.fluxbox/overlay", "session.styleOverlay", "Session.StyleOverlay"), | 205 | m_rc_styleoverlayfile(m_resourcemanager, "~/." + realProgramName("fluxbox") + "/overlay", "session.styleOverlay", "Session.StyleOverlay"), |
206 | m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"), | 206 | m_rc_menufile(m_resourcemanager, DEFAULTMENU, "session.menuFile", "Session.MenuFile"), |
207 | m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"), | 207 | m_rc_keyfile(m_resourcemanager, DEFAULTKEYSFILE, "session.keyFile", "Session.KeyFile"), |
208 | m_rc_slitlistfile(m_resourcemanager, "~/.fluxbox/slitlist", "session.slitlistFile", "Session.SlitlistFile"), | 208 | m_rc_slitlistfile(m_resourcemanager, "~/." + realProgramName("fluxbox") + "/slitlist", "session.slitlistFile", "Session.SlitlistFile"), |
209 | m_rc_appsfile(m_resourcemanager, "~/.fluxbox/apps", "session.appsFile", "Session.AppsFile"), | 209 | m_rc_appsfile(m_resourcemanager, "~/." + realProgramName("fluxbox") + "/apps", "session.appsFile", "Session.AppsFile"), |
210 | m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "session.tabsAttachArea", "Session.TabsAttachArea"), | 210 | m_rc_tabs_attach_area(m_resourcemanager, ATTACH_AREA_WINDOW, "session.tabsAttachArea", "Session.TabsAttachArea"), |
211 | m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"), | 211 | m_rc_cache_life(m_resourcemanager, 5, "session.cacheLife", "Session.CacheLife"), |
212 | m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"), | 212 | m_rc_cache_max(m_resourcemanager, 200, "session.cacheMax", "Session.CacheMax"), |
@@ -226,7 +226,7 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile | |||
226 | m_shutdown(false), | 226 | m_shutdown(false), |
227 | m_server_grabs(0), | 227 | m_server_grabs(0), |
228 | m_randr_event_type(0), | 228 | m_randr_event_type(0), |
229 | m_RC_PATH("fluxbox"), | 229 | m_RC_PATH(realProgramName("fluxbox")), |
230 | m_RC_INIT_FILE("init") { | 230 | m_RC_INIT_FILE("init") { |
231 | 231 | ||
232 | _FB_USES_NLS; | 232 | _FB_USES_NLS; |
@@ -591,7 +591,7 @@ void Fluxbox::setupConfigFiles() { | |||
591 | 591 | ||
592 | bool create_init = false, create_keys = false, create_menu = false; | 592 | bool create_init = false, create_keys = false, create_menu = false; |
593 | 593 | ||
594 | string dirname = getenv("HOME") + string("/.") + string(m_RC_PATH) + "/"; | 594 | string dirname = getenv("HOME") + string("/.") + m_RC_PATH + "/"; |
595 | string init_file, keys_file, menu_file, slitlist_file; | 595 | string init_file, keys_file, menu_file, slitlist_file; |
596 | init_file = dirname + m_RC_INIT_FILE; | 596 | init_file = dirname + m_RC_INIT_FILE; |
597 | keys_file = dirname + "keys"; | 597 | keys_file = dirname + "keys"; |
@@ -648,8 +648,8 @@ void Fluxbox::setupConfigFiles() { | |||
648 | if (*config_version < CONFIG_VERSION) { | 648 | if (*config_version < CONFIG_VERSION) { |
649 | // configs are out of date, so run fluxbox-update_configs | 649 | // configs are out of date, so run fluxbox-update_configs |
650 | 650 | ||
651 | string commandargs = "fluxbox-update_configs -rc "; | 651 | string commandargs = realProgramName("fluxbox-update_configs"); |
652 | commandargs += init_file; | 652 | commandargs += " -rc " + init_file; |
653 | 653 | ||
654 | #ifdef HAVE_GETPID | 654 | #ifdef HAVE_GETPID |
655 | // add the fluxbox pid so fbuc can have us reload rc if necessary | 655 | // add the fluxbox pid so fbuc can have us reload rc if necessary |
@@ -1087,7 +1087,7 @@ void Fluxbox::handleSignal(int signum) { | |||
1087 | load_rc(); | 1087 | load_rc(); |
1088 | break; | 1088 | break; |
1089 | case SIGUSR2: | 1089 | case SIGUSR2: |
1090 | reload_rc(); | 1090 | reconfigure(); |
1091 | break; | 1091 | break; |
1092 | case SIGSEGV: | 1092 | case SIGSEGV: |
1093 | abort(); | 1093 | abort(); |
@@ -1546,13 +1546,8 @@ void Fluxbox::load_rc(BScreen &screen) { | |||
1546 | } | 1546 | } |
1547 | } | 1547 | } |
1548 | 1548 | ||
1549 | void Fluxbox::reload_rc() { | ||
1550 | load_rc(); | ||
1551 | reconfigure(); | ||
1552 | } | ||
1553 | |||
1554 | |||
1555 | void Fluxbox::reconfigure() { | 1549 | void Fluxbox::reconfigure() { |
1550 | load_rc(); | ||
1556 | m_reconfigure_wait = true; | 1551 | m_reconfigure_wait = true; |
1557 | m_reconfig_timer.start(); | 1552 | m_reconfig_timer.start(); |
1558 | } | 1553 | } |