summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfluxgen <fluxgen>2003-05-11 22:19:17 (GMT)
committerfluxgen <fluxgen>2003-05-11 22:19:17 (GMT)
commit7037b9ca2cdf9e03a7a54ef45d6d6f7a601725fd (patch)
treedf0af4b0fc42cb2cb1822f9e9d837a31f87c757d
parent725af388cd87549d76253c76f5502db67366a16a (diff)
downloadfluxbox_lack-7037b9ca2cdf9e03a7a54ef45d6d6f7a601725fd.zip
fluxbox_lack-7037b9ca2cdf9e03a7a54ef45d6d6f7a601725fd.tar.bz2
minor fix
-rw-r--r--src/fluxbox.cc31
-rw-r--r--src/fluxbox.hh4
2 files changed, 18 insertions, 17 deletions
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 9969593..2793670 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.137 2003/05/11 17:11:59 fluxgen Exp $ 25// $Id: fluxbox.cc,v 1.138 2003/05/11 22:19:17 fluxgen Exp $
26 26
27#include "fluxbox.hh" 27#include "fluxbox.hh"
28 28
@@ -96,24 +96,24 @@
96#include <sys/select.h> 96#include <sys/select.h>
97#endif // HAVE_SYS_SELECT_H 97#endif // HAVE_SYS_SELECT_H
98 98
99#ifdef HAVE_SYS_STAT_H 99#ifdef HAVE_SYS_STAT_H
100#include <sys/types.h> 100#include <sys/types.h>
101#include <sys/stat.h> 101#include <sys/stat.h>
102#endif // HAVE_SYS_STAT_H 102#endif // HAVE_SYS_STAT_H
103 103
104#ifdef TIME_WITH_SYS_TIME 104#ifdef TIME_WITH_SYS_TIME
105#include <sys/time.h> 105#include <sys/time.h>
106#include <time.h> 106#include <time.h>
107#else // !TIME_WITH_SYS_TIME 107#else // !TIME_WITH_SYS_TIME
108#ifdef HAVE_SYS_TIME_H 108#ifdef HAVE_SYS_TIME_H
109#include <sys/time.h> 109#include <sys/time.h>
110#else // !HAVE_SYS_TIME_H 110#else // !HAVE_SYS_TIME_H
111#include <time.h> 111#include <time.h>
112#endif // HAVE_SYS_TIME_H 112#endif // HAVE_SYS_TIME_H
113#endif // TIME_WITH_SYS_TIME 113#endif // TIME_WITH_SYS_TIME
114 114
115#ifdef HAVE_LIBGEN_H 115#ifdef HAVE_LIBGEN_H
116# include <libgen.h> 116#include <libgen.h>
117#endif // HAVE_LIBGEN_H 117#endif // HAVE_LIBGEN_H
118 118
119#include <sys/wait.h> 119#include <sys/wait.h>
@@ -145,9 +145,6 @@ char *basename (char *s) {
145 145
146#endif // HAVE_BASENAME 146#endif // HAVE_BASENAME
147 147
148#define RC_PATH "fluxbox"
149#define RC_INIT_FILE "init"
150
151//----------------------------------------------------------------- 148//-----------------------------------------------------------------
152//---- accessors for int, bool, and some enums with Resource ------ 149//---- accessors for int, bool, and some enums with Resource ------
153//----------------------------------------------------------------- 150//-----------------------------------------------------------------
@@ -412,7 +409,9 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
412 m_argv(argv), m_argc(argc), 409 m_argv(argv), m_argc(argc),
413 m_starting(true), 410 m_starting(true),
414 m_shutdown(false), 411 m_shutdown(false),
415 m_server_grabs(0) { 412 m_server_grabs(0),
413 m_RC_PATH("fluxbox"),
414 m_RC_INIT_FILE("init") {
416 415
417 416
418 if (s_singleton != 0) { 417 if (s_singleton != 0) {
@@ -595,11 +594,11 @@ void Fluxbox::setupConfigFiles() {
595 594
596 bool create_init = false, create_keys = false, create_menu = false; 595 bool create_init = false, create_keys = false, create_menu = false;
597 596
598 string dirname = getenv("HOME")+string("/.")+string(RC_PATH) + "/"; 597 string dirname = getenv("HOME")+string("/.")+string(m_RC_PATH) + "/";
599 string init_file, keys_file, menu_file, slitlist_file; 598 string init_file, keys_file, menu_file, slitlist_file;
600 init_file = dirname+RC_INIT_FILE; 599 init_file = dirname + m_RC_INIT_FILE;
601 keys_file = dirname+"keys"; 600 keys_file = dirname + "keys";
602 menu_file = dirname+"menu"; 601 menu_file = dirname + "menu";
603 602
604 struct stat buf; 603 struct stat buf;
605 604
@@ -1851,7 +1850,7 @@ void Fluxbox::save_rc() {
1851string Fluxbox::getRcFilename() { 1850string Fluxbox::getRcFilename() {
1852 1851
1853 if (m_rc_file.size() == 0) { // set default filename 1852 if (m_rc_file.size() == 0) { // set default filename
1854 string defaultfile(getenv("HOME")+string("/.")+RC_PATH+string("/")+RC_INIT_FILE); 1853 string defaultfile(getenv("HOME") + string("/.") + m_RC_PATH + string("/") + m_RC_INIT_FILE);
1855 return defaultfile; 1854 return defaultfile;
1856 } 1855 }
1857 1856
@@ -1860,7 +1859,7 @@ string Fluxbox::getRcFilename() {
1860 1859
1861/// Provides default filename of data file 1860/// Provides default filename of data file
1862void Fluxbox::getDefaultDataFilename(char *name, string &filename) { 1861void Fluxbox::getDefaultDataFilename(char *name, string &filename) {
1863 filename = string(getenv("HOME")+string("/.")+RC_PATH+string("/")+name); 1862 filename = string(getenv("HOME") + string("/.") + m_RC_PATH + string("/") + name);
1864} 1863}
1865 1864
1866/// loads resources 1865/// loads resources
diff --git a/src/fluxbox.hh b/src/fluxbox.hh
index 8233309..25ffeea 100644
--- a/src/fluxbox.hh
+++ b/src/fluxbox.hh
@@ -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.hh,v 1.55 2003/05/11 15:35:24 fluxgen Exp $ 25// $Id: fluxbox.hh,v 1.56 2003/05/11 22:18:33 fluxgen Exp $
26 26
27#ifndef FLUXBOX_HH 27#ifndef FLUXBOX_HH
28#define FLUXBOX_HH 28#define FLUXBOX_HH
@@ -268,6 +268,8 @@ private:
268 bool m_starting; 268 bool m_starting;
269 bool m_shutdown; 269 bool m_shutdown;
270 int m_server_grabs; 270 int m_server_grabs;
271 const char *m_RC_PATH;
272 const char *m_RC_INIT_FILE;
271}; 273};
272 274
273 275