X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/790d41f6372871e527f3fc9da66d049937b4c780..5e1ed0889d8aac82ca18add8c6139b153225ae71:/apt-pkg/install-progress.cc

diff --git a/apt-pkg/install-progress.cc b/apt-pkg/install-progress.cc
index f76fc88c2..0caf62b61 100644
--- a/apt-pkg/install-progress.cc
+++ b/apt-pkg/install-progress.cc
@@ -9,10 +9,15 @@
 #include <sys/ioctl.h>
 #include <sstream>
 #include <fcntl.h>
+#include <stdio.h>
 
 namespace APT {
 namespace Progress {
 
+
+/* Return a APT::Progress::PackageManager based on the global
+ * apt configuration (i.e. APT::Status-Fd and APT::Status-deb822-Fd)
+ */
 PackageManager* PackageManagerProgressFactory()
 {
    // select the right progress
@@ -217,6 +222,14 @@ bool PackageManagerProgressDeb822Fd::StatusChanged(std::string PackageName,
    return true;
 }
 
+int PackageManagerFancy::GetNumberTerminalRows()
+{
+   struct winsize win;
+   if(ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&win) != 0)
+      return -1;
+   
+   return win.ws_row;
+}
 
 void PackageManagerFancy::SetupTerminalScrollArea(int nr_rows)
 {
@@ -235,27 +248,41 @@ void PackageManagerFancy::SetupTerminalScrollArea(int nr_rows)
      static const char *move_cursor_up = "\033[1A";
      std::cout << move_cursor_up;
 
+     // setup env for (hopefully!) ncurses
+     string s;
+     strprintf(s, "%i", nr_rows);
+     setenv("LINES", s.c_str(), 1);
+
      std::flush(std::cout);
 }
 
 PackageManagerFancy::PackageManagerFancy()
-   : nr_terminal_rows(-1)
 {
-   struct winsize win;
-   if(ioctl(STDOUT_FILENO, TIOCGWINSZ, (char *)&win) == 0)
-   {
-      nr_terminal_rows = win.ws_row;
-   }
+   // setup terminal size
+   old_SIGWINCH = signal(SIGWINCH, HandleSIGWINCH);
+}
+
+PackageManagerFancy::~PackageManagerFancy()
+{
+   signal(SIGWINCH, old_SIGWINCH);
+}
+
+void PackageManagerFancy::HandleSIGWINCH(int)
+{
+   int nr_terminal_rows = GetNumberTerminalRows();
+   SetupTerminalScrollArea(nr_terminal_rows);
 }
 
 void PackageManagerFancy::Start()
 {
+   int nr_terminal_rows = GetNumberTerminalRows();
    if (nr_terminal_rows > 0)
       SetupTerminalScrollArea(nr_terminal_rows);
 }
 
 void PackageManagerFancy::Stop()
 {
+   int nr_terminal_rows = GetNumberTerminalRows();
    if (nr_terminal_rows > 0)
    {
       SetupTerminalScrollArea(nr_terminal_rows + 1);
@@ -275,7 +302,7 @@ bool PackageManagerFancy::StatusChanged(std::string PackageName,
           HumanReadableAction))
       return false;
 
-   int row = nr_terminal_rows;
+   int row = GetNumberTerminalRows();
 
    static string save_cursor = "\033[s";
    static string restore_cursor = "\033[u";