[Aptitude-svn-commit] r3619 - in branches/aptitude-0.3/aptitude: . src/cmdline

[Daniel Burrows]

Author: dburrows
Date: Tue Jul  5 15:15:12 2005
New Revision: 3619

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.cc
Log:
Calculate the screen width correctly.

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Tue Jul  5 15:15:12 2005
@@ -1,5 +1,11 @@
 2005-07-05  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_progress.cc:
+
+	  Calculate the screen width correctly: I suspect that there is an
+	  off-by-one error in the progress bar that the
+	  update_screen_width function originally compensated for.
+
 	* src/cmdline/cmdline_search.cc:
 
 	  Fix a minor race condition that could have resulted in "search"

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.cc	Tue Jul  5 15:15:12 2005
@@ -16,7 +16,12 @@
   winsize ws;
 
   if (ioctl(1, TIOCGWINSZ, &ws) != -1 && ws.ws_col >= 5)
-    screen_width = ws.ws_col - 1;
+
+    // NB: originally this set things to ws_col-1, which (a) seems
+    // wrong, and (b) produced incorrect results in everything except
+    // the progress bar.  I suspect the progress bar has off-by-one
+    // errors...
+    screen_width = ws.ws_col;
 }
 
 static void dl_complete(download_manager &manager,