Hi, dear developers,
1) First of all, the entire FvwmTaskBar module is broken in the current
CVS tree. Because of incorrect module->namelen calculation it does not
parses its configuration entries properly. I fixed this, quality assured
this and provided a patch. Golden rule to all: test before commit.
2) Discovered and documented another earlier undocumented FvwmTaskBar
option `Pad'. Authors, please don't forget to properly document all your
newly added features. If your feature isn't described in documentation,
it doesn't exists for 99% of our users.
3) Discovered and fixed some syntactical errors in the `fvwm-bug'
script. Without my fixes fallback entries don't work in both bash and
zsh shells. Also I changed fallback editor in this script from `emacs'
to `vi'. No offence to anyone, but we must use `vi' as fallback,
because it much more widespread and part of the base system on *BSD
family and several commercial UNIX-like systems. Also script now honors
`TMPDIR' environment variable and if it is unset if fallbacks to /tmp.
Maybe, we should mention in the `Bug Fixes' section of the `NEWS' file
`- Documentation fixes and improvements.' ? I think we've done great job
in this specific area and it deserves an entry. Hope, 2.5.17 release
will be good. Adios.
P.S. Question to Mikhael: Why you named one of your kitties `Murzilka'?
In USSR we had a children's magazine with exactly such name. It was nice,
kind and I read it when I was a kid.
--
Serge Koksharov, Free Software user & supporter
GPG public key ID: 0x3D330896 (pgp.mit.edu)
Key fingerprint: 5BC4 0475 CB03 6A31 0076 82C2 C240 72F0 3D33 0896
diff -Naur fvwmCVS-orig/ChangeLog fvwmCVS-fixed/ChangeLog
--- fvwmCVS-orig/ChangeLog 2006-04-07 19:07:10.000000000 +0400
+++ fvwmCVS-fixed/ChangeLog 2006-04-07 19:21:53.000000000 +0400
@@ -1,3 +1,8 @@
+2006-04-07 Serge Koksharov <gentoosiast dog yandex dot ru>
+
+ * modules/FvwmTaskBar/FvwmTaskBar.1.in:
+ added another undocumented `Pad' option description.
+
2006-04-06 Viktor Griph <[EMAIL PROTECTED]>
* fvwm/fvwm.1.in:
diff -Naur fvwmCVS-orig/modules/ChangeLog fvwmCVS-fixed/modules/ChangeLog
--- fvwmCVS-orig/modules/ChangeLog 2006-04-07 19:07:10.000000000 +0400
+++ fvwmCVS-fixed/modules/ChangeLog 2006-04-07 19:21:21.000000000 +0400
@@ -1,3 +1,8 @@
+2006-04-07 Serge Koksharov <gentoosiast dog yandex dot ru>
+
+ * FvwmTaskBar/FvwmTaskBar.1.in:
+ added another undocumented `Pad' option description.
+
2006-03-21 Serge Koksharov <gentoosiast dog yandex dot ru>
* FvwmAnimate/FvwmAnimate.c:
diff -Naur fvwmCVS-orig/modules/FvwmTaskBar/FvwmTaskBar.1.in
fvwmCVS-fixed/modules/FvwmTaskBar/FvwmTaskBar.1.in
--- fvwmCVS-orig/modules/FvwmTaskBar/FvwmTaskBar.1.in 2006-04-07
19:07:10.000000000 +0400
+++ fvwmCVS-fixed/modules/FvwmTaskBar/FvwmTaskBar.1.in 2006-04-07
19:18:24.000000000 +0400
@@ -228,6 +228,10 @@
Indicates the maximum width that window buttons should reach.
(the minimum is hard coded at 32).
+.IP "*FvwmTaskBar: Pad \fIwidth\fP"
+Specifies the space (in pixels) between the window buttons. If this option is
+not specified, the default space is 3.
+
.IP "*FvwmTaskBar: WindowButtonsLeftMargin \fImargin\fP"
Specifies the space (in pixels) between the left side of the left-most window
button and the right side of the start button or right-most shortcut
diff -Naur fvwmCVS-orig/AUTHORS fvwmCVS-fixed/AUTHORS
--- fvwmCVS-orig/AUTHORS 2006-04-07 19:07:10.000000000 +0400
+++ fvwmCVS-fixed/AUTHORS 2006-04-08 00:51:03.000000000 +0400
@@ -3,7 +3,7 @@
"Recording Changes".
Serge (gentoosiast) Koksharov:
-Documentation fixes, bug fix.
+Documentation fixes, bug fixes.
Arwed von Merkatz:
UnderMousePlacement style.
diff -Naur fvwmCVS-orig/ChangeLog fvwmCVS-fixed/ChangeLog
--- fvwmCVS-orig/ChangeLog 2006-04-07 19:07:10.000000000 +0400
+++ fvwmCVS-fixed/ChangeLog 2006-04-08 01:05:34.000000000 +0400
@@ -1,3 +1,18 @@
+2006-04-07 Serge Koksharov <gentoosiast dog yandex dot ru>
+
+ * modules/FvwmTaskBar/FvwmTaskBar.c:
+ fixed typos
+
+ * modules/FvwmTaskBar/FvwmTaskBar.c:
+ * modules/FvwmTaskBar/Goodies.c:
+ * modules/FvwmTaskBar/Start.c:
+ because of incorrect module->namelen calculation entire
+ FvwmTaskBar module was broken. _Test_ your changes before
+ commits.
+
+ * AUTHORS:
+ updated my entry
+
2006-04-06 Viktor Griph <[EMAIL PROTECTED]>
* fvwm/fvwm.1.in:
diff -Naur fvwmCVS-orig/modules/ChangeLog fvwmCVS-fixed/modules/ChangeLog
--- fvwmCVS-orig/modules/ChangeLog 2006-04-07 19:07:10.000000000 +0400
+++ fvwmCVS-fixed/modules/ChangeLog 2006-04-08 01:05:42.000000000 +0400
@@ -1,3 +1,15 @@
+2006-04-07 Serge Koksharov <gentoosiast dog yandex dot ru>
+
+ * FvwmTaskBar/FvwmTaskBar.c:
+ fixed typos
+
+ * FvwmTaskBar/FvwmTaskBar.c:
+ * FvwmTaskBar/Goodies.c:
+ * FvwmTaskBar/Start.c:
+ Because of incorrect module->namelen calculation entire
+ FvwmTaskBar module was broken. _Test_ your changes before
+ commits.
+
2006-03-21 Serge Koksharov <gentoosiast dog yandex dot ru>
* FvwmAnimate/FvwmAnimate.c:
diff -Naur fvwmCVS-orig/modules/FvwmTaskBar/FvwmTaskBar.c
fvwmCVS-fixed/modules/FvwmTaskBar/FvwmTaskBar.c
--- fvwmCVS-orig/modules/FvwmTaskBar/FvwmTaskBar.c 2006-04-07
19:07:10.000000000 +0400
+++ fvwmCVS-fixed/modules/FvwmTaskBar/FvwmTaskBar.c 2006-04-08
01:02:05.000000000 +0400
@@ -1087,9 +1087,10 @@
while (isspace((unsigned char)*tline))
tline++;
- if (strncasecmp(tline, CatString3("*",module->name,0), module->namelen) != 0)
+ if (strncasecmp(tline, CatString3("*",module->name,0), module->namelen)
+ != 0)
{
- /* Non module spcific option */
+ /* Non module specific options */
index = GetTokenIndex(tline, configopts, -1, &rest);
while (*rest && *rest != '\n' && isspace(*rest))
rest++;
@@ -1119,8 +1120,8 @@
} /* if options */
else
{
- /* option beginning with '*ModuleName' */
- rest = tline + module->namelen;
+ /* options beginning with '*ModuleName' */
+ rest = tline + module->namelen+1;
index = GetTokenIndex(rest, moduleopts, -1, &rest);
while (*rest && *rest != '\n' && isspace(*rest))
rest++;
diff -Naur fvwmCVS-orig/modules/FvwmTaskBar/Goodies.c
fvwmCVS-fixed/modules/FvwmTaskBar/Goodies.c
--- fvwmCVS-orig/modules/FvwmTaskBar/Goodies.c 2006-04-07 19:07:10.000000000
+0400
+++ fvwmCVS-fixed/modules/FvwmTaskBar/Goodies.c 2006-04-08 00:30:10.000000000
+0400
@@ -208,7 +208,7 @@
char *option;
int i;
- option = tline + module->namelen;
+ option = tline + module->namelen+1;
i = GetTokenIndex(option, goodyopts, -1, &rest);
while (*rest && *rest != '\n' && isspace(*rest))
rest++;
diff -Naur fvwmCVS-orig/modules/FvwmTaskBar/Start.c
fvwmCVS-fixed/modules/FvwmTaskBar/Start.c
--- fvwmCVS-orig/modules/FvwmTaskBar/Start.c 2006-04-07 19:07:10.000000000
+0400
+++ fvwmCVS-fixed/modules/FvwmTaskBar/Start.c 2006-04-08 00:35:35.000000000
+0400
@@ -79,7 +79,7 @@
int mouseButton;
char **tmpStrPtr;
- option = tline + module->namelen;
+ option = tline + module->namelen+1;
i = GetTokenIndex(option, startopts, -1, &rest);
while (*rest && *rest != '\n' && isspace(*rest))
{
diff -Naur fvwmCVS-orig/bin/ChangeLog fvwmCVS-fixed/bin/ChangeLog
--- fvwmCVS-orig/bin/ChangeLog 2006-04-07 19:07:08.000000000 +0400
+++ fvwmCVS-fixed/bin/ChangeLog 2006-04-08 01:39:29.000000000 +0400
@@ -1,3 +1,13 @@
+2006-04-07 Serge Koksharov <gentoosiast dog yandex dot ru>
+
+ * fvwm-bug.in:
+ changed fallback editor from `emacs' to `vi' because it much
+ more widespread on non-Linux systems
+ fixed errors (because of incorrect syntax fallback entries were
+ not used)
+ now script honors `TMPDIR' env. variable and if it's not set it
+ fallback to `/tmp' directory when creating temporary file
+
2006-04-04 Serge Koksharov <gentoosiast dog yandex dot ru>
* ChangeLog:
diff -Naur fvwmCVS-orig/bin/fvwm-bug.in fvwmCVS-fixed/bin/fvwm-bug.in
--- fvwmCVS-orig/bin/fvwm-bug.in 2006-04-07 19:07:08.000000000 +0400
+++ fvwmCVS-fixed/bin/fvwm-bug.in 2006-04-08 01:37:30.000000000 +0400
@@ -51,9 +51,9 @@
PATH=/bin:/usr/bin:/usr/local/bin:$PATH
export PATH
-: ${EDITOR=emacs}
+: ${EDITOR:=vi}
-TEMP=`mktemp -q "/tmp/fvwm-bug.XXXXXX"`
+TEMP=`mktemp -q "${TMPDIR:-/tmp}/fvwm-bug.XXXXXX"`
# Figure out how to echo a string without a trailing newline
N=`echo 'hi there\c'`
@@ -66,7 +66,7 @@
trap 'rm -f $TEMP $TEMP.x' 0
# Who is mail from?
-: ${USER=${LOGNAME-`whoami`}}
+: ${USER:=${LOGNAME:-`whoami`}}
# Who is mail to?
if test x"$address" = x; then
@@ -107,7 +107,7 @@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
-: ${FVWM_USERDIR=unset}
+: ${FVWM_USERDIR:=unset}
[EMAIL PROTECTED]@
[EMAIL PROTECTED]@
diff -Naur fvwmCVS-orig/ChangeLog fvwmCVS-fixed/ChangeLog
--- fvwmCVS-orig/ChangeLog 2006-04-07 19:07:10.000000000 +0400
+++ fvwmCVS-fixed/ChangeLog 2006-04-08 01:39:08.000000000 +0400
@@ -1,3 +1,13 @@
+2006-04-07 Serge Koksharov <gentoosiast dog yandex dot ru>
+
+ * bin/fvwm-bug.in:
+ changed fallback editor from `emacs' to `vi' because it much
+ more widespread on non-Linux systems
+ fixed errors (because of incorrect syntax fallback entries were
+ not used)
+ now script honors `TMPDIR' env. variable and if it's not set it
+ fallback to `/tmp' directory when creating temporary file
+
2006-04-06 Viktor Griph <[EMAIL PROTECTED]>
* fvwm/fvwm.1.in:
