Oops, paths to changed files in modules/ChangeLog were incorrect. I corrected them.
diff -Naur fvwmCVS-orig/modules/ChangeLog fvwmCVS-fixed/modules/ChangeLog
--- fvwmCVS-orig/modules/ChangeLog 2006-08-01 12:38:42.000000000 +0400
+++ fvwmCVS-fixed/modules/ChangeLog 2006-08-03 13:44:12.000000000 +0400
@@ -1,3 +1,13 @@
+2006-08-01 Serge Koksharov <gentoosiast dog yandex dot ru>
+
+ * FvwmWinList/ButtonArray.c (DoButton):
+ improved truncation code.
+
+ * FvwmWinList/ButtonArray.c:
+ * FvwmWinList/List.c:
+ * FvwmWinList/List.h:
+ removed useless comments about converting module code to C++.
+
2006-07-16 Scott Smedley <[EMAIL PROTECTED]>
* FvwmTabs/FvwmTabs.in:
diff -Naur fvwmCVS-orig/modules/FvwmWinList/ButtonArray.c
fvwmCVS-fixed/modules/FvwmWinList/ButtonArray.c
--- fvwmCVS-orig/modules/FvwmWinList/ButtonArray.c 2006-08-01
12:38:41.000000000 +0400
+++ fvwmCVS-fixed/modules/FvwmWinList/ButtonArray.c 2006-08-03
13:43:55.000000000 +0400
@@ -10,7 +10,6 @@
* whatsoever. Use this program at your own risk. Permission to use this
* program for any purpose is given, as long as the copyright is kept intact.
*
- * Things to do: Convert to C++ (In Progress)
*/
/* This program is free software; you can redistribute it and/or modify
@@ -517,33 +516,24 @@
}
else
{
- if (TruncateLeft)
+ while (*string &&
+ (newx + FlocaleTextWidth(
+ FButtonFont, string, len)
+ + 2 * button->reliefwidth +
+ INNER_MARGIN) > w)
{
- /* move the ptr up until the rest fits */
- while (*string &&
- (newx + FlocaleTextWidth(
- FButtonFont, string,
- strlen(string))
- + 2 * button->reliefwidth +
- INNER_MARGIN) > w)
+ len--;
+ if (TruncateLeft)
{
string++;
- len--;
}
- button->truncatewidth = w;
- button->truncate_title = string;
- }
- else
- {
- while ((len > 1) &&
- (newx + FlocaleTextWidth(
- FButtonFont, string, len)
- + 2 * button->reliefwidth +
- INNER_MARGIN) > w)
+ else
{
- len--;
+ *(string + len) = '\0';
}
}
+ button->truncatewidth = w;
+ button->truncate_title = string;
}
}
FwinString->str = string;
diff -Naur fvwmCVS-orig/modules/FvwmWinList/List.c
fvwmCVS-fixed/modules/FvwmWinList/List.c
--- fvwmCVS-orig/modules/FvwmWinList/List.c 2006-08-01 12:38:41.000000000
+0400
+++ fvwmCVS-fixed/modules/FvwmWinList/List.c 2006-08-03 13:43:55.000000000
+0400
@@ -10,7 +10,6 @@
* whatsoever. Use this program at your own risk. Permission to use this
* program for any purpose is given, as long as the copyright is kept intact.
*
- * Things to do: Convert to C++ (In Progress)
*/
/* This program is free software; you can redistribute it and/or modify
diff -Naur fvwmCVS-orig/modules/FvwmWinList/List.h
fvwmCVS-fixed/modules/FvwmWinList/List.h
--- fvwmCVS-orig/modules/FvwmWinList/List.h 2006-08-01 12:38:41.000000000
+0400
+++ fvwmCVS-fixed/modules/FvwmWinList/List.h 2006-08-03 13:43:55.000000000
+0400
@@ -10,7 +10,6 @@
* whatsoever. Use this program at your own risk. Permission to use this
* program for any purpose is given, as long as the copyright is kept intact.
*
- * Things to do: Convert to C++ (In Progress)
*/
/* Structure definitions */
pgpQkKNwRlrbf.pgp
Description: PGP signature
