12 files changed, 144 insertions, 44 deletions

diff --git a/ChangeLog b/ChangeLog
index 6acdb35..3f6ee97 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,17 @@
 Changes for 0.1.6:
+*01/01/11:
+   * Fixed so it compiles with cygwin (Thanks Eric Nicolas)
 *02/01/10:
+   * Fixed {VERT,HORIZ}{INC,DEC} keybindings so that tabs will
+     resize/reposition. (Claes Nästén)
+   * Updated documentation (Thanks Rando Christensen)
+   * All enums are now changed to uppercase letters. (Claes Nästén)
+   * Now tabs won't appear on some apps where they shouldn't,
+     for example bbpager and mplayer. (Claes Nästén) 
    * Fixed rootCommand to screen, so we can have
      different rootcommands on the different screens
+   * Fixed so we can disable lines in the keyfile with a #
+   * Fixed raise with mouse click while sloppy window focus
 *02/01/09:
    * Updated copyright date
    * Updated generate_menu (Thanks zyrnix)
@@ -23,7 +33,7 @@ Changes for 0.1.6:
 *02/01/05:
    * Changed placement/alignment enums to uppercase letters (Claes Nästén)
    * Fixed tab/iconbar resource bug (Claes Nästén)
-   * Applied "maximize slit stop"-patch  (Thanks Andrew Livesay )
+   * Applied "maximize slit stop"-patch  (Thanks Andrew Livesay)
    * Fixed stickytoggle bug in Windowmenu (Thanks Chris Elston)
    * Fixed shade bug in Windowmenu 
    * Fixed error in nls/it_IT/Makefile.am
diff --git a/NEWS b/NEWS
index 4dabd4d..193bbd3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,17 +1,24 @@
 So whats new in 0.1.6? 
-* different rootCommand on different screens
-* less strict keyconfig file reading
-* coding design
-* You can drop tabs on titlebar too
-* tab width is configured for each screen
+* Rootcommand is configured for each screen
+* Less strict keyconfig file reading
+* Coding design
+* Tabs can be dropped on the window as well 
+  (if the sloppy window grouping is on)
+* Tab width is configured for each screen
 * Tab cycling
 * "Maximize stop at slit" option
+* Lower window with mouse button 3 
+* You can now comment lines in keys config file
+  (commented lines must start with a #)
+* You can now click to raise window while 
+  you are in sloppy focus mode
 
 Bugfixes:
-* close button
-* keys memory leak
-* keybinding bug
-* withdraw state fixed (opera will not open another instance)
+* Close button (aterm, eterm etc)
+* Keys memory leak
+* Keybinding bug
+* Withdraw state fixed (opera will not open another instance 
+  if there is one already opened)
 * Slit OnTop while Toolbar OnTop
 * Alt + resize and pressing button 1
 * Tab toggle texture/position
diff --git a/README b/README
index 4a5f4bb..2cac70b 100644
--- a/README
+++ b/README
@@ -1,4 +1,5 @@
-Fluxbox builds on Blackbox source but has different goals.
+Fluxbox builds on Blackbox 0.61.1 source but has different goals.
+Read NEWS to see whats new in this release.
 For copyright see COPYING
 
 Compile and Install:
@@ -8,8 +9,10 @@ Compile and Install:
 and then as root
 # make install
 
-for KDE slitsupport: 
- ./configure --enable-kde
+for KDE slitsupport: (Allows kde tray icons to be placed in the fluxbox slit)
+   ./configure --enable-kde
+         
+For more information and FAQ go to http://fluxbox.sourceforge.net
 
 To disable tabs and/or iconbar just  change it in configure menu.
 
@@ -21,15 +24,33 @@ in the file init.
 
 You can use your old blackbox configuration file too. Just copy
 .blackboxrc to ~/.fluxbox/init . The same goes for menu file.
-The bbkeys config file can be selected in the file init:
-session.keyFile: <filename here>
 You can also use the Blackbox themes in Fluxbox.
 If there isn't any format for the tab in the theme then
 the tab will have the same theme as the titlebar.
 
+The keys config file can be selected in the file init:
+session.keyFile: <filename here>
+The keys file is no longer compatible with bbkeys. There's a convertkeys
+script at http://fluxbox.sourceforge.net/ that will convert the bbkeys
+format to the fluxbox format.
+ 
+ 
+A few extra notes:
+ - To disable tabs and/or iconbar just change it in configure menu.
+ - To work with tabs, use the third mouse button to drag a tab to another tab.
+   This will group the two windows together.
+ - With 'Sloppy Window Grouping' turned on (in your configure menu), you can
+   drop the tabs anywhere on the target window to group windows together.
+ - The 'Maximize Slit Stop' option means that maximized windows will stop at
+   the outside border of the slit, keeping the slit in full view.
+ - In the init file, the session.screen0.rootCommand: option will override
+   the rootCommand option in a theme- keeping your background the same, no
+   matter what the theme says it should be.
+ 
 Thanks:
 Blackbox team
-#linux.se@dalnet, #linux.se@openproject.net
+aleczapka, skarin, Perc, xfs, skypher and skywarper for buggtesting
 skypher of openprojects for buggtesting and providing fluxbox with themes: 
 Clean CleanColor Makro, Carbondioxide and MerleyKay.
-skarin, Perc, xfs, skypher and skywarper for buggtesting
+People at #fluxbox@openprojects.net
+And for the people who send bugfixes/patches
diff --git a/TODO b/TODO
index 4c1498b..1f8858c 100644
--- a/TODO
+++ b/TODO
@@ -13,6 +13,8 @@ TODO for Fluxbox 0.2.0
 
 * grabKillWindow to keygrabber grabCloseWindow
 
+* Fix snapping for {VERT,HORIZ}{INC,DEC} keybindings when resising for example
+  xterms.
 * grabRootmenu
 * wheel-config support
 * separator in the menus
@@ -21,7 +23,6 @@ TODO for Fluxbox 0.2.0
 * 0,0-pos fix
 * gnome support 
 * net wm atom support
-* fix some more enums to uppercase
 * clean up in the global namespace
 * remove cyclic deps
 * Create fbinput style app
diff --git a/configure b/configure
index 8cfce1d..878d384 100755
--- a/configure
+++ b/configure
@@ -728,7 +728,7 @@ fi
 
 PACKAGE=fluxbox
 
-VERSION=0.1.6-pre
+VERSION=0.1.6
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
diff --git a/configure.in b/configure.in
index f57b299..0386424 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl configure.in for Fluxbox  - created from configure.in Blackbox 0.61.1
 dnl Initialize autoconf and automake
 AC_INIT(src/main.cc)
-AM_INIT_AUTOMAKE(fluxbox,0.1.6-pre,no-define)
+AM_INIT_AUTOMAKE(fluxbox,0.1.6,no-define)
 
 dnl Determine default prefix
 test x$prefix = "xNONE" && prefix="$ac_default_prefix"
diff --git a/data/Makefile.am b/data/Makefile.am
index c586c77..209b64b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -11,6 +11,6 @@ distclean-local:
 init: init.in
         @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," init.in > init
 menu: generate_menu
-        ./generate_menu
+        sh ./generate_menu
         @regex_cmd@ -e "s,\@VERSION\@,$(VERSION)," menu.in > menu.pre
         @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," menu.pre > menu
diff --git a/data/Makefile.in b/data/Makefile.in
index c1c7725..1c871b0 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -106,9 +106,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-        cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps data/Makefile
+        cd $(top_srcdir) && $(AUTOMAKE) --gnu data/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
         cd $(top_builddir) \
           && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -226,6 +226,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = data
 
 distdir: $(DISTFILES)
+        here=`cd $(top_builddir) && pwd`; \
+        top_distdir=`cd $(top_distdir) && pwd`; \
+        distdir=`cd $(distdir) && pwd`; \
+        cd $(top_srcdir) \
+          && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu data/Makefile
         @for file in $(DISTFILES); do \
           d=$(srcdir); \
           if test -d $$d/$$file; then \
@@ -324,7 +329,7 @@ distclean-local:
 init: init.in
         @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," init.in > init
 menu: generate_menu
-        ./generate_menu
+        sh ./generate_menu
         @regex_cmd@ -e "s,\@VERSION\@,$(VERSION)," menu.in > menu.pre
         @regex_cmd@ -e "s,@pkgdatadir@,$(pkgdatadir)," menu.pre > menu
 
diff --git a/data/styles/Makefile.in b/data/styles/Makefile.in
index 8e3e3f4..54318df 100644
--- a/data/styles/Makefile.in
+++ b/data/styles/Makefile.in
@@ -106,9 +106,9 @@ GZIP_ENV = --best
 all: all-redirect
 .SUFFIXES:
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-        cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps data/styles/Makefile
+        cd $(top_srcdir) && $(AUTOMAKE) --gnu data/styles/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
         cd $(top_builddir) \
           && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -140,6 +140,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = data/styles
 
 distdir: $(DISTFILES)
+        here=`cd $(top_builddir) && pwd`; \
+        top_distdir=`cd $(top_distdir) && pwd`; \
+        distdir=`cd $(distdir) && pwd`; \
+        cd $(top_srcdir) \
+          && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu data/styles/Makefile
         @for file in $(DISTFILES); do \
           d=$(srcdir); \
           if test -d $$d/$$file; then \
diff --git a/src/Makefile.am b/src/Makefile.am
index 5b294fd..52e69e4 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -50,7 +50,7 @@ fluxbox_SOURCES= BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh \
         fluxbox.cc fluxbox.hh \
         i18n.cc i18n.hh main.cc Tab.hh Tab.cc Keys.cc Keys.hh\
         IconBar.cc IconBar.hh Theme.hh Theme.cc \
-        StringUtil.cc StringUtil.hh DrawUtil.cc DrawUtil.hh
+        StringUtil.cc StringUtil.hh DrawUtil.cc DrawUtil.hh nl_types_cygnus.h
                                                                 
 MAINTAINERCLEANFILES= Makefile.in
 
diff --git a/src/Makefile.in b/src/Makefile.in
index 87a6604..2e4a1a3 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -119,7 +119,7 @@ CPPFLAGS = -Wall @CPPFLAGS@ @SHAPE@ @SLIT@ @INTERLACE@ @ORDEREDPSEUDO@ @DEBUG@ @
 
 bin_PROGRAMS = fluxbox
 
-fluxbox_SOURCES = BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh         Clientmenu.cc Clientmenu.hh Configmenu.cc Configmenu.hh         Icon.cc Icon.hh Image.cc Image.hh LinkedList.cc LinkedList.hh   Netizen.cc Netizen.hh Rootmenu.cc Rootmenu.hh Screen.cc Screen.hh       Slit.cc Slit.hh Timer.cc Timer.hh Toolbar.cc Toolbar.hh         Window.cc Window.hh Windowmenu.cc Windowmenu.hh         Workspace.cc Workspace.hh Workspacemenu.cc Workspacemenu.hh     fluxbox.cc fluxbox.hh   i18n.cc i18n.hh main.cc Tab.hh Tab.cc Keys.cc Keys.hh   IconBar.cc IconBar.hh Theme.hh Theme.cc         StringUtil.cc StringUtil.hh DrawUtil.cc DrawUtil.hh
+fluxbox_SOURCES = BaseDisplay.cc BaseDisplay.hh Basemenu.cc Basemenu.hh         Clientmenu.cc Clientmenu.hh Configmenu.cc Configmenu.hh         Icon.cc Icon.hh Image.cc Image.hh LinkedList.cc LinkedList.hh   Netizen.cc Netizen.hh Rootmenu.cc Rootmenu.hh Screen.cc Screen.hh       Slit.cc Slit.hh Timer.cc Timer.hh Toolbar.cc Toolbar.hh         Window.cc Window.hh Windowmenu.cc Windowmenu.hh         Workspace.cc Workspace.hh Workspacemenu.cc Workspacemenu.hh     fluxbox.cc fluxbox.hh   i18n.cc i18n.hh main.cc Tab.hh Tab.cc Keys.cc Keys.hh   IconBar.cc IconBar.hh Theme.hh Theme.cc         StringUtil.cc StringUtil.hh DrawUtil.cc DrawUtil.hh nl_types_cygnus.h
 
 
 MAINTAINERCLEANFILES = Makefile.in
diff --git a/util/Makefile.in b/util/Makefile.in
index 9c830c2..80fb2d5 100644
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -131,6 +131,7 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 TAR = tar
 GZIP_ENV = --best
+DEP_FILES =  .deps/bsetroot.P
 SOURCES = $(bsetroot_SOURCES)
 OBJECTS = $(bsetroot_OBJECTS)
 
@@ -138,9 +139,9 @@ all: all-redirect
 .SUFFIXES:
 .SUFFIXES: .S .c .cc .lo .o .s
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-        cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps util/Makefile
+        cd $(top_srcdir) && $(AUTOMAKE) --gnu util/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
         cd $(top_builddir) \
           && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
@@ -170,9 +171,6 @@ uninstall-binPROGRAMS:
           rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
         done
 
-.c.o:
-        $(COMPILE) -c $<
-
 .s.o:
         $(COMPILE) -c $<
 
@@ -189,9 +187,6 @@ distclean-compile:
 
 maintainer-clean-compile:
 
-.c.lo:
-        $(LIBTOOL) --mode=compile $(COMPILE) -c $<
-
 .s.lo:
         $(LIBTOOL) --mode=compile $(COMPILE) -c $<
 
@@ -269,6 +264,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
 subdir = util
 
 distdir: $(DISTFILES)
+        here=`cd $(top_builddir) && pwd`; \
+        top_distdir=`cd $(top_distdir) && pwd`; \
+        distdir=`cd $(distdir) && pwd`; \
+        cd $(top_srcdir) \
+          && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu util/Makefile
         @for file in $(DISTFILES); do \
           d=$(srcdir); \
           if test -d $$d/$$file; then \
@@ -280,6 +280,56 @@ distdir: $(DISTFILES)
           fi; \
         done
 
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+        -rm -rf .deps
+
+maintainer-clean-depend:
+
+%.o: %.c
+        @echo '$(COMPILE) -c $<'; \
+        $(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+        @-cp .deps/$(*F).pp .deps/$(*F).P; \
+        tr ' ' '\012' < .deps/$(*F).pp \
+          | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+            >> .deps/$(*F).P; \
+        rm .deps/$(*F).pp
+
+%.lo: %.c
+        @echo '$(LTCOMPILE) -c $<'; \
+        $(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+        @-sed -e 's/^\([^:]*\)\.o[      ]*:/\1.lo \1.o :/' \
+          < .deps/$(*F).pp > .deps/$(*F).P; \
+        tr ' ' '\012' < .deps/$(*F).pp \
+          | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+            >> .deps/$(*F).P; \
+        rm -f .deps/$(*F).pp
+
+%.o: %.cc
+        @echo '$(CXXCOMPILE) -c $<'; \
+        $(CXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+        @-cp .deps/$(*F).pp .deps/$(*F).P; \
+        tr ' ' '\012' < .deps/$(*F).pp \
+          | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+            >> .deps/$(*F).P; \
+        rm .deps/$(*F).pp
+
+%.lo: %.cc
+        @echo '$(LTCXXCOMPILE) -c $<'; \
+        $(LTCXXCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
+        @-sed -e 's/^\([^:]*\)\.o[      ]*:/\1.lo \1.o :/' \
+          < .deps/$(*F).pp > .deps/$(*F).P; \
+        tr ' ' '\012' < .deps/$(*F).pp \
+          | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
+            >> .deps/$(*F).P; \
+        rm -f .deps/$(*F).pp
 info-am:
 info: info-am
 dvi-am:
@@ -318,27 +368,27 @@ distclean-generic:
 maintainer-clean-generic:
         -test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
 mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-                mostlyclean-libtool mostlyclean-tags \
+                mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
                 mostlyclean-generic
 
 mostlyclean: mostlyclean-am
 
 clean-am:  clean-binPROGRAMS clean-compile clean-libtool clean-tags \
-                clean-generic mostlyclean-am
+                clean-depend clean-generic mostlyclean-am
 
 clean: clean-am
 
 distclean-am:  distclean-binPROGRAMS distclean-compile distclean-libtool \
-                distclean-tags distclean-generic clean-am \
-                distclean-local
+                distclean-tags distclean-depend distclean-generic \
+                clean-am distclean-local
         -rm -f libtool
 
 distclean: distclean-am
 
 maintainer-clean-am:  maintainer-clean-binPROGRAMS \
                 maintainer-clean-compile maintainer-clean-libtool \
-                maintainer-clean-tags maintainer-clean-generic \
-                distclean-am
+                maintainer-clean-tags maintainer-clean-depend \
+                maintainer-clean-generic distclean-am
         @echo "This command is intended for maintainers to use;"
         @echo "it deletes files that may require special tools to rebuild."
 
@@ -350,8 +400,9 @@ mostlyclean-compile distclean-compile clean-compile \
 maintainer-clean-compile mostlyclean-libtool distclean-libtool \
 clean-libtool maintainer-clean-libtool uninstall-binSCRIPTS \
 install-binSCRIPTS tags mostlyclean-tags distclean-tags clean-tags \
-maintainer-clean-tags distdir info-am info dvi-am dvi check check-am \
-installcheck-am installcheck install-exec-am install-exec \
+maintainer-clean-tags distdir mostlyclean-depend distclean-depend \
+clean-depend maintainer-clean-depend info-am info dvi-am dvi check \
+check-am installcheck-am installcheck install-exec-am install-exec \
 install-data-am install-data install-am install uninstall-am uninstall \
 all-redirect all-am all installdirs mostlyclean-generic \
 distclean-generic clean-generic maintainer-clean-generic clean \