aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Tiefenbruck <mark@fluxbox.org>2008-04-26 00:56:51 (GMT)
committerMark Tiefenbruck <mark@fluxbox.org>2008-04-26 00:56:51 (GMT)
commit40e17b4d0ef1b9503f21509e697dd4dcb24d2bbf (patch)
tree561e9ff127559c915eea87631859c64a7a1d979a
parentc13bd3164e484befdc1dc5950137e0c4b58fa31c (diff)
downloadfluxbox_paul-40e17b4d0ef1b9503f21509e697dd4dcb24d2bbf.zip
fluxbox_paul-40e17b4d0ef1b9503f21509e697dd4dcb24d2bbf.tar.bz2
some updates for the startup file in modern times
-rw-r--r--configure.in8
-rw-r--r--data/Makefile.am8
-rw-r--r--data/overlay2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/fluxbox.cc12
-rwxr-xr-xutil/startfluxbox.in16
6 files changed, 33 insertions, 15 deletions
diff --git a/configure.in b/configure.in
index 5744b6c..b25de99 100644
--- a/configure.in
+++ b/configure.in
@@ -562,6 +562,14 @@ AC_ARG_WITH(
562AC_SUBST(DEFAULT_APPS) 562AC_SUBST(DEFAULT_APPS)
563 563
564AC_ARG_WITH( 564AC_ARG_WITH(
565 overlay,
566 [ --with-overlay=path location overlay file (PREFIX/share/fluxbox/overlay)],
567 DEFAULT_OVERLAY=$with_overlay,
568 DEFAULT_OVERLAY=\$\(prefix\)/share/fluxbox/overlay
569)
570AC_SUBST(DEFAULT_OVERLAY)
571
572AC_ARG_WITH(
565 init, 573 init,
566 [ --with-init=path location init file (PREFIX/share/fluxbox/init)], 574 [ --with-init=path location init file (PREFIX/share/fluxbox/init)],
567 DEFAULT_INIT=$with_init, 575 DEFAULT_INIT=$with_init,
diff --git a/data/Makefile.am b/data/Makefile.am
index 4a0bd10..4dde80c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -7,13 +7,14 @@ DEFAULT_MENU = @DEFAULT_MENU@
7DEFAULT_STYLE = @DEFAULT_STYLE@ 7DEFAULT_STYLE = @DEFAULT_STYLE@
8DEFAULT_KEYS = @DEFAULT_KEYS@ 8DEFAULT_KEYS = @DEFAULT_KEYS@
9DEFAULT_APPS = @DEFAULT_APPS@ 9DEFAULT_APPS = @DEFAULT_APPS@
10DEFAULT_OVERLAY = @DEFAULT_OVERLAY@
10DEFAULT_INIT = @DEFAULT_INIT@ 11DEFAULT_INIT = @DEFAULT_INIT@
11 12
12SUBDIRS= styles 13SUBDIRS= styles
13CLEANFILES= menu menu.in menu.pre menu.bak init apps 14CLEANFILES= menu menu.in menu.pre menu.bak init apps
14MAINTAINERCLEANFILES= Makefile.in 15MAINTAINERCLEANFILES= Makefile.in
15pkgdata_DATA= keys menu init apps 16pkgdata_DATA= keys menu init apps overlay
16EXTRA_DIST= keys init.in apps.in 17EXTRA_DIST= keys init.in apps.in overlay
17all-local: menu init apps 18all-local: menu init apps
18install-pkgdataDATA: 19install-pkgdataDATA:
19 @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)" 20 @echo "Installing menu file in $(DESTDIR)$(DEFAULT_MENU)"
@@ -25,6 +26,9 @@ install-pkgdataDATA:
25 @echo "Installing apps file in $(DESTDIR)$(DEFAULT_APPS)" 26 @echo "Installing apps file in $(DESTDIR)$(DEFAULT_APPS)"
26 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_APPS)) 27 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_APPS))
27 $(INSTALL_DATA) $(srcdir)/apps $(DESTDIR)$(DEFAULT_APPS) 28 $(INSTALL_DATA) $(srcdir)/apps $(DESTDIR)$(DEFAULT_APPS)
29 @echo "Installing overlay file in $(DESTDIR)$(DEFAULT_OVERLAY)"
30 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_OVERLAY))
31 $(INSTALL_DATA) $(srcdir)/overlay $(DESTDIR)$(DEFAULT_OVERLAY)
28 @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)" 32 @echo "Installing init file in $(DESTDIR)$(DEFAULT_INIT)"
29 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT)) 33 $(mkinstalldirs) $(DESTDIR)$(dir $(DEFAULT_INIT))
30 $(INSTALL_DATA) init $(DESTDIR)$(DEFAULT_INIT) 34 $(INSTALL_DATA) init $(DESTDIR)$(DEFAULT_INIT)
diff --git a/data/overlay b/data/overlay
new file mode 100644
index 0000000..bb4e91c
--- /dev/null
+++ b/data/overlay
@@ -0,0 +1,2 @@
1! The following line will prevent styles from setting the background.
2! background: none
diff --git a/src/Makefile.am b/src/Makefile.am
index 8fe65a6..0fc5a7a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,6 +28,7 @@ DEFAULT_MENU=@DEFAULT_MENU@
28DEFAULT_STYLE=@DEFAULT_STYLE@ 28DEFAULT_STYLE=@DEFAULT_STYLE@
29DEFAULT_KEYSFILE=@DEFAULT_KEYS@ 29DEFAULT_KEYSFILE=@DEFAULT_KEYS@
30DEFAULT_APPSFILE=@DEFAULT_APPS@ 30DEFAULT_APPSFILE=@DEFAULT_APPS@
31DEFAULT_OVERLAY=@DEFAULT_OVERLAY@
31DEFAULT_INITFILE=@DEFAULT_INIT@ 32DEFAULT_INITFILE=@DEFAULT_INIT@
32PROGRAM_PREFIX=@program_prefix@ 33PROGRAM_PREFIX=@program_prefix@
33PROGRAM_SUFFIX=@program_suffix@ 34PROGRAM_SUFFIX=@program_suffix@
@@ -46,6 +47,7 @@ defaults.hh: Makefile
46 echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"'; \ 47 echo '#define DEFAULTSTYLE "$(DEFAULT_STYLE)"'; \
47 echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"'; \ 48 echo '#define DEFAULTKEYSFILE "$(DEFAULT_KEYSFILE)"'; \
48 echo '#define DEFAULT_APPSFILE "$(DEFAULT_APPSFILE)"'; \ 49 echo '#define DEFAULT_APPSFILE "$(DEFAULT_APPSFILE)"'; \
50 echo '#define DEFAULT_OVERLAY "$(DEFAULT_OVERLAY)"'; \
49 echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"'; \ 51 echo '#define DEFAULT_INITFILE "$(DEFAULT_INITFILE)"'; \
50 echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \ 52 echo '#define PROGRAM_PREFIX "$(PROGRAM_PREFIX:NONE=)"'; \
51 echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \ 53 echo '#define PROGRAM_SUFFIX "$(PROGRAM_SUFFIX:NONE=)"'; \
diff --git a/src/fluxbox.cc b/src/fluxbox.cc
index 1045430..8fcc194 100644
--- a/src/fluxbox.cc
+++ b/src/fluxbox.cc
@@ -524,14 +524,16 @@ void Fluxbox::ungrab() {
524void Fluxbox::setupConfigFiles() { 524void Fluxbox::setupConfigFiles() {
525 525
526 bool create_init = false, create_keys = false, create_menu = false, 526 bool create_init = false, create_keys = false, create_menu = false,
527 create_apps = false; 527 create_apps = false, create_overlay = false;
528 528
529 string dirname = getenv("HOME") + string("/.") + m_RC_PATH + "/"; 529 string dirname = getenv("HOME") + string("/.") + m_RC_PATH + "/";
530 string init_file, keys_file, menu_file, slitlist_file, apps_file; 530 string init_file, keys_file, menu_file, slitlist_file, apps_file,
531 overlay_file;
531 init_file = dirname + m_RC_INIT_FILE; 532 init_file = dirname + m_RC_INIT_FILE;
532 keys_file = dirname + "keys"; 533 keys_file = dirname + "keys";
533 menu_file = dirname + "menu"; 534 menu_file = dirname + "menu";
534 apps_file = dirname + "apps"; 535 apps_file = dirname + "apps";
536 overlay_file = dirname + "overlay";
535 537
536 struct stat buf; 538 struct stat buf;
537 539
@@ -547,6 +549,8 @@ void Fluxbox::setupConfigFiles() {
547 create_menu = true; 549 create_menu = true;
548 if (stat(apps_file.c_str(), &buf)) 550 if (stat(apps_file.c_str(), &buf))
549 create_apps = true; 551 create_apps = true;
552 if (stat(overlay_file.c_str(), &buf))
553 create_overlay = true;
550 554
551 } else { 555 } else {
552#ifdef DEBUG 556#ifdef DEBUG
@@ -580,6 +584,10 @@ void Fluxbox::setupConfigFiles() {
580 if (create_apps) 584 if (create_apps)
581 FbTk::FileUtil::copyFile(DEFAULT_APPSFILE, apps_file.c_str()); 585 FbTk::FileUtil::copyFile(DEFAULT_APPSFILE, apps_file.c_str());
582 586
587 // copy overlay file
588 if (create_overlay)
589 FbTk::FileUtil::copyFile(DEFAULT_OVERLAY, overlay_file.c_str());
590
583 // copy init file 591 // copy init file
584 if (create_init) 592 if (create_init)
585 FbTk::FileUtil::copyFile(DEFAULT_INITFILE, init_file.c_str()); 593 FbTk::FileUtil::copyFile(DEFAULT_INITFILE, init_file.c_str());
diff --git a/util/startfluxbox.in b/util/startfluxbox.in
index ee37675..bf06ec9 100755
--- a/util/startfluxbox.in
+++ b/util/startfluxbox.in
@@ -37,17 +37,14 @@ else
37# 37#
38# Lines starting with a '#' are ignored. 38# Lines starting with a '#' are ignored.
39 39
40# You can set your favourite wallpaper here if you don't want
41# to do it from your style.
42#
43# fbsetbg -f $HOME/pictures/wallpaper.png
44#
45# This sets a black background 40# This sets a black background
46 41
47@pkgbindir@/@pkgprefix@fbsetroot@pkgsuffix@ -solid black 42@pkgprefix@fbsetroot@pkgsuffix@ -solid black
48 43
49# This shows the fluxbox-splash-screen 44# You can set your favourite wallpaper here. You will also need to uncomment the
50# @pkgprefix@fbsetbg@pkgsuffix@ -C @pkgdatadir@/splash.jpg 45# line in $HOME/.@pkgprefix@fluxbox@pkgsuffix@/overlay or else your style will override it.
46#
47# @pkgprefix@fbsetbg@pkgsuffix@ -f $HOME/.@pkgprefix@fluxbox@pkgsuffix@/backgrounds/wallpaper.png
51 48
52# Other examples. Check man xset for details. 49# Other examples. Check man xset for details.
53# 50#
@@ -60,9 +57,6 @@ else
60# Your own fonts-dir: 57# Your own fonts-dir:
61# xset +fp "$HOME/.fonts" 58# xset +fp "$HOME/.fonts"
62# 59#
63# Your favourite mouse cursor:
64# xsetroot -cursor_name right_ptr
65#
66# Change your keymap: 60# Change your keymap:
67# xmodmap "$HOME/.Xmodmap" 61# xmodmap "$HOME/.Xmodmap"
68 62