Herold Heiko <[EMAIL PROTECTED]> writes:
> On windows appareantly with beta2 and previous at least on nt4 a
> screen size of 81 is needed in order to print the progress bar
> correctly ?
Oh. Windows probably doesn't like the fact that Wget attempts to use
the full 80 characters. On most Unix terminals, you can print 80
characters on an 80-character screen, and not have it overflow to the
next line.
But it's a bad thing to rely on. So I've now changed it. Then I
noticed other changes that needed doing. Please let me know if this
patch fixes things for you.
src/ChangeLog:
2001-12-06 Hrvoje Niksic <[EMAIL PROTECTED]>
* progress.c (progress_handle_sigwinch): Set up the signal again.
* utils.c: Include <sys/termios.h>, where Solaris defines
TIOCGWINSZ.
* progress.c (bar_create): Don't use the last column on the screen.
(create_image): Pad ETA to constant size. Pad SIZE to nine digits
only until it exceeded them.
Index: configure.in
===================================================================
RCS file: /pack/anoncvs/wget/configure.in,v
retrieving revision 1.29
diff -u -r1.29 configure.in
--- configure.in 2001/11/29 19:43:28 1.29
+++ configure.in 2001/12/06 10:43:41
@@ -154,8 +154,8 @@
dnl
dnl Checks for headers
dnl
-AC_CHECK_HEADERS(string.h stdarg.h unistd.h sys/time.h utime.h sys/utime.h)
-AC_CHECK_HEADERS(sys/ioctl.h sys/select.h sys/utsname.h pwd.h signal.h)
+AC_CHECK_HEADERS(string.h stdarg.h unistd.h sys/time.h utime.h sys/utime.h pwd.h)
+AC_CHECK_HEADERS(termios.h sys/ioctl.h sys/select.h sys/utsname.h signal.h)
AC_HEADER_TIME
dnl
Index: src/config.h.in
===================================================================
RCS file: /pack/anoncvs/wget/src/config.h.in,v
retrieving revision 1.19
diff -u -r1.19 config.h.in
--- src/config.h.in 2001/11/29 19:43:29 1.19
+++ src/config.h.in 2001/12/06 10:43:42
@@ -186,6 +186,9 @@
/* Define if you have the <sys/utime.h> header file. */
#undef HAVE_SYS_UTIME_H
+/* Define if you have the <termios.h> header file. */
+#undef HAVE_TERMIOS_H
+
/* Define if you have the <sys/ioctl.h> header file. */
#undef HAVE_SYS_IOCTL_H
Index: src/progress.c
===================================================================
RCS file: /pack/anoncvs/wget/src/progress.c,v
retrieving revision 1.18
diff -u -r1.18 progress.c
--- src/progress.c 2001/12/06 07:14:35 1.18
+++ src/progress.c 2001/12/06 10:43:42
@@ -30,6 +30,9 @@
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
+#ifdef HAVE_SIGNAL_H
+# include <signal.h>
+#endif
#include "wget.h"
#include "progress.h"
@@ -409,11 +412,14 @@
long last_update; /* time of the last screen update. */
- int width; /* screen width at the time the
- progress gauge was created. */
+ int width; /* screen width we're using at the
+ time the progress gauge was
+ created. this is different from
+ the screen_width global variable in
+ that the latter can be changed by a
+ signal. */
char *buffer; /* buffer where the bar "image" is
stored. */
-
int tick;
};
@@ -429,7 +435,10 @@
bp->initial_length = initial;
bp->total_length = total;
- bp->width = screen_width;
+
+ /* - 1 because we don't want to use the last screen column. */
+ bp->width = screen_width - 1;
+ /* + 1 for the terminating zero. */
bp->buffer = xmalloc (bp->width + 1);
logputs (LOG_VERBOSE, "\n");
@@ -456,14 +465,15 @@
equal to the expected size doesn't abort. */
bp->total_length = bp->count + bp->initial_length;
- if (screen_width != bp->width)
+ if (screen_width - 1 != bp->width)
{
- bp->width = screen_width;
+ bp->width = screen_width - 1;
bp->buffer = xrealloc (bp->buffer, bp->width + 1);
+ force_update = 1;
}
if (dltime - bp->last_update < 200 && !force_update)
- /* Don't update more often than every half a second. */
+ /* Don't update more often than five times per second. */
return;
bp->last_update = dltime;
@@ -492,26 +502,44 @@
xfree (bp);
}
+#define APPEND_LITERAL(s) do { \
+ memcpy (p, s, sizeof (s) - 1); \
+ p += sizeof (s) - 1; \
+} while (0)
+
+#ifndef MAX
+# define MAX(a, b) ((a) >= (b) ? (a) : (b))
+#endif
+
static void
create_image (struct bar_progress *bp, long dltime)
{
char *p = bp->buffer;
long size = bp->initial_length + bp->count;
+ char *size_legible = legible (size);
+ int size_legible_len = strlen (size_legible);
+
/* The progress bar should look like this:
xx% [=======> ] nn.nnn rrK/s ETA 00:00
- Calculate its geometry:
+ Calculate the geometry. The idea is to assign as much room as
+ possible to the progress bar. The other idea is to never let
+ things "jitter", i.e. pad elements that vary in size so that
+ their variance does not affect the placement of other elements.
+ It would be especially bad for the progress bar to be resized
+ randomly.
+
+ "xx% " or "100%" - percentage - 4 chars
+ "[]" - progress bar decorations - 2 chars
+ " nnn,nnn,nnn" - downloaded bytes - 12 chars or very rarely more
+ " 1012.56K/s" - dl rate - 11 chars
+ " ETA xx:xx:xx" - ETA - 13 chars
- "xx% " or "100%" - percentage - 4 chars exactly
- "[]" - progress bar decorations - 2 chars exactly
- " n,nnn,nnn,nnn" - downloaded bytes - 14 or less chars
- " 1012.56K/s" - dl rate - 11 chars exactly
- " ETA xx:xx:xx" - ETA - 13 or less chars
-
- "=====>..." - progress bar content - the rest
+ "=====>..." - progress bar - the rest
*/
- int progress_size = screen_width - (4 + 2 + 14 + 11 + 13);
+ int dlbytes_size = 1 + MAX (size_legible_len, 11);
+ int progress_size = bp->width - (4 + 2 + dlbytes_size + 11 + 13);
if (progress_size < 5)
progress_size = 0;
@@ -530,12 +558,7 @@
p += 4;
}
else
- {
- *p++ = ' ';
- *p++ = ' ';
- *p++ = ' ';
- *p++ = ' ';
- }
+ APPEND_LITERAL (" ");
/* The progress bar: "[====> ]" */
if (progress_size && bp->total_length > 0)
@@ -589,12 +612,8 @@
++bp->tick;
}
- /* " 1,234,567" */
- /* If there are 7 or less digits (9 because of "legible" comas),
- print the number in constant space. This will prevent the rest
- of the line jerking at the beginning of download, but without
- assigning maximum width in all cases. */
- sprintf (p, " %9s", legible (size));
+ /* " 234,567,890" */
+ sprintf (p, " %-11s", legible (size));
p += strlen (p);
/* " 1012.45K/s" */
@@ -607,10 +626,7 @@
p += strlen (p);
}
else
- {
- strcpy (p, " --.--K/s");
- p += 11;
- }
+ APPEND_LITERAL (" --.--K/s");
/* " ETA xx:xx:xx" */
if (bp->total_length > 0 && bp->count > 0)
@@ -625,17 +641,25 @@
eta_min = eta / 60, eta %= 60;
eta_sec = eta;
- /*printf ("\neta: %d, %d %d %d\n", eta, eta_hrs, eta_min, eta_sec);*/
- /*printf ("\n%ld %f %ld %ld\n", dltime, tm_sofar, bytes_remaining, bp->count);*/
+ /* Pad until the end of screen. The padding is dependent on the
+ hour value. */
+ if (eta_hrs == 0 || eta_hrs > 99)
+ /* Hours not printed: pad with three spaces (two digits and
+ colon). */
+ APPEND_LITERAL (" ");
+ else if (eta_hrs >= 10)
+ /* Hours printed with one digit: pad with one space. */
+ *p++ = ' ';
+ else
+ /* Hours printed with two digits: we're using maximum width,
+ don't pad. */
+ ;
- *p++ = ' ';
- *p++ = 'E';
- *p++ = 'T';
- *p++ = 'A';
- *p++ = ' ';
+ APPEND_LITERAL (" ETA ");
if (eta_hrs > 99)
- /* Bogus value, for whatever reason. We must avoid overflow. */
+ /* Bogus value, probably due to a calculation overflow. Print
+ something safe to avoid overstepping the buffer bounds. */
sprintf (p, "--:--");
else if (eta_hrs > 0)
sprintf (p, "%d:%02d:%02d", eta_hrs, eta_min, eta_sec);
@@ -644,14 +668,11 @@
p += strlen (p);
}
else if (bp->total_length > 0)
- {
- strcpy (p, " ETA --:--");
- p += 10;
- }
+ APPEND_LITERAL (" ETA --:--");
- assert (p - bp->buffer <= screen_width);
+ assert (p - bp->buffer <= bp->width);
- while (p < bp->buffer + screen_width)
+ while (p < bp->buffer + bp->width)
*p++ = ' ';
*p = '\0';
}
@@ -698,10 +719,13 @@
screen_width = sw;
}
+#ifdef SIGWINCH
RETSIGTYPE
progress_handle_sigwinch (int sig)
{
int sw = determine_screen_width ();
if (sw && sw >= MINIMUM_SCREEN_WIDTH)
screen_width = sw;
+ signal (SIGWINCH, progress_handle_sigwinch);
}
+#endif
Index: src/utils.c
===================================================================
RCS file: /pack/anoncvs/wget/src/utils.c,v
retrieving revision 1.34
diff -u -r1.34 utils.c
--- src/utils.c 2001/12/05 23:58:12 1.34
+++ src/utils.c 2001/12/06 10:43:43
@@ -50,8 +50,13 @@
#endif
#include <fcntl.h>
#include <assert.h>
+
+/* For TIOCGWINSZ and friends: */
#ifdef HAVE_SYS_IOCTL_H
# include <sys/ioctl.h>
+#endif
+#ifdef HAVE_TERMIOS_H
+# include <termios.h>
#endif
#include "wget.h"
