nilix/fluxbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

minor fix

Browse source
This commit is contained in:
fluxgen 2003-05-11 22:19:17 +00:00
parent 725af388cd
commit 7037b9ca2c
2 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/fluxbox.cc
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.cc,v 1.137 2003/05/11 17:11:59 fluxgen Exp $ // $Id: fluxbox.cc,v 1.138 2003/05/11 22:19:17 fluxgen Exp $
#include "fluxbox.hh" #include "fluxbox.hh"
@ -96,24 +96,24 @@
#include <sys/select.h> #include <sys/select.h>
#endif // HAVE_SYS_SELECT_H #endif // HAVE_SYS_SELECT_H
#ifdef HAVE_SYS_STAT_H #ifdef HAVE_SYS_STAT_H
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#endif // HAVE_SYS_STAT_H #endif // HAVE_SYS_STAT_H
#ifdef TIME_WITH_SYS_TIME #ifdef TIME_WITH_SYS_TIME
#include <sys/time.h> #include <sys/time.h>
#include <time.h> #include <time.h>
#else // !TIME_WITH_SYS_TIME #else // !TIME_WITH_SYS_TIME
#ifdef HAVE_SYS_TIME_H #ifdef HAVE_SYS_TIME_H
#include <sys/time.h> #include <sys/time.h>
#else // !HAVE_SYS_TIME_H #else // !HAVE_SYS_TIME_H
#include <time.h> #include <time.h>
#endif // HAVE_SYS_TIME_H #endif // HAVE_SYS_TIME_H
#endif // TIME_WITH_SYS_TIME #endif // TIME_WITH_SYS_TIME
#ifdef HAVE_LIBGEN_H #ifdef HAVE_LIBGEN_H
# include <libgen.h> #include <libgen.h>
#endif // HAVE_LIBGEN_H #endif // HAVE_LIBGEN_H
#include <sys/wait.h> #include <sys/wait.h>
@ -145,9 +145,6 @@ char *basename (char *s) {
#endif // HAVE_BASENAME #endif // HAVE_BASENAME
#define RC_PATH "fluxbox"
#define RC_INIT_FILE "init"
//----------------------------------------------------------------- //-----------------------------------------------------------------
//---- accessors for int, bool, and some enums with Resource ------ //---- accessors for int, bool, and some enums with Resource ------
//----------------------------------------------------------------- //-----------------------------------------------------------------
@ -412,7 +409,9 @@ Fluxbox::Fluxbox(int argc, char **argv, const char *dpy_name, const char *rcfile
m_argv(argv), m_argc(argc), m_argv(argv), m_argc(argc),
m_starting(true), m_starting(true),
m_shutdown(false), m_shutdown(false),
m_server_grabs(0) { m_server_grabs(0),
m_RC_PATH("fluxbox"),
m_RC_INIT_FILE("init") {
if (s_singleton != 0) { if (s_singleton != 0) {
@ -595,11 +594,11 @@ void Fluxbox::setupConfigFiles() {
bool create_init = false, create_keys = false, create_menu = false; bool create_init = false, create_keys = false, create_menu = false;
string dirname = getenv("HOME")+string("/.")+string(RC_PATH) + "/"; string dirname = getenv("HOME")+string("/.")+string(m_RC_PATH) + "/";
string init_file, keys_file, menu_file, slitlist_file; string init_file, keys_file, menu_file, slitlist_file;
init_file = dirname+RC_INIT_FILE; init_file = dirname + m_RC_INIT_FILE;
keys_file = dirname+"keys"; keys_file = dirname + "keys";
menu_file = dirname+"menu"; menu_file = dirname + "menu";
struct stat buf; struct stat buf;
@ -1851,7 +1850,7 @@ void Fluxbox::save_rc() {
string Fluxbox::getRcFilename() { string Fluxbox::getRcFilename() {
if (m_rc_file.size() == 0) { // set default filename if (m_rc_file.size() == 0) { // set default filename
string defaultfile(getenv("HOME")+string("/.")+RC_PATH+string("/")+RC_INIT_FILE); string defaultfile(getenv("HOME") + string("/.") + m_RC_PATH + string("/") + m_RC_INIT_FILE);
return defaultfile; return defaultfile;
} }
@ -1860,7 +1859,7 @@ string Fluxbox::getRcFilename() {
/// Provides default filename of data file /// Provides default filename of data file
void Fluxbox::getDefaultDataFilename(char *name, string &filename) { void Fluxbox::getDefaultDataFilename(char *name, string &filename) {
filename = string(getenv("HOME")+string("/.")+RC_PATH+string("/")+name); filename = string(getenv("HOME") + string("/.") + m_RC_PATH + string("/") + name);
} }
/// loads resources /// loads resources

4
src/fluxbox.hh
View file

@ -22,7 +22,7 @@
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER // FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
// DEALINGS IN THE SOFTWARE. // DEALINGS IN THE SOFTWARE.
// $Id: fluxbox.hh,v 1.55 2003/05/11 15:35:24 fluxgen Exp $ // $Id: fluxbox.hh,v 1.56 2003/05/11 22:18:33 fluxgen Exp $
#ifndef FLUXBOX_HH #ifndef FLUXBOX_HH
#define FLUXBOX_HH #define FLUXBOX_HH
@ -268,6 +268,8 @@ private:
bool m_starting; bool m_starting;
bool m_shutdown; bool m_shutdown;
int m_server_grabs; int m_server_grabs;
const char *m_RC_PATH;
const char *m_RC_INIT_FILE;
}; };