Update to 0.9.8. Changes since 0.9.4:

News in 0.9.8:

- Transparent toolbar
- Bug Fixes:
  Fixed image cache problem (the memory bug)
  Fixed color parsing bug
  Fixed iconbar bug in "All Windows" mode
  Fixed border bug with left/right alignment in iconbar
  Fixed a loop issue in fluxbox-generate_menu

News in 0.9.7:

- Two new pixmap styles:
  Emerge from Nuno Alexandre
  BlueFlux from Lauri Hakkarainen
- Added menu delay/click to open or close sub menus
- Added alignment for buttons in icon bar
  Change Left, Relative or Right via the iconbar mode menu
- New menu item [separator] This will create a nice separator line
- New theme items:
  window.label.active: <texture>
  window.label.active.textColor: <color>
- New actions:
  ReloadStyle
  CommandDialog - this will show a dialog in which you can issue fluxbox
  commands
  WorkspaceNameDialog - edit workspaces name dialog (old SetWorkspaceName)
  SetWorkspaceName <name>
  SetResourceValueDialog - shows a dialog where you can type the resource name
  and it's value
  SetResourceValueCmd <resourcename> <resource value>
  BindKey <key string> :<action> - this will append key string and action to
  your keys file and bind the key
- Window menu accessible in workspaces client menu
- Shadow options for fonts.
- Enabled/Disable toolbar menu item ("Visible" menu item)
- Toggle images in iconbar
- Edit clock format dialog
- Send to menu is back
- Changed Maximize menu item in Window menu to a multi button item
- Added resource session.useMod1 <boolean> to disable/enable mod1 for
  Resize/Move window with mod1 + button
- Bug fixes:
  Fixed slit and toolbar autohide bug
  Fixed image cache bug
  Fixed some icc warnings
  Fixed mozilla focus issue
  Fixed crash bug when adding new workspaces
  Fixed menu draw bug in empty sub menus

News in 0.9.6:

- Adding image search paths when loading a style
  It now looks for pixmaps in <stylebase> and <stylebase>/pixmaps and in
  file <stylesdir>/<stylename>/theme.cfg
  for this, stylebase is the style directory
  pixmap styles should use the new format for portability
- Added startup script to be used with startfluxbox, to get a consistent
  frontend for both dm and startx and your fluxbox-session
- Added "!" as a comment line for keys file
- Added new actions
- Improved menu speed
- Added -verbose argument to fluxbox - This will enable theme warnings
- Configurable tools in toolbar
- New theme items for toolbar
- Support for _NET_WM_STATE_FULLSCREEN
- Nearest-quadrant resizing
- Improvements/Updates to fbsetbg and fluxbox-generate_menu
- Bug fixes:
  Fixed some issues with mplayer in fullscreen
  Fixed java bug with missing drawing bits of window
  Fixed building with --disable-slit
  Fixed NLS bad message errors by adding explicit codeset entries
  Fixed disappearing close button
  Fixed numlock and scrlock bug in FbTk TextBox
  Fixed pixmap bug when changing between non-pixmap themes and pixmap themes
  Fixed empty window bug in SystemTray
  Fixed toolbar height bug crash

News in 0.9.5:

- New theme items:
- New actions: resizevertical resizehorizontal setworkspacename movetableft
  movetabright
- Set workspace name tool
- Search path resource for images session.screen.imageSearchPath
  This is a list separated by , or space
- New height resource for toolbar
- session.screen.toolbar.height This will override the style's font height
- Support for system tray _NET_SYSTEM_TRAY Applications that support this
  will show their icon in the toolbar next to the clock.
- New texture type: Tiled This will just affect pixmap loaded from file,
  and it will not scale them.
- Improved iconbar
- Bug fixes:
  Fixed Transparency bug in menus
  Fixed so shaped windows like xmms wont get round corners
  Fixed shape bug when switching between shaped themes and non shaped
  Fixed kde dockapp bug
  FbRun works properly on multiple screens
  Fixed pesky crash and phantom icons
  Fixed aspects of focus and raising, including transients
  Fixed java bug, slow windows
  Fixed 8 bpp crash

6 files changed, 109 insertions, 57 deletions

diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index d71d2315094..f8123a83522 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.13 2003/08/08 11:12:31 hubertf Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/29 16:58:03 jmmv Exp $
 #
 
-DISTNAME=	fluxbox-0.9.4
+DISTNAME=	fluxbox-0.9.8
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST
index a6d97711033..69ff2c71320 100644
--- a/wm/fluxbox/PLIST
+++ b/wm/fluxbox/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.5 2003/07/28 17:50:10 hubertf Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/01/29 16:58:03 jmmv Exp $
 bin/fbrun
 bin/fbsetbg
 bin/fluxbox
 bin/fluxbox-generate_menu
+bin/startfluxbox
 man/man1/fluxbox.1
 share/fluxbox/init
 share/fluxbox/keys
@@ -24,18 +25,58 @@ share/fluxbox/nls/it_IT/fluxbox.cat
 share/fluxbox/nls/ja_JP/fluxbox.cat
 share/fluxbox/nls/lv
 share/fluxbox/nls/lv_LV/fluxbox.cat
+share/fluxbox/nls/nl_NL/fluxbox.cat
 share/fluxbox/nls/pt_BR/fluxbox.cat
 share/fluxbox/nls/pt_PT/fluxbox.cat
 share/fluxbox/nls/ru_RU/fluxbox.cat
 share/fluxbox/nls/sv_SE/fluxbox.cat
 share/fluxbox/nls/tr_TR/fluxbox.cat
 share/fluxbox/styles/Artwiz
-share/fluxbox/styles/Blue
+share/fluxbox/styles/BlueFlux/pixmaps/button_close_active.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/button_close_pressed.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/button_close_unfocus.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/button_max_active.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/button_max_pressed.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/button_max_unfocus.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/button_min_active.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/button_min_pressed.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/button_min_unfocus.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/button_stick_active.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/button_stick_pressed.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/button_stick_unfocus.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/button_stuck.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/button_stuck_unfocus.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/button_toolbar.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/button_toolbar_pressed.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/menu_frame.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/title_bar.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/title_bar_unfocus.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/toolbar.xpm
+share/fluxbox/styles/BlueFlux/pixmaps/toolbar_label.xpm
+share/fluxbox/styles/BlueFlux/theme.cfg
 share/fluxbox/styles/BlueNight
 share/fluxbox/styles/Carbondioxide
 share/fluxbox/styles/Clean
-share/fluxbox/styles/CleanColor
 share/fluxbox/styles/Cthulhain
+share/fluxbox/styles/Emerge/pixmaps/bullet.xpm
+share/fluxbox/styles/Emerge/pixmaps/close-pressed.xpm
+share/fluxbox/styles/Emerge/pixmaps/close-unfocus.xpm
+share/fluxbox/styles/Emerge/pixmaps/close.xpm
+share/fluxbox/styles/Emerge/pixmaps/icon-pressed.xpm
+share/fluxbox/styles/Emerge/pixmaps/icon-unfocus.xpm
+share/fluxbox/styles/Emerge/pixmaps/icon.xpm
+share/fluxbox/styles/Emerge/pixmaps/max-pressed.xpm
+share/fluxbox/styles/Emerge/pixmaps/max-unfocus.xpm
+share/fluxbox/styles/Emerge/pixmaps/max.xpm
+share/fluxbox/styles/Emerge/pixmaps/selected.xpm
+share/fluxbox/styles/Emerge/pixmaps/stick-pressed.xpm
+share/fluxbox/styles/Emerge/pixmaps/stick-unfocus.xpm
+share/fluxbox/styles/Emerge/pixmaps/stick.xpm
+share/fluxbox/styles/Emerge/pixmaps/stuck-pressed.xpm
+share/fluxbox/styles/Emerge/pixmaps/stuck-unfocus.xpm
+share/fluxbox/styles/Emerge/pixmaps/stuck.xpm
+share/fluxbox/styles/Emerge/pixmaps/unselected.xpm
+share/fluxbox/styles/Emerge/theme.cfg
 share/fluxbox/styles/Flux
 share/fluxbox/styles/LemonSpace
 share/fluxbox/styles/Makro
@@ -46,18 +87,22 @@ share/fluxbox/styles/Nyz
 share/fluxbox/styles/Operation
 share/fluxbox/styles/Outcomes
 share/fluxbox/styles/Rampage
-share/fluxbox/styles/Rancor
 share/fluxbox/styles/Results
 share/fluxbox/styles/Shade
 share/fluxbox/styles/Spiff
 share/fluxbox/styles/Twice
 share/fluxbox/styles/qnx-photon
+@dirrm share/fluxbox/styles/Emerge/pixmaps
+@dirrm share/fluxbox/styles/Emerge
+@dirrm share/fluxbox/styles/BlueFlux/pixmaps
+@dirrm share/fluxbox/styles/BlueFlux
 @dirrm share/fluxbox/styles
 @dirrm share/fluxbox/nls/tr_TR
 @dirrm share/fluxbox/nls/sv_SE
 @dirrm share/fluxbox/nls/ru_RU
 @dirrm share/fluxbox/nls/pt_PT
 @dirrm share/fluxbox/nls/pt_BR
+@dirrm share/fluxbox/nls/nl_NL
 @dirrm share/fluxbox/nls/lv_LV
 @dirrm share/fluxbox/nls/ja_JP
 @dirrm share/fluxbox/nls/it_IT
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
index 4f487eb093a..db0f7bad542 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.9 2003/08/14 14:17:39 jschauma Exp $
+$NetBSD: distinfo,v 1.10 2004/01/29 16:58:03 jmmv Exp $
 
-SHA1 (fluxbox-0.9.4.tar.bz2) = b0b5c9f8befc6e2014fed61bb09262ecae0b8b58
-Size (fluxbox-0.9.4.tar.bz2) = 442182 bytes
+SHA1 (fluxbox-0.9.8.tar.bz2) = 77368a2a64cc6e4e09e77711d8799dd154f29f8c
+Size (fluxbox-0.9.8.tar.bz2) = 506099 bytes
 SHA1 (patch-aa) = 3d28a16dc3131b0b723f9c5a0ed86be7d7aadd31
-SHA1 (patch-ab) = 296fe52f6215612ed94a0c9279ac804e42efb06c
-SHA1 (patch-ac) = fcbf8b9978b145680a27a6e4796d8a5738a9c035
-SHA1 (patch-ad) = 9fe4a9fe549afc3f402b0b11050c69f3c9621118
+SHA1 (patch-ab) = da8f09ce7e52e8459b8e561500fec5b4c41bd96a
+SHA1 (patch-ac) = 81962d7dc7d063f5d85e1dc6d3ba801ab45b74fb
+SHA1 (patch-ad) = ea13a889a03203ce559e9d08c7c83dcc86f21cba
 SHA1 (patch-ae) = f6424828354d6118ee350ae4739a6ebeb0db5bdb
diff --git a/wm/fluxbox/patches/patch-ab b/wm/fluxbox/patches/patch-ab
index 2014c1f7c4d..2aadebafa18 100644
--- a/wm/fluxbox/patches/patch-ab
+++ b/wm/fluxbox/patches/patch-ab
@@ -1,23 +1,23 @@
-$NetBSD: patch-ab,v 1.7 2003/07/28 17:50:11 hubertf Exp $
+$NetBSD: patch-ab,v 1.8 2004/01/29 16:58:03 jmmv Exp $
 
---- util/Makefile.in.orig	Thu Jul 10 18:03:35 2003
+--- util/Makefile.in.orig	2004-01-15 13:22:41.000000000 +0100
 +++ util/Makefile.in
-@@ -95,10 +95,10 @@
+@@ -95,10 +95,10 @@ regex_cmd = @regex_cmd@
  SUBDIRS = fbrun
  INCLUDES = -I../src/FbTk/
- bin_SCRIPTS = fbsetbg fluxbox-generate_menu
+ bin_SCRIPTS = fbsetbg fluxbox-generate_menu startfluxbox
 -bin_PROGRAMS = bsetroot
 -bsetroot_SOURCES = bsetroot.cc bsetroot.hh
--bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o ../src/FbAtoms.o \
--	../src/FbTk/libFbTk.a
+-bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o \
+-			../src/FbAtoms.o ../src/FbTk/libFbTk.a
 +#HF#bin_PROGRAMS = bsetroot
 +#HF#bsetroot_SOURCES = bsetroot.cc bsetroot.hh
-+#HF#bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o ../src/FbAtoms.o \
-+#HF#	../src/FbTk/libFbTk.a
++#HF#bsetroot_LDADD = ../src/FbRootWindow.o ../src/I18n.o \
++#HF#			../src/FbAtoms.o ../src/FbTk/libFbTk.a
  
  
  MAINTAINERCLEANFILES = Makefile.in
-@@ -107,14 +107,14 @@
+@@ -109,14 +109,14 @@ subdir = util
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = $(top_builddir)/config.h
  CONFIG_CLEAN_FILES =
@@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.7 2003/07/28 17:50:11 hubertf Exp $
  SCRIPTS = $(bin_SCRIPTS)
  
  
-@@ -124,7 +124,7 @@
+@@ -126,7 +126,7 @@ CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
  depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -47,7 +47,7 @@ $NetBSD: patch-ab,v 1.7 2003/07/28 17:50:11 hubertf Exp $
  CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
  	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
  LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) \
-@@ -142,7 +142,7 @@
+@@ -144,7 +144,7 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(
  CCLD = $(CC)
  LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
  	$(AM_LDFLAGS) $(LDFLAGS) -o $@
@@ -56,7 +56,7 @@ $NetBSD: patch-ab,v 1.7 2003/07/28 17:50:11 hubertf Exp $
  
  RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
  	uninstall-info-recursive all-recursive install-data-recursive \
-@@ -150,7 +150,7 @@
+@@ -152,7 +152,7 @@ RECURSIVE_TARGETS = info-recursive dvi-r
  	uninstall-recursive check-recursive installcheck-recursive
  DIST_COMMON = Makefile.am Makefile.in
  DIST_SUBDIRS = $(SUBDIRS)
@@ -65,7 +65,7 @@ $NetBSD: patch-ab,v 1.7 2003/07/28 17:50:11 hubertf Exp $
  
  all: all-recursive
  
-@@ -196,9 +196,9 @@
+@@ -198,9 +198,9 @@ uninstall-binPROGRAMS:
  
  clean-binPROGRAMS:
  	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
@@ -78,7 +78,7 @@ $NetBSD: patch-ab,v 1.7 2003/07/28 17:50:11 hubertf Exp $
  install-binSCRIPTS: $(bin_SCRIPTS)
  	@$(NORMAL_INSTALL)
  	$(mkinstalldirs) $(DESTDIR)$(bindir)
-@@ -227,7 +227,7 @@
+@@ -229,7 +229,7 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -87,12 +87,14 @@ $NetBSD: patch-ab,v 1.7 2003/07/28 17:50:11 hubertf Exp $
  
  distclean-depend:
  	-rm -rf $(DEPDIR)
-@@ -473,7 +473,7 @@
- distclean-local:
- 	rm -f *\~ Makefile.in
+@@ -477,8 +477,8 @@ all-local:	startfluxbox
+ clean-local:
+ 		rm -f startfluxbox fluxbox-generate_menu
  
--bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/FbRootWindow.hh ../src/FbAtoms.hh
-+#HF#bsetroot.o: bsetroot.cc ../config.h bsetroot.hh ../src/FbRootWindow.hh ../src/FbAtoms.hh
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
+-bsetroot.o: 	bsetroot.cc ../config.h bsetroot.hh \
+-			../src/FbRootWindow.hh ../src/FbAtoms.hh
++#HF#bsetroot.o: 	bsetroot.cc ../config.h bsetroot.hh \
++#HF#			../src/FbRootWindow.hh ../src/FbAtoms.hh
+ 
+ startfluxbox: 	startfluxbox.in
+ 		@regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir),g" \
diff --git a/wm/fluxbox/patches/patch-ac b/wm/fluxbox/patches/patch-ac
index e089cb7a765..6872d6cf368 100644
--- a/wm/fluxbox/patches/patch-ac
+++ b/wm/fluxbox/patches/patch-ac
@@ -1,17 +1,20 @@
-$NetBSD: patch-ac,v 1.4 2003/07/28 17:50:12 hubertf Exp $
+$NetBSD: patch-ac,v 1.5 2004/01/29 16:58:03 jmmv Exp $
 
---- src/fluxbox.cc.orig	Thu Jul 10 14:00:49 2003
+--- src/fluxbox.cc.orig	2004-01-13 15:31:15.000000000 +0100
 +++ src/fluxbox.cc
-@@ -629,7 +629,11 @@
+@@ -668,11 +668,11 @@ void Fluxbox::setupConfigFiles() {
  
      bool create_init = false, create_keys = false, create_menu = false;
  
--    string dirname = getenv("HOME")+string("/.")+string(m_RC_PATH) + "/";
-+    string dirname = getenv("HOME")+string("/.")+string(m_RC_PATH)
-+#if 0
-+                                                                  + "/" 
-+#endif
-+                                                                       ;
+-    string dirname = getenv("HOME") + string("/.") + string(m_RC_PATH) + "/";
++    string dirname = getenv("HOME") + string("/.") + string(m_RC_PATH);
      string init_file, keys_file, menu_file, slitlist_file;
-     init_file = dirname + m_RC_INIT_FILE;
-     keys_file = dirname + "keys";
+-    init_file = dirname + m_RC_INIT_FILE;
+-    keys_file = dirname + "keys";
+-    menu_file = dirname + "menu";
++    init_file = dirname + "/" + m_RC_INIT_FILE;
++    keys_file = dirname + "/" + "keys";
++    menu_file = dirname + "/" + "menu";
+ 
+     struct stat buf;
+ 
diff --git a/wm/fluxbox/patches/patch-ad b/wm/fluxbox/patches/patch-ad
index b6974dfb07d..afca89f032b 100644
--- a/wm/fluxbox/patches/patch-ad
+++ b/wm/fluxbox/patches/patch-ad
@@ -1,13 +1,15 @@
-$NetBSD: patch-ad,v 1.1 2003/07/28 17:50:12 hubertf Exp $
+$NetBSD: patch-ad,v 1.2 2004/01/29 16:58:03 jmmv Exp $
 
---- util/fluxbox-generate_menu.orig	2003-07-28 01:53:14.000000000 +0200
-+++ util/fluxbox-generate_menu	2003-07-28 01:54:11.000000000 +0200
-@@ -101,7 +101,7 @@
- 
- # ugly code for solaris compat.
- case $(uname) in
--    Linux|*BSD)
-+    Linux)
-         find_it() {
-             which $1 > /dev/null 2>&1 && shift && $*
-             }
+--- util/startfluxbox.in.orig	2003-12-06 17:29:21.000000000 +0100
++++ util/startfluxbox.in
+@@ -6,7 +6,9 @@ elif [ -r ~/.fluxbox/startup ]; then
+     exec sh ~/.fluxbox/startup
+ else
+     if [ ! -d ~/.fluxbox ]; then
+-	mkdir -p ~/.fluxbox/{backgrounds,styles,pixmaps}
++	mkdir -p ~/.fluxbox/backgrounds
++	mkdir -p ~/.fluxbox/styles
++	mkdir -p ~/.fluxbox/pixmaps
+     fi
+     if [ ! -r ~/.fluxbox/startup ]; then
+         cat << EOF > ~/.fluxbox/startup