set up a default rc file, and change teh user rc to ~./openbox/epistrc

diff --git a/util/epist/Makefile.am b/util/epist/Makefile.am
index fed2326cb19773bc3cdedc4d6a96305d8e2d636b..ac2120cf85d292a3fed71ba6d36e4431cdde5be8 100644 (file)
--- a/util/epist/Makefile.am
+++ b/util/epist/Makefile.am
@@ -1,6 +1,8 @@
 # util/epist/Makefile.am for Blackbox - an X11 Window manager
 
-CPPFLAGS= @CPPFLAGS@ @DEBUG@
+DEFAULT_RC=$(pkgdatadir)/epistrc
+
+CPPFLAGS= @CPPFLAGS@ @DEBUG@ -DDEFAULTRC=\"$(DEFAULT_RC)\"
 
 #EXTRA_PROGRAMS =              epist
 bin_PROGRAMS =         epist
@@ -17,6 +19,13 @@ MAINTAINERCLEANFILES =       Makefile.in
 distclean-local:
        rm -f *\~ .\#*
 
+install-data-local: epistrc
+       test -f $(DESTDIR)$(pkgdatadir)/epistrc || \
+       $(INSTALL_DATA) epistrc $(DESTDIR)$(pkgdatadir)
+
+uninstall-am:
+       rm -f $(DESTDIR)$(pkgdatadir)/epistrc
+
 # local dependencies
 
 actions.o: actions.cc actions.hh

diff --git a/util/epist/epist.cc b/util/epist/epist.cc
index a0b1666a2dfd70cb13a2c402eda6727095bae652..a5b829b0063bb29133aa9ceea8df067831aa2455 100644 (file)
--- a/util/epist/epist.cc
+++ b/util/epist/epist.cc
@@ -41,6 +41,16 @@ extern "C" {
 #ifdef    HAVE_LIBGEN_H
 #  include <libgen.h>
 #endif // HAVE_LIBGEN_H
+
+#ifdef    HAVE_UNISTD_H
+#  include <sys/types.h>
+#  include <unistd.h>
+#endif // HAVE_UNISTD_H
+
+#ifdef    HAVE_SYS_STAT_H
+#  include <sys/types.h>
+#  include <sys/stat.h>
+#endif // HAVE_SYS_STAT_H
 }
 
 #include <iostream>
@@ -66,7 +76,12 @@ epist::epist(char **argv, char *dpy_name, char *rc_file)
   if (rc_file)
     _rc_file = rc_file;
   else
-    _rc_file = expandTilde("~/.epistrc");
+    _rc_file = expandTilde("~/.openbox/epistrc");
+
+  struct stat buf;
+  if (0 != stat(_rc_file.c_str(), &buf) ||
+      !S_ISREG(buf.st_mode))
+    _rc_file = DEFAULTRC;
 
   _xatom = new XAtom(getXDisplay());