Update fluxbox to current version, 1.3.2. Tested on MirBSD and NetBSD.

Full ChangeLog is at http://git.fluxbox.org/fluxbox.git/tree/ChangeLog, the
changes are too numerous to give here.

14 files changed, 77 insertions, 165 deletions

diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index b10b2da7fbb..b7e978ef50f 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.55 2012/04/17 17:13:01 bsiegert Exp $
+# $NetBSD: Makefile,v 1.56 2012/04/17 20:08:06 bsiegert Exp $
 #
 
-DISTNAME=	fluxbox-1.1.1
-PKGREVISION=	9
+DISTNAME=	fluxbox-1.3.2
 CATEGORIES=	wm x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=fluxbox/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/wm/fluxbox/PLIST b/wm/fluxbox/PLIST
index 26973444dc4..d39c5ac9bf6 100644
--- a/wm/fluxbox/PLIST
+++ b/wm/fluxbox/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2012/04/17 17:13:01 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.21 2012/04/17 20:08:06 bsiegert Exp $
 bin/fbrun
 bin/fbsetbg
 bin/fbsetroot
@@ -10,17 +10,18 @@ bin/startfluxbox
 man/man1/fbrun.1
 man/man1/fbsetbg.1
 man/man1/fbsetroot.1
-man/man1/fluxbox.1
 man/man1/fluxbox-remote.1
-man/man1/fluxstyle.1
+man/man1/fluxbox.1
 man/man1/startfluxbox.1
+man/man5/fluxbox-apps.5
 man/man5/fluxbox-keys.5
+man/man5/fluxbox-menu.5
+man/man5/fluxbox-style.5
 share/fluxbox/apps
 share/fluxbox/init
 share/fluxbox/keys
 share/fluxbox/menu
 share/fluxbox/overlay
-share/fluxbox/windowmenu
 ${PLIST.nls}share/fluxbox/nls/C/fluxbox.cat
 ${PLIST.nls}share/fluxbox/nls/be_BY.CP1251/fluxbox.cat
 ${PLIST.nls}share/fluxbox/nls/be_BY.UTF-8/fluxbox.cat
@@ -219,3 +220,4 @@ share/fluxbox/styles/qnx-photon
 share/fluxbox/styles/zimek_bisque/theme.cfg
 share/fluxbox/styles/zimek_darkblue/theme.cfg
 share/fluxbox/styles/zimek_green/theme.cfg
+share/fluxbox/windowmenu
diff --git a/wm/fluxbox/distinfo b/wm/fluxbox/distinfo
index 4250d38dffd..05af576cb0f 100644
--- a/wm/fluxbox/distinfo
+++ b/wm/fluxbox/distinfo
@@ -1,18 +1,15 @@
-$NetBSD: distinfo,v 1.29 2012/04/17 17:51:38 joerg Exp $
+$NetBSD: distinfo,v 1.30 2012/04/17 20:08:06 bsiegert Exp $
 
-SHA1 (fluxbox-1.1.1.tar.bz2) = 6d49deb6c4c7d73f7567e1cf7d2575c7edc4825f
-RMD160 (fluxbox-1.1.1.tar.bz2) = aabfdd10c835d0ef903885646a7f34f7df75af17
-Size (fluxbox-1.1.1.tar.bz2) = 777660 bytes
-SHA1 (patch-aa) = efc7dc56fcf34e337f2c65f7de4e3e8da2114787
-SHA1 (patch-ac) = c15ebee53312d2f18f8dac2e2ee221f9015d744e
+SHA1 (fluxbox-1.3.2.tar.bz2) = 069d810d449c2a223f447aa7a2374f42094bd87b
+RMD160 (fluxbox-1.3.2.tar.bz2) = b0b5f1ca76f7776d90c7619148dca6aa999bd2a9
+Size (fluxbox-1.3.2.tar.bz2) = 787400 bytes
+SHA1 (patch-aa) = 70dacee8af0acee5a75c322260d0b8448e531210
+SHA1 (patch-ac) = 7f7b5570933dfbb99191da22ab7933a2254097d2
 SHA1 (patch-af) = 1cdde9aa6901e23ba42377d71cefb19f073445fa
-SHA1 (patch-ba) = 27ecea84bfe459656f4ff5a09b4f24abf1519097
-SHA1 (patch-bd) = 6f57ed17a0d7330d3a3c0f246b1d69e2f61d8984
+SHA1 (patch-bd) = 75532deb83a0f7e8c91f43acb0299d46d69496ba
 SHA1 (patch-be) = 0c8c0cfa12bbfeca28d76b12b488777b589bb43a
-SHA1 (patch-bf) = 365d372379ddbeb7ed930a6a953c0f245e2fec9e
-SHA1 (patch-bg) = c6a1c79adb48c78a6ac6e5c57e1211d807eff2ce
-SHA1 (patch-bj) = 24eb486f2414bd82bcb85e2ee86f87a061faaa16
+SHA1 (patch-bf) = db8892e83021a92055621bd394f5697cb696eb10
+SHA1 (patch-bg) = 8f4decdb2ff611dcc1af64145801fac35f83e25a
+SHA1 (patch-bj) = 9b0ac35028644b142073a498bc3d59324c51d349
 SHA1 (patch-bk) = ae0c9857dd0cd203c8ae3f4bf5a0c7126cf48c92
-SHA1 (patch-src_FbTk_BoolMenuItem.hh) = aa8ecf88711c08d192da8ecf2c2931f1d9311251
-SHA1 (patch-src_FbTk_IntMenuItem.hh) = 817073a219c9ba75eeaccba7000e7929278d4911
-SHA1 (patch-src_FbTk_Menu.hh) = 138caaa070557ce742ecc81e2e20ad8417000ac1
+SHA1 (patch-util_fbsetbg) = 052029bb1938a783359eb527a7059c407e8988aa
diff --git a/wm/fluxbox/patches/patch-aa b/wm/fluxbox/patches/patch-aa
index dffc18c52ba..e14584c4880 100644
--- a/wm/fluxbox/patches/patch-aa
+++ b/wm/fluxbox/patches/patch-aa
@@ -1,11 +1,20 @@
-$NetBSD: patch-aa,v 1.11 2009/07/07 15:47:59 sborrill Exp $
+$NetBSD: patch-aa,v 1.12 2012/04/17 20:08:06 bsiegert Exp $
 
 * "grep -q" doesn't work everywhere.
 * Do not use the home directory of the user building the package.
 
---- util/fluxbox-generate_menu.in.orig	2009-07-06 11:35:35.000000000 +0100
-+++ util/fluxbox-generate_menu.in	2009-07-06 11:38:59.000000000 +0100
-@@ -48,7 +48,7 @@
+--- util/fluxbox-generate_menu.in.orig	Sat Oct 29 13:45:51 2011
++++ util/fluxbox-generate_menu.in
+@@ -330,7 +330,7 @@ searchForIcon(){
+     # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" 
+     if [ -f "$entry_icon" ]; then
+     # if icon exists and entry does not already exists, add it
+-        if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
++        if ! grep "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
+             echo -e "\"${entry_exec}\" \t <${entry_icon}>" >> $ICONMAPPING
+         else 
+             : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
+@@ -561,7 +561,7 @@ WHOAMI=`whoami`
  [ "$WHOAMI" = root ] && PATH=/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin
  
  # Check for Imlib2-support
@@ -14,16 +23,7 @@ $NetBSD: patch-aa,v 1.11 2009/07/07 15:47:59 sborrill Exp $
      PNG_ICONS="yes"
  else
      # better assume to assume "no"
-@@ -308,7 +308,7 @@
-     # echo "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" 
-     if [ -f "$entry_icon" ]; then
-     # if icon exists and entry does not already exists, add it
--        if ! grep -q -m 1 "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING 2> /dev/null; then
-+        if ! grep "^.${entry_exec}.[[:space:]]*<.*/${icon_base}\....>" $ICONMAPPING > /dev/null; then
-             echo -e "\"${entry_exec}\" \t <${entry_icon}>" >> $ICONMAPPING
-         else 
-             : echo "#    mapping already exists for ${entry_exec}" >> $ICONMAPPING
-@@ -1185,7 +1185,7 @@
+@@ -1220,7 +1220,7 @@ case ${LC_ALL} in
  esac
  
  # Set Defaults
diff --git a/wm/fluxbox/patches/patch-ac b/wm/fluxbox/patches/patch-ac
index 29698befb13..1116ad03399 100644
--- a/wm/fluxbox/patches/patch-ac
+++ b/wm/fluxbox/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.10 2009/07/07 15:47:59 sborrill Exp $
+$NetBSD: patch-ac,v 1.11 2012/04/17 20:08:06 bsiegert Exp $
 
---- src/fluxbox.cc.orig	2009-07-06 12:28:48.000000000 +0100
-+++ src/fluxbox.cc	2009-07-06 12:35:00.000000000 +0100
+--- src/fluxbox.cc.orig	Sat Oct 29 13:45:51 2011
++++ src/fluxbox.cc
 @@ -84,7 +84,7 @@
  #ifdef SHAPE
  #include <X11/extensions/shape.h>
@@ -11,11 +11,11 @@ $NetBSD: patch-ac,v 1.10 2009/07/07 15:47:59 sborrill Exp $
  #include <X11/extensions/Xrandr.h>
  #endif // HAVE_RANDR
  
-@@ -1227,7 +1227,7 @@
+@@ -1077,7 +1077,7 @@ void Fluxbox::saveWindowSearchGroup(Wind
  }
  
  void Fluxbox::saveGroupSearch(Window window, WinClient *data) {
--    m_group_search.insert(pair<Window, WinClient *>(window, data));
+-    m_group_search.insert(pair<const Window, WinClient *>(window, data));
 +    m_group_search.insert(std::multimap<Window, WinClient *>::value_type(window, data));
  }
  
diff --git a/wm/fluxbox/patches/patch-ba b/wm/fluxbox/patches/patch-ba
deleted file mode 100644
index fa906e0d585..00000000000
--- a/wm/fluxbox/patches/patch-ba
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ba,v 1.1 2007/11/01 13:08:05 rillig Exp $
-
-The array size of a local variable must be a constant expression, says
-sunpro.
-
---- src/Ewmh.cc.orig	2007-03-19 20:57:09.000000000 +0100
-+++ src/Ewmh.cc	2007-10-31 01:07:03.044178000 +0100
-@@ -454,7 +454,7 @@ void Ewmh::updateWorkspaceNames(BScreen 
-     const BScreen::WorkspaceNames &workspacenames = screen.getWorkspaceNames();
-     const size_t number_of_desks = workspacenames.size();
- 
--    char *names[number_of_desks];
-+    char **names = new char *[number_of_desks];
- 
-     for (size_t i = 0; i < number_of_desks; i++) {
-         names[i] = new char[workspacenames[i].size() + 1]; // +1 for \0
-@@ -483,6 +483,7 @@ void Ewmh::updateWorkspaceNames(BScreen 
- 
-     for (size_t i = 0; i < number_of_desks; i++)
-         delete [] names[i];
-+    delete[] names;
- 
- }
- 
diff --git a/wm/fluxbox/patches/patch-bd b/wm/fluxbox/patches/patch-bd
index 6640ff4274c..7d251b2b8a6 100644
--- a/wm/fluxbox/patches/patch-bd
+++ b/wm/fluxbox/patches/patch-bd
@@ -1,10 +1,10 @@
-$NetBSD: patch-bd,v 1.1 2007/11/01 13:08:06 rillig Exp $
+$NetBSD: patch-bd,v 1.2 2012/04/17 20:08:06 bsiegert Exp $
 
 See patch-be and patch-bf.
 
---- src/Screen.cc.orig	2007-03-19 20:57:09.000000000 +0100
-+++ src/Screen.cc	2007-11-01 12:50:05.233133000 +0100
-@@ -1032,7 +1032,7 @@ void BScreen::addIcon(FluxboxWindow *w) 
+--- src/Screen.cc.orig	Sat Oct 29 13:45:51 2011
++++ src/Screen.cc
+@@ -945,7 +945,7 @@ void BScreen::addIcon(FluxboxWindow *w) 
          return;
  
      // make sure we have a unique list
@@ -12,38 +12,4 @@ See patch-be and patch-bf.
 +    if (std::find(iconList().begin(), iconList().end(), w) != iconList().end())
          return;
  
-     m_icon_list.push_back(w);
-@@ -2013,21 +2013,21 @@ void BScreen::setLayer(FbTk::XLayerItem 
- /**
-  Goes to the workspace "right" of the current
- */
--void BScreen::nextWorkspace(const int delta) {
-+void BScreen::nextWorkspace(int delta) {
-     changeWorkspaceID( (currentWorkspaceID() + delta) % numberOfWorkspaces());
- }
- 
- /**
-  Goes to the workspace "left" of the current
- */
--void BScreen::prevWorkspace(const int delta) {
-+void BScreen::prevWorkspace(int delta) {
-     changeWorkspaceID( (static_cast<signed>(numberOfWorkspaces()) + currentWorkspaceID() - (delta % numberOfWorkspaces())) % numberOfWorkspaces());
- }
- 
- /**
-  Goes to the workspace "right" of the current
- */
--void BScreen::rightWorkspace(const int delta) {
-+void BScreen::rightWorkspace(int delta) {
-     if (currentWorkspaceID()+delta < numberOfWorkspaces())
-         changeWorkspaceID(currentWorkspaceID()+delta);
- }
-@@ -2035,7 +2035,7 @@ void BScreen::rightWorkspace(const int d
- /**
-  Goes to the workspace "left" of the current
- */
--void BScreen::leftWorkspace(const int delta) {
-+void BScreen::leftWorkspace(int delta) {
-     if (currentWorkspaceID() >= static_cast<unsigned int>(delta))
-         changeWorkspaceID(currentWorkspaceID()-delta);
- }
+     iconList().push_back(w);
diff --git a/wm/fluxbox/patches/patch-bf b/wm/fluxbox/patches/patch-bf
index e7512914944..496ce226c8c 100644
--- a/wm/fluxbox/patches/patch-bf
+++ b/wm/fluxbox/patches/patch-bf
@@ -1,10 +1,10 @@
-$NetBSD: patch-bf,v 1.2 2009/07/07 15:47:59 sborrill Exp $
+$NetBSD: patch-bf,v 1.3 2012/04/17 20:08:06 bsiegert Exp $
 
 Adding "const" to a primitive type is useless. Sunpro doesn't like it.
 
---- src/CurrentWindowCmd.cc.orig	2008-09-01 16:59:05.000000000 +0100
-+++ src/CurrentWindowCmd.cc	2009-07-06 12:50:49.000000000 +0100
-@@ -348,7 +348,7 @@
+--- src/CurrentWindowCmd.cc.orig	Sat Oct 29 13:45:51 2011
++++ src/CurrentWindowCmd.cc
+@@ -462,7 +462,7 @@ REGISTER_COMMAND_PARSER(moveleft, MoveCm
  REGISTER_COMMAND_PARSER(moveup, MoveCmd::parse, void);
  REGISTER_COMMAND_PARSER(movedown, MoveCmd::parse, void);
  
@@ -13,7 +13,7 @@ Adding "const" to a primitive type is useless. Sunpro doesn't like it.
    m_step_size_x(step_size_x), m_step_size_y(step_size_y) { }
  
  void MoveCmd::real_execute() {
-@@ -379,7 +379,7 @@
+@@ -499,7 +499,7 @@ REGISTER_COMMAND_PARSER(resizeto, Resize
  REGISTER_COMMAND_PARSER(resizehorizontal, ResizeCmd::parse, void);
  REGISTER_COMMAND_PARSER(resizevertical, ResizeCmd::parse, void);
  
@@ -22,7 +22,7 @@ Adding "const" to a primitive type is useless. Sunpro doesn't like it.
      m_step_size_x(step_size_x), m_step_size_y(step_size_y) { }
  
  void ResizeCmd::real_execute() {
-@@ -440,7 +440,7 @@
+@@ -579,7 +579,7 @@ void MoveToCmd::real_execute() {
  }
  
  
diff --git a/wm/fluxbox/patches/patch-bg b/wm/fluxbox/patches/patch-bg
index f74ebb4a7f5..c46f71eee83 100644
--- a/wm/fluxbox/patches/patch-bg
+++ b/wm/fluxbox/patches/patch-bg
@@ -1,14 +1,14 @@
-$NetBSD: patch-bg,v 1.1 2007/11/01 13:08:06 rillig Exp $
+$NetBSD: patch-bg,v 1.2 2012/04/17 20:08:06 bsiegert Exp $
 
 For some reason, sunpro requires a syntactically equal definition.
 
---- src/FbTk/StringUtil.cc.orig	2007-03-19 20:57:07.000000000 +0100
-+++ src/FbTk/StringUtil.cc	2007-11-01 13:04:44.331335000 +0100
-@@ -139,7 +139,7 @@ string replaceString(const string &origi
+--- src/FbTk/StringUtil.cc.orig	Sat Oct 29 13:45:51 2011
++++ src/FbTk/StringUtil.cc
+@@ -247,7 +247,7 @@ string replaceString(const string &origi
     for the position + 1 in the in-string where the "last"-char value
     was found.
  */
--int getStringBetween(string& out, const char *instr, const char first, const char last,
+-int getStringBetween(string& out, const char *instr, char first, char last,
 +int getStringBetween(std::string& out, const char *instr, char first, char last,
                       const char *ok_chars, bool allow_nesting) {
      assert(first);
diff --git a/wm/fluxbox/patches/patch-bj b/wm/fluxbox/patches/patch-bj
index 2d60ef72be1..18896574b2c 100644
--- a/wm/fluxbox/patches/patch-bj
+++ b/wm/fluxbox/patches/patch-bj
@@ -1,16 +1,18 @@
-$NetBSD: patch-bj,v 1.1 2007/11/01 13:08:07 rillig Exp $
+$NetBSD: patch-bj,v 1.2 2012/04/17 20:08:06 bsiegert Exp $
 
---- src/Window.cc.orig	2007-09-09 17:46:50.000000000 +0200
-+++ src/Window.cc	2007-11-01 13:45:10.824376000 +0100
-@@ -185,8 +185,9 @@ void lowerFluxboxWindow(FluxboxWindow &w
+--- src/Window.cc.orig	Sat Oct 29 13:45:51 2011
++++ src/Window.cc
+@@ -185,9 +185,10 @@ void lowerFluxboxWindow(FluxboxWindow &w
          win.screen().layerManager().lock();
  
      // lower the windows from the top down, so they don't change stacking order
--    WinClient::TransientList::const_reverse_iterator it = win.winClient().transientList().rbegin();
--    WinClient::TransientList::const_reverse_iterator it_end = win.winClient().transientList().rend();
+-    const WinClient::TransientList& transients = win.winClient().transientList();
+-    WinClient::TransientList::const_reverse_iterator it =     transients.rbegin();
+-    WinClient::TransientList::const_reverse_iterator it_end = transients.rend();
 +    // XXX: I'd rather use a const_reverse_iterator here, but sunpro has problems with it.
-+    WinClient::TransientList::reverse_iterator it = win.winClient().transientList().rbegin();
-+    WinClient::TransientList::reverse_iterator it_end = win.winClient().transientList().rend();
++    WinClient::TransientList& transients = win.winClient().transientList();
++    WinClient::TransientList::reverse_iterator it =     transients.rbegin();
++    WinClient::TransientList::reverse_iterator it_end = transients.rend();
      for (; it != it_end; ++it) {
          if ((*it)->fbwindow() && !(*it)->fbwindow()->isIconic())
              // TODO: should we also check if it is the active client?
diff --git a/wm/fluxbox/patches/patch-src_FbTk_BoolMenuItem.hh b/wm/fluxbox/patches/patch-src_FbTk_BoolMenuItem.hh
deleted file mode 100644
index 89079d8cc02..00000000000
--- a/wm/fluxbox/patches/patch-src_FbTk_BoolMenuItem.hh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_FbTk_BoolMenuItem.hh,v 1.1 2012/04/17 17:51:38 joerg Exp $
-
---- src/FbTk/BoolMenuItem.hh.orig	2012-03-01 15:31:36.000000000 +0000
-+++ src/FbTk/BoolMenuItem.hh
-@@ -26,7 +26,7 @@
- 
- namespace FbTk {
- 
--class Accessor<class T>;
-+template<> class Accessor<class T>;
- 
- /// a bool menu item
- class BoolMenuItem: public FbTk::MenuItem {
diff --git a/wm/fluxbox/patches/patch-src_FbTk_IntMenuItem.hh b/wm/fluxbox/patches/patch-src_FbTk_IntMenuItem.hh
deleted file mode 100644
index 0586d3a22d7..00000000000
--- a/wm/fluxbox/patches/patch-src_FbTk_IntMenuItem.hh
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_FbTk_IntMenuItem.hh,v 1.1 2012/04/17 17:51:38 joerg Exp $
-
---- src/FbTk/IntMenuItem.hh.orig	2012-03-01 15:31:11.000000000 +0000
-+++ src/FbTk/IntMenuItem.hh
-@@ -26,7 +26,7 @@
- 
- namespace FbTk {
- 
--class Accessor<class T>;
-+template<> class Accessor<class T>;
- 
- /// Changes an resource integer value between min and max
- class IntMenuItem: public FbTk::MenuItem {
diff --git a/wm/fluxbox/patches/patch-src_FbTk_Menu.hh b/wm/fluxbox/patches/patch-src_FbTk_Menu.hh
deleted file mode 100644
index 1f3783bd9df..00000000000
--- a/wm/fluxbox/patches/patch-src_FbTk_Menu.hh
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-src_FbTk_Menu.hh,v 1.1 2012/04/17 17:51:38 joerg Exp $
-
---- src/FbTk/Menu.hh.orig	2012-03-01 15:15:51.000000000 +0000
-+++ src/FbTk/Menu.hh
-@@ -38,10 +38,10 @@
- 
- namespace FbTk {
- 
--class Command<class T>;
-+template <> class Command<class T>;
- class MenuItem;
- class ImageControl;
--class RefCount<class T>;
-+template <> class RefCount<class T>;
- 
- ///   Base class for menus
- class Menu: public FbTk::EventHandler, FbTk::FbWindowRenderer,
diff --git a/wm/fluxbox/patches/patch-util_fbsetbg b/wm/fluxbox/patches/patch-util_fbsetbg
new file mode 100644
index 00000000000..493acbe31d9
--- /dev/null
+++ b/wm/fluxbox/patches/patch-util_fbsetbg
@@ -0,0 +1,13 @@
+$NetBSD: patch-util_fbsetbg,v 1.1 2012/04/17 20:08:06 bsiegert Exp $
+
+--- util/fbsetbg.orig	Thu Dec 15 03:36:05 2011
++++ util/fbsetbg
+@@ -526,7 +526,7 @@ fi
+ 
+ 
+ if [ ! -r "$wallpaper" ]; then
+-	if [ "$ignore_missing_wallpaper" == "true" ]; then
++	if [ "$ignore_missing_wallpaper" = "true" ]; then
+ 		exit 0
+ 	fi
+     message "Can't find wallpaper $wallpaper"