merge debian/sid into debian/experimental

[apt.git] / apt-pkg / install-progress.h

diff --git a/apt-pkg/install-progress.h b/apt-pkg/install-progress.h
index 8a5b68a8ff9335b55cd7c153f74630a135bc50e5..d8b4a5c8265b51b839ab8ec015985ed3295cb072 100644 (file)
--- a/apt-pkg/install-progress.h
+++ b/apt-pkg/install-progress.h
@@ -1,6 +1,8 @@
 #ifndef PKGLIB_IPROGRESS_H
 #define PKGLIB_IPROGRESS_H
 
 #ifndef PKGLIB_IPROGRESS_H
 #define PKGLIB_IPROGRESS_H
 

+#include <apt-pkg/macros.h>
+

 #include <string>
 #include <unistd.h>
 #include <signal.h>
 #include <string>
 #include <unistd.h>
 #include <signal.h>


@@ -24,16 +26,15 @@ namespace Progress {
     int last_reported_progress;
 
  public:
     int last_reported_progress;
 
  public:

-    PackageManager() 
-       : percentage(0.0), last_reported_progress(-1) {};
-    virtual ~PackageManager() {};
+    PackageManager();
+    virtual ~PackageManager();

 
     /* Global Start/Stop */
 
     /* Global Start/Stop */

-    virtual void Start(int child_pty=-1) {};
+    virtual void Start(int /*child_pty*/=-1) {};

     virtual void Stop() {};
 
     virtual void Stop() {};
 

-    /* When dpkg is invoked (may happen multiple times for each 
-     * install/remove block 
+    /* When dpkg is invoked (may happen multiple times for each
+     * install/remove block

     */
     virtual void StartDpkg() {};
 
     */
     virtual void StartDpkg() {};
 


@@ -44,18 +45,18 @@ namespace Progress {
          return 500000;
     };
 
          return 500000;
     };
 

-    virtual bool StatusChanged(std::string PackageName, 
+    virtual bool StatusChanged(std::string PackageName,

                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                unsigned int StepsDone,
                                unsigned int TotalSteps,

-                               std::string HumanReadableAction) ;
-    virtual void Error(std::string PackageName,                                
-                       unsigned int StepsDone,
-                       unsigned int TotalSteps,
-                       std::string ErrorMessage) {};
-    virtual void ConffilePrompt(std::string PackageName,
-                                unsigned int StepsDone,
-                                unsigned int TotalSteps,
-                                std::string ConfMessage) {};
+                               std::string HumanReadableAction);
+    virtual void Error(std::string /*PackageName*/,
+                       unsigned int /*StepsDone*/,
+                       unsigned int /*TotalSteps*/,
+                       std::string /*ErrorMessage*/) {}
+    virtual void ConffilePrompt(std::string /*PackageName*/,
+                                unsigned int /*StepsDone*/,
+                                unsigned int /*TotalSteps*/,
+                                std::string /*ConfMessage*/) {}

  };
 
  class PackageManagerProgressFd : public PackageManager
  };
 
  class PackageManagerProgressFd : public PackageManager


@@ -72,11 +73,11 @@ namespace Progress {
     virtual void StartDpkg();
     virtual void Stop();
 
     virtual void StartDpkg();
     virtual void Stop();
 

-    virtual bool StatusChanged(std::string PackageName, 
+    virtual bool StatusChanged(std::string PackageName,

                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);

-    virtual void Error(std::string PackageName,                                
+    virtual void Error(std::string PackageName,

                        unsigned int StepsDone,
                        unsigned int TotalSteps,
                           std::string ErrorMessage);
                        unsigned int StepsDone,
                        unsigned int TotalSteps,
                           std::string ErrorMessage);


@@ -101,11 +102,11 @@ namespace Progress {
     virtual void StartDpkg();
     virtual void Stop();
 
     virtual void StartDpkg();
     virtual void Stop();
 

-    virtual bool StatusChanged(std::string PackageName, 
+    virtual bool StatusChanged(std::string PackageName,

                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);

-    virtual void Error(std::string PackageName,                                
+    virtual void Error(std::string PackageName,

                        unsigned int StepsDone,
                        unsigned int TotalSteps,
                           std::string ErrorMessage);
                        unsigned int StepsDone,
                        unsigned int TotalSteps,
                           std::string ErrorMessage);


@@ -118,14 +119,20 @@ namespace Progress {
  class PackageManagerFancy : public PackageManager
  {
  private:
  class PackageManagerFancy : public PackageManager
  {
  private:

-    static void staticSIGWINCH(int);
+    APT_HIDDEN static void staticSIGWINCH(int);

     static std::vector<PackageManagerFancy*> instances;
     static std::vector<PackageManagerFancy*> instances;

+    APT_HIDDEN bool DrawStatusLine();

 
  protected:
     void SetupTerminalScrollArea(int nr_rows);
     void HandleSIGWINCH(int);
 
 
  protected:
     void SetupTerminalScrollArea(int nr_rows);
     void HandleSIGWINCH(int);
 

-    int GetNumberTerminalRows();
+    typedef struct {
+       int rows;
+       int columns;
+    } TermSize;
+    TermSize GetTerminalSize();
+

     sighandler_t old_SIGWINCH;
     int child_pty;
 
     sighandler_t old_SIGWINCH;
     int child_pty;
 


@@ -134,23 +141,27 @@ namespace Progress {
     ~PackageManagerFancy();
     virtual void Start(int child_pty=-1);
     virtual void Stop();
     ~PackageManagerFancy();
     virtual void Start(int child_pty=-1);
     virtual void Stop();

-    virtual bool StatusChanged(std::string PackageName, 
+    virtual bool StatusChanged(std::string PackageName,

                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);

+
+    // return a progress bar of the given size for the given progress 
+    // percent between 0.0 and 1.0 in the form "[####...]"
+    static std::string GetTextProgressStr(float percent, int OutputSize);

  };
 
  class PackageManagerText : public PackageManager
  {
  public:
  };
 
  class PackageManagerText : public PackageManager
  {
  public:

-    virtual bool StatusChanged(std::string PackageName, 
+    virtual bool StatusChanged(std::string PackageName,

                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);
  };
 
 
                                unsigned int StepsDone,
                                unsigned int TotalSteps,
                                std::string HumanReadableAction);
  };
 
 

-}; // namespace Progress
-}; // namespace APT
+} // namespace Progress
+} // namespace APT

 
 #endif
 
 #endif