[Aptitude-devel] r3212 - in branches/aptitude-0.3/aptitude: . src src/cmdline

[Daniel Burrows]

Author: dburrows
Date: Sat Apr 30 23:30:23 2005
New Revision: 3212

Modified:
   branches/aptitude-0.3/aptitude/ChangeLog
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_download.cc
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_progress.cc
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_search.cc
   branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc
   branches/aptitude-0.3/aptitude/src/main.cc
Log:
Centralizing screen width reading in main (for command-line mode anyway)

Modified: branches/aptitude-0.3/aptitude/ChangeLog
==============================================================================
--- branches/aptitude-0.3/aptitude/ChangeLog	(original)
+++ branches/aptitude-0.3/aptitude/ChangeLog	Sat Apr 30 23:30:23 2005
@@ -1,5 +1,11 @@
 2005-04-30  Daniel Burrows  <dburrows@debian.org>
 
+	* src/cmdline/cmdline_download.cc, src/cmdline/cmdline_progress.cc, src/cmdline/cmdline_prompt.cc, src/cmdline/cmdline_resolver.cc, src/cmdline/cmdline_search.cc, src/cmdline/cmdline_show.cc, src/main.cc:
+
+	  Quit running update_screen_width all over the place in
+	  command-line mode; instead, set up a SIGWINCH handler and read
+	  the screen width for the first time in main.
+
 	* src/cmdline/cmdline_do_action.cc:
 
 	  Get rid of the separate resolve step prior to prompting, which

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_download.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_download.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_download.cc	Sat Apr 30 23:30:23 2005
@@ -30,8 +30,6 @@
       return -1;
     }
 
-  update_screen_width();
-
   _error->DumpErrors();
 
   OpTextProgress progress;

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	Sat Apr 30 23:30:23 2005
@@ -1,7 +1,6 @@
 #include <download_manager.h>
 
 #include <sys/ioctl.h>
-#include <signal.h>
 
 #include <generic/acqprogress.h>
 
@@ -30,10 +29,6 @@
 {
   download_manager *m=new download_manager;
 
-  update_screen_width();
-  // FIXME: put this in a shared init function.
-  signal(SIGWINCH, update_screen_width);
-
   // FIXME: LEAK!!!!  (since the command-line stuff will only use this once
   // and then terminate, and killing this leak is a major pain, I'm
   // letting it by for now, but this MUST BE FIXED EVENTUALLY!)

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_prompt.cc	Sat Apr 30 23:30:23 2005
@@ -615,7 +615,6 @@
 					    fragf(_("'&m' to mark packages as manually installed")))));
 
   out << _("Commands:") << endl;
-  update_screen_width();
   out << f->layout(screen_width, screen_width);
   delete f;
 }

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_resolver.cc	Sat Apr 30 23:30:23 2005
@@ -132,7 +132,6 @@
 			      flowindentbox(0, 3,
 					    fragf(_("Adjustments will cause the current solution to be discarded and recalculated as necessary.")))));
 
-  update_screen_width();
   out << f->layout(screen_width, screen_width);
   delete f;
 }

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_search.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_search.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_search.cc	Sat Apr 30 23:30:23 2005
@@ -54,8 +54,6 @@
 
   _error->DumpErrors();
 
-  update_screen_width();
-
   if(!width.empty())
     {
       unsigned long tmp=screen_width;

Modified: branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/cmdline/cmdline_show.cc	Sat Apr 30 23:30:23 2005
@@ -404,8 +404,6 @@
 
 int cmdline_show(int argc, char *argv[], int verbose)
 {
-  update_screen_width();
-
   _error->DumpErrors();
 
   OpProgress progress;

Modified: branches/aptitude-0.3/aptitude/src/main.cc
==============================================================================
--- branches/aptitude-0.3/aptitude/src/main.cc	(original)
+++ branches/aptitude-0.3/aptitude/src/main.cc	Sat Apr 30 23:30:23 2005
@@ -24,6 +24,7 @@
 #endif
 
 #include <getopt.h>
+#include <signal.h>
 
 #include "aptitude.h"
 
@@ -40,6 +41,7 @@
 
 #include <cmdline/cmdline_changelog.h>
 #include <cmdline/cmdline_clean.h>
+#include <cmdline/cmdline_common.h>
 #include <cmdline/cmdline_do_action.h>
 #include <cmdline/cmdline_download.h>
 #include <cmdline/cmdline_dump_resolver.h>
@@ -336,6 +338,10 @@
 	  // command-line.
 	  consume_errors.connect(sigc::mem_fun(_error, &GlobalError::DumpErrors));
 
+	  // Read the terminal width and set up its update function.
+	  signal(SIGWINCH, update_screen_width);
+	  update_screen_width();
+
 	  if(update_only || install_only)
 	    {
 	      fprintf(stderr, "%s",