10 files changed, 303 insertions, 31 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index c586c77..62075f2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -3,14 +3,13 @@
 SUBDIRS = styles
 CLEANFILES = menu menu.in menu.pre init
 MAINTAINERCLEANFILES = Makefile.in
-pkgdata_DATA = titlebar keys menu init
-EXTRA_DIST= titlebar keys init.in generate_menu README.style README.menu README
+pkgdata_DATA = keys menu init
+EXTRA_DIST= keys init.in README.style README.menu README
 all-local: menu init
 distclean-local:
         rm -f *\~
 init: init.in
-        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," init.in > init
-menu: generate_menu
-        ./generate_menu
-        @regex_cmd@ -e "s,\@VERSION\@,$(VERSION)," menu.in > menu.pre
-        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," menu.pre > menu
+        @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" init.in > init
+
+menu: ../util/fluxbox-generate_menu
+        ../util/fluxbox-generate_menu -o menu -p ${prefix}/share -m "Fluxbox-${VERSION}"
diff --git a/data/init.in b/data/init.in
index 4c79945..62d450e 100644
--- a/data/init.in
+++ b/data/init.in
@@ -10,7 +10,7 @@ session.screen0.toolbar.autoHide:	False
 session.screen0.toolbar.placement:      BottomCenter
 session.screen0.toolbar.widthPercent:   66
 session.screen0.workspaceNames: one,two,three,four
-session.screen0.strftimeFormat: %I:%M %p
+session.screen0.strftimeFormat: %k:%M
 session.screen0.focusNewWindows:        True
 session.screen0.focusModel:     ClickToFocus
 session.screen0.fullMaximization:       False
@@ -20,17 +20,20 @@ session.screen0.workspaces:	4
 session.screen0.focusLastWindow:        True
 session.screen0.colPlacementDirection:  TopToBottom
 session.screen0.windowPlacement:        RowSmartPlacement
+session.screen0.tab.width:      64
+session.screen0.tab.height:     16
+session.screen0.showwindowposition: true
 session.opaqueMove:     False
 session.autoRaiseDelay: 250
-session.menuFile:       @pkgdatadir@/menu
+session.menuFile:       ~/.fluxbox/menu
 session.cacheLife:      5
 session.styleFile:      @pkgdatadir@/styles/Clean
-session.titlebarFile:   @pkgdatadir@/titlebar
-session.keyFile: @pkgdatadir@/keys
+session.keyFile: ~/.fluxbox/keys
 session.colorsPerChannel:       4
 session.doubleClickInterval:    250
 session.cacheMax:       200
 session.imageDither:    True
 session.iconbar: true
-session.tab.width:      64
-session.tab.height:     16
+session.titlebar.left: Stick
+session.titlebar.right: Minimize Maximize Close
+
diff --git a/data/styles/BlueNight b/data/styles/BlueNight
new file mode 100644
index 0000000..f99837a
--- /dev/null
+++ b/data/styles/BlueNight
@@ -0,0 +1,139 @@
+style.name:     Blue Night v2
+style.author:   mack@incise.org
+style.date:     Mon Dec 31 2001
+style.credits:  
+style.comments: Modified/tweaked by skypher                     
+                
+
+rootCommand:  bsetroot -solid rgb:6A/9A/AF      
+
+! Toolbar settings...
+toolbar.button: Gradient Diagonal
+toolbar.button.color:   rgb:9B/9B/9B
+toolbar.button.colorTo: rgb:42/42/42
+toolbar.button.picColor:        black
+
+toolbar.button.pressed: Flat Gradient CrossDiagonal
+toolbar.button.pressed.color:   #60747d
+toolbar.button.pressed.colorTo: #0e1a27
+
+toolbar.label:  Flat Gradient CrossDiagonal
+toolbar.label.color:    #40545d
+toolbar.label.colorTo:  #0e1a27
+toolbar.label.textColor:        #ffffff
+
+toolbar.windowLabel:    Flat Gradient CrossDiagonal
+toolbar.windowLabel.color:      #40545d
+toolbar.windowLabel.colorTo:    #0e1a27
+toolbar.windowLabel.textColor:  #ffffff
+
+toolbar.clock:  Flat Gradient CrossDiagonal
+toolbar.clock.color:    #40545d
+toolbar.clock.colorTo:  #0e1a27
+toolbar.clock.textColor:        #ffffff
+
+toolbar:        Flat Solid CrossDiagonal
+toolbar.color:  #000000
+toolbar.textColor:      #333333
+toolbar.font:   lucidasans-10
+toolbar.justify:        Left
+
+
+! Menu settings...
+menu.frame:     Flat Gradient CrossDiagonal
+menu.frame.color:       #40545d
+menu.frame.colorTo:     #0e1a27
+menu.frame.textColor:   #ffffff
+menu.frame.font:        lucidasans-10
+menu.frame.justify:     Left
+
+menu.title:     Flat Gradient CrossDiagonal
+menu.title.color:       #80949d
+menu.title.colorTo:     #4e5a67
+menu.title.textColor:   #ffffff
+menu.title.font:        -*-lucida-bold-r-*-*-11-*-*-*-*-*-*-*
+menu.title.justify:     Left
+
+menu.hilite:    Flat Gradient CrossDiagonal
+menu.hilite.color:      #80949d
+menu.hilite.colorTo:    #4e5a67
+menu.hilite.textColor:  #ffffff
+
+menu.bullet:    Cube    
+menu.bullet.position:   Right
+menu.frame.disableColor:        #777777
+
+! Window settings...
+window.button.focus:    Gradient Diagonal
+window.button.focus.color:      rgb:9B/9B/9B
+window.button.focus.colorTo: rgb:42/42/42
+window.button.focus.picColor:  black
+
+window.button.unfocus:  Solid
+window.button.unfocus.color: rgb:42/42/42
+!window.button.unfocus.colorTo: #ffffff
+window.button.unfocus.picColor: black
+
+window.grip.focus:      Flat Solid
+window.grip.focus.color:        #60747d
+
+window.grip.unfocus:    Flat Solid
+window.grip.unfocus.color:      rgb:42/42/42
+
+window.handle.focus:    Flat Solid
+window.handle.focus.color:      #000000
+
+window.handle.unfocus:  Flat Solid
+window.handle.unfocus.color:    #000000
+
+window.label.focus:     Flat Gradient CrossDiagonal
+window.label.focus.color:       #60747d
+window.label.focus.colorTo:     #0e1a27
+window.label.focus.textColor:   #ffffff
+window.label.focus.font:        lucidasans-10
+window.label.focus.justify:     Left
+
+window.font:    lucidasans-10
+window.justify: Left
+window.label.unfocus:   Flat Gradient CrossDiagonal
+window.label.unfocus.color:     #40545d
+window.label.unfocus.colorTo:   #000a17
+window.label.unfocus.textColor: #777777
+
+window.title.focus:     Flat Solid Horizontal
+window.title.focus.color:       #000000
+window.title.focus.colorTo:     #ffffff
+
+window.title.unfocus:   Flat Solid Horizontal
+window.title.unfocus.color:     #000000
+window.title.unfocus.colorTo:   #ffffff
+
+window.button.pressed:  Flat Gradient CrossDiagonal
+window.button.pressed.color:    #60747d
+window.button.pressed.colorTo:  #0e1a27
+
+window.frame.focusColor:        #000000
+window.frame.unfocusColor:      #000000
+
+! ----------- tab - explicit for fluxbox, the best wm out there[tm] (;
+window.tab.justify:                 Left
+
+window.tab.label.focus:       Flat Solid
+window.tab.label.focus.color:    #60747d
+window.tab.label.focus.textColor:  white
+
+window.tab.label.unfocus:           Sunken Solid
+window.tab.label.unfocus.color:   #40545d
+window.tab.label.unfocus.textColor: rgb:90/90/90
+
+window.tab.borderWidth: 1
+window.tab.borderColor: black
+
+window.tab.font: lucidasans-10
+! ---------------
+
+handleWidth:    3
+frameWidth:     0
+bevelWidth:     1
+borderWidth:    1
+borderColor:    #000000
diff --git a/data/styles/Clean b/data/styles/Clean
index d9f7f7d..4395d8c 100644
--- a/data/styles/Clean
+++ b/data/styles/Clean
@@ -99,14 +99,14 @@ window.tab.label.focus.textColor:	black
 window.tab.borderWidth: 1
 window.tab.borderColor: rgb:10/10/10
 ! ----------- (fluxbox.sourceforge.net)
-window.tab.font:                       -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-1
+window.tab.font:                       -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-*
 
 window.justify:                 Right
 
-toolbar.font: -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-1
-window.font: -misc-8x8\ system\ font-medium-r-normal--9-90-100-100-m-100-iso8859-1
-menu.title.font:  -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-1
-menu.frame.font:                -*-lucida-medium-r-normal-*-10-100-*-*-*-*-iso8859-1
+toolbar.font: -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-*
+window.font: -misc-8x8\ system\ font-medium-r-normal--9-90-100-100-m-100-iso8859-*
+menu.title.font:  -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-*
+menu.frame.font:                -*-lucida-medium-r-normal-*-10-100-*-*-*-*-iso8859-*
 
 borderColor:                    rgb:10/10/10
 
diff --git a/data/styles/CleanColor b/data/styles/CleanColor
index 7fd1513..07204f1 100644
--- a/data/styles/CleanColor
+++ b/data/styles/CleanColor
@@ -102,14 +102,14 @@ window.tab.label.focus.textColor:	rgb:10/10/10
 window.tab.borderWidth: 1
 window.tab.borderColor: rgb:10/10/10
 ! ----------- (fluxbox.sourceforge.net)
-window.tab.font:                       -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-1
+window.tab.font:                       -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-*
 
 window.justify:                 Right
 
-toolbar.font:                   -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-1
-window.font: -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-1
-menu.title.font:  -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-1
-menu.frame.font:                -*-lucida-medium-r-normal-*-10-100-*-*-*-*-iso8859-1
+toolbar.font:                   -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-*
+window.font: -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-*
+menu.title.font:  -*-lucidatypewriter-medium-r-normal-*-10-100-75-75-m-60-iso8859-*
+menu.frame.font:                -*-lucida-medium-r-normal-*-10-100-*-*-*-*-iso8859-*
 
 borderColor:                    rgb:10/10/10
 
diff --git a/data/styles/LemonSpace b/data/styles/LemonSpace
new file mode 100644
index 0000000..7f4ce3c
--- /dev/null
+++ b/data/styles/LemonSpace
@@ -0,0 +1,129 @@
+! LemonSpace was made by xlife@zuavra.net.
+! The official home of the theme is this:
+! http://xlife.zuavra.net/blackbox/styles/
+! If you make other themes inspired or
+! derived from this one please send them
+! to me so I can enjoy them as well.
+! You need the Snap font from the Artwiz
+! pack for this, see the site for details.
+
+toolbar:                        raised gradient vertical
+!toolbar.color:                 rgb:e3/cd/a6
+toolbar.color:  rgb:cb/ac/73
+toolbar.colorTo:        rgb:40/40/40
+
+toolbar.button:                 raised gradient vertical
+toolbar.button.picColor:        rgb:1a/04/08
+toolbar.button.color:           rgb:dd/dd/d
+toolbar.button.colorTo:         rgb:c0/c0/c0
+toolbar.button.pressed:         sunken gradient vertical
+toolbar.button.pressed.color:   rgb:dd/dd/dd
+toolbar.button.pressed.colorTo: rgb:c0/c0/c0
+
+toolbar.label:                  raised gradient vertical
+toolbar.label.color:            rgb:f6/df/93
+toolbar.label.colorTo:          rgb:ee/b9/6b
+toolbar.label.textColor:        rgb:1a/04/08
+
+toolbar.windowLabel:            raised gradient vertical
+toolbar.windowLabel.color:      rgb:f6/df/93
+toolbar.windowLabel.colorTo:    rgb:ee/b9/6b
+toolbar.windowLabel.textColor:  rgb:1a/04/08
+
+toolbar.clock:                  raised gradient vertical
+toolbar.clock.color:            rgb:f6/df/93
+toolbar.clock.colorTo:          rgb:ee/b9/6b
+toolbar.clock.textColor:        rgb:1a/04/08
+
+toolbar.justify:                Center
+
+menu.title:                     raised gradient vertical
+menu.title.color:               rgb:f6/df/93
+menu.title.colorTo:             rgb:ee/b9/6b
+menu.title.textColor:           rgb:0/0/0
+menu.title.justify:             center
+
+menu.frame:                     raised gradient vertical
+menu.frame.color:               rgb:dd/dd/dd
+menu.frame.colorTo:             rgb:c0/c0/c0
+menu.frame.textColor:           rgb:0/0/0
+menu.frame.justify:             left
+
+menu.hilite:                    flat solid
+menu.hilite.textColor:          rgb:f/f/f
+menu.hilite.color:              rgb:30/30/30
+
+menu.bullet:                    triangle
+menu.bullet.position:           right
+
+!window.title.focus:            flat solid
+!window.title.focus.color:      rgb:e3/cd/a6
+
+window.title.focus:             raised gradient vertical
+window.title.focus.color:       rgb:cb/ac/73
+window.title.focus.colorTo:     rgb:40/40/40
+window.title.unfocus:           raised gradient vertical
+window.title.unfocus.color:     rgb:b0/b0/b0
+window.title.unfocus.colorTo:   rgb:50/50/50
+
+window.label.focus:             raised gradient vertical
+window.label.focus.color:       rgb:f6/df/93
+window.label.focus.colorTo:     rgb:ee/b9/6b
+window.label.focus.textColor:   rgb:1a/04/08
+window.label.unfocus:           raised gradient vertical
+window.label.unfocus.color:     rgb:dd/dd/dd
+window.label.unfocus.colorTo:   rgb:c0/c0/c0
+window.label.unfocus.textColor: rgb:5a/5a/5a
+
+window.handle.focus:            raised gradient vertical
+window.handle.focus.color:      rgb:cc/cc/cc
+window.handle.focus.colorTo:    rgb:d0/d0/d0
+window.handle.unfocus:          raised gradient vertical
+window.handle.unfocus.color:    rgb:d0/d0/d0
+window.handle.unfocus.colorTo:  rgb:cc/cc/cc
+
+window.grip.focus:              raised gradient vertical
+window.grip.focus.color:        rgb:f6/df/93
+window.grip.focus.colorTo:      rgb:ee/b9/6b
+window.grip.unfocus:            raised gradient vertical
+window.grip.unfocus.color:      rgb:dd/dd/dd
+window.grip.unfocus.colorTo:    rgb:c0/c0/c0
+
+window.button.focus:            raised gradient vertical
+window.button.focus.color:      rgb:dd/dd/dd
+window.button.focus.colorTo:    rgb:c0/c0/c0
+!window.button.focus.color:     rgb:f6/df/93
+!window.button.focus.colorTo:   rgb:ee/b9/6b
+window.button.focus.picColor:   rgb:0/0/0
+window.button.unfocus:          raised gradient vertical
+window.button.unfocus.color:    rgb:dd/dd/dd
+window.button.unfocus.colorTo:  rgb:c0/c0/c0
+window.button.unfocus.picColor: rgb:0/0/0
+
+window.button.pressed:          sunken gradient diagonal
+window.button.pressed.color:    rgb:f6/df/93
+window.button.pressed.colorTo:  rgb:ee/b9/6b
+
+window.frame.focusColor:        rgb:e3/cd/a6
+window.frame.unfocusColor:      rgb:6/6/6
+
+window.justify:                 center
+
+borderColor:                    rgb:0/0/0
+
+borderWidth:                    1
+bevelWidth:                     1
+handleWidth:                    4
+
+*font:              gelly2
+menu*font:              glisp
+toolbar*font:           glisp
+
+*textColor:             rgb:c/c/c
+! - for fluxbox
+window.tab.label.unfocus.textColor: rgb:5a/5a/5a
+window.tab.label.focus.textColor: rgb:1a/04/08
+! -
+
+rootCommand: bsetroot -solid rgb:db/bc/83
+
diff --git a/data/styles/Makefile.am b/data/styles/Makefile.am
index 61ae0e0..62d8e44 100644
--- a/data/styles/Makefile.am
+++ b/data/styles/Makefile.am
@@ -3,7 +3,9 @@
 styledir = $(pkgdatadir)/styles
 MAINTAINERCLEANFILES = Makefile.in
 
-style_DATA = Makro MerleyKay Clean CleanColor Artwiz Cthulhain Flux Minimal Nyz Operation Outcomes Rampage Rancor Results Shade Spiff TDF Twice Blue Carbondioxide qnx-photon
+style_DATA = Makro MerleyKay Clean CleanColor Artwiz Cthulhain Flux Minimal \
+        Nyz Operation Outcomes Rampage Rancor Results Shade Spiff LemonSpace \
+        Twice Blue Carbondioxide qnx-photon BlueNight
 EXTRA_DIST=$(style_DATA)
 
 uninstall-local:
diff --git a/data/styles/Makro b/data/styles/Makro
index 4cdcf0d..ca640d9 100644
--- a/data/styles/Makro
+++ b/data/styles/Makro
@@ -98,14 +98,14 @@ window.tab.label.focus.textColor:	rgb:40/20/05
 window.tab.borderWidth: 1
 window.tab.borderColor: rgb:10/10/10
 ! ----------- (fluxbox.sourceforge.net)
-window.tab.font:                       -*-helvetica-medium-r-*-*-11-*-*-*-*-*-iso8859-1
+window.tab.font:                       -*-helvetica-medium-r-*-*-11-*-*-*-*-*-iso8859-*
 
 window.justify:                 Left
 
-toolbar.font:                   -*-helvetica-medium-r-*-*-11-*-*-*-*-*-iso8859-1
-window.font: -*-helvetica-bold-r-*-*-11-*-*-*-*-*-iso8859-1
-menu.title.font:  -*-helvetica-bold-r-*-*-11-*-*-*-*-*-iso8859-1
-menu.frame.font:                -*-helvetica-medium-r-*-*-10-*-*-*-*-*-iso8859-1
+toolbar.font:                   -*-helvetica-medium-r-*-*-11-*-*-*-*-*-iso8859-*
+window.font: -*-helvetica-bold-r-*-*-11-*-*-*-*-*-iso8859-*
+menu.title.font:  -*-helvetica-bold-r-*-*-11-*-*-*-*-*-iso8859-*
+menu.frame.font:                -*-helvetica-medium-r-*-*-10-*-*-*-*-*-iso8859-*
 
 borderColor:                    rgb:10/10/10
 
diff --git a/data/styles/MerleyKay b/data/styles/MerleyKay
index 2c5a22d..bbc0c02 100644
--- a/data/styles/MerleyKay
+++ b/data/styles/MerleyKay
@@ -120,7 +120,7 @@ window.justify:			Center
 
 window.tab.font:                        -*-clean-medium-r-*-*-12-*-*-*-*-60-iso8859-*
 toolbar.font:                   -*-lucida-bold-r-*-*-*-100-*-*-*-*-*-*
-window.font: -*-helvetica-medium-r-normal-*-12-*-*-*-*-*-iso8859-1
+window.font: -*-helvetica-medium-r-normal-*-12-*-*-*-*-*-iso8859-*
 #menu.title.font:                -*-lucida-bold-r-*-*-*-100-*-*-*-*-*-*
 menu.title.font:  -*-lucida-bold-r-*-*-*-100-*-*-*-*-*-*
 menu.frame.font:                -*-lucida-medium-r-*-*-*-100-*-*-*-*-*-*
diff --git a/data/styles/Rampage b/data/styles/Rampage
index 056aea7..e93e314 100644
--- a/data/styles/Rampage
+++ b/data/styles/Rampage
@@ -96,7 +96,7 @@ borderWidth:			1
 bevelWidth:                     2
 handleWidth:                    5
 
-*font:                  -b&h-lucida-medium-r-normal-*-*-100-*-*-p-*-iso8859-1
+*font:                  -b&h-lucida-medium-r-normal-*-*-100-*-*-p-*-iso8859-*
 *textColor:             black
 
 rootCommand:    bsetroot -mod 16 8 -bg rgb:0/8/8 -fg rgb:0/9/9