LaunchAPPLServer: Extend status display

LaunchAPPL/Server/StatusDisplay.cc

@@ -1,6 +1,22 @@
 #include "StatusDisplay.h"
 #include <Quickdraw.h>
 #include <Windows.h>
+#include <string.h>
+
+const short tableTop = 50;
+const short tableLineHeight = 20;
+const short tableBaseline = 15;
+
+enum class StatusDisplay::Stat : short
+{
+    heapSize,
+    freeMem,
+    fileSize,
+    transferred,
+    speed,
+    timeRemaining,
+    transmissionErrors
+};
 
 StatusDisplay::StatusDisplay()
 {
@@ -10,12 +26,48 @@ StatusDisplay::StatusDisplay()
 
     SetRect(&statusRect, 10, 0, bounds.right-10, 30);
     SetRect(&progressRect, 10, 30, bounds.right-10, 46);
-    SetRect(&memRect, 10, 70, bounds.right-10, 100);
+
+    memset(columnWidths, 0, sizeof(columnWidths));
+    columnWidths[1] = columnWidths[4] = 50;
+    
+    SetPort(statusWindow);
+    TextSize(9);
+    TextFace(bold);
+    for(int i = 0; i < 2 * nValues; i++)
+    {
+        Str255 str;
+        GetIndString(str, 129, i+1);
+        short& col = columnWidths[(i&1)*2 + (i&2)*3/2];
+        col = std::max(col, StringWidth(str));
+    }
+
+    for(int i = 0; i < nValues; i+=2)
+    {
+        SetRect(&valueRects[i],
+                10 + columnWidths[0],
+                tableTop + i/2 * tableLineHeight,
+                10 + columnWidths[0] + columnWidths[1],
+                tableTop + (i/2+1) * tableLineHeight);
+    }
+    for(int i = 1; i < nValues; i+=2)
+    {
+        SetRect(&valueRects[i],
+                bounds.right - 10 - columnWidths[5] - columnWidths[4],
+                tableTop + i/2 * tableLineHeight,
+                bounds.right - 10 - columnWidths[5],
+                tableTop + (i/2+1) * tableLineHeight);
+    }
+
     RgnHandle tmp = NewRgn();
     background = NewRgn();
     RectRgn(background, &bounds);
     RectRgn(tmp, &progressRect);
     DiffRgn(background, tmp, background);
+    for(int i = 0; i < nValues; i++)
+    {
+        RectRgn(tmp, &valueRects[i]);
+        DiffRgn(background, tmp, background);
+    }
     DisposeRgn(tmp);
 
     SetStatus(AppStatus::ready);
@@ -27,6 +79,24 @@ StatusDisplay::~StatusDisplay()
     DisposeRgn(background);
 }
 
+void StatusDisplay::DrawValue(Stat stat, ConstStr255Param str)
+{
+    Rect& r = valueRects[(short)stat];
+    MoveTo(r.right - StringWidth(str), r.top + tableBaseline);
+    EraseRect(&r);
+    DrawString(str);
+}
+void StatusDisplay::DrawValue(Stat stat, long val)
+{
+    Str255 str;
+    NumToString(val, str);
+    if(val >= 0)
+        DrawValue(stat, str);
+    else
+        DrawValue(stat, "\p--");
+}
+
+
 void StatusDisplay::Update()
 {
 #if TARGET_API_MAC_CARBON
@@ -37,6 +107,9 @@ void StatusDisplay::Update()
     BeginUpdate(statusWindow);
     EraseRgn(background);
 
+    TextSize(12);
+    TextFace(normal);
+
     MoveTo(statusRect.left,statusRect.bottom-10);
     DrawString(statusString);
 
@@ -58,23 +131,73 @@ void StatusDisplay::Update()
         EraseRect(&progressRect);
 
     Str255 str;
-    NumToString(freeMem, str);
-    MoveTo(memRect.left,memRect.bottom-10);
-    DrawString(str); DrawString("\p / ");
-    NumToString(ApplicationZone()->bkLim - (Ptr)ApplicationZone(), str);
-    DrawString(str); DrawString("\p bytes free");
+
+    TextSize(9);
+    TextFace(bold);
+
+    for(int i = 0; i < nValues; i++)
+    {
+        GetIndString(str, 129, (i*2)+1);
+        MoveTo(valueRects[i].left - StringWidth(str), valueRects[i].top + tableBaseline);
+        DrawString(str);
+        GetIndString(str, 129, (i*2)+2);
+        MoveTo(valueRects[i].right, valueRects[i].top + tableBaseline);
+        DrawString(str);
+    }
+
+    TextFace(normal);
+    DrawValue(Stat::heapSize, (ApplicationZone()->bkLim - (Ptr)ApplicationZone()) / 1024);
+    DrawValue(Stat::freeMem, freeMem);
+    if(progressTotal)
+    {
+        DrawValue(Stat::fileSize, progressTotal / 1024);
+        DrawValue(Stat::transferred, progressDone / 1024);
+    }
+    else
+    {
+        DrawValue(Stat::fileSize, "\p--");
+        DrawValue(Stat::transferred, "\p--");
+    }
+    DrawValue(Stat::speed, speed);
+    DrawValue(Stat::timeRemaining, timeRemaining);
+    DrawValue(Stat::transmissionErrors, errorCount);
 
     EndUpdate(statusWindow);
 }
 
 void StatusDisplay::Idle()
 {
-    long newFreeMem = FreeMem();
+    long newFreeMem = FreeMem() / 1024;
     if(newFreeMem != freeMem)
     {
         freeMem = newFreeMem;
         SetPort(statusWindow);
-        InvalRect(&memRect);
+        InvalRect(&valueRects[(short)Stat::freeMem]);
+    }
+
+    long newTimeRemaining = -1;
+    if(status == AppStatus::downloading)
+    {
+        long now = TickCount();
+        if(now - startTime > 60 && progressDone > 4000)
+        {
+            long newSpeed = progressDone * 6015LL / (now-startTime) / 100;
+            newTimeRemaining = (uint64_t(now-startTime) * (progressTotal - progressDone) * 100
+                            / progressDone + 6014) / 6015;
+            if(newSpeed != speed)
+            {
+                speed = newSpeed;
+                SetPort(statusWindow);
+                InvalRect(&valueRects[(short)Stat::speed]);
+            }
+        }
+    }
+
+    if(newTimeRemaining != timeRemaining)
+    {
+        timeRemaining = newTimeRemaining;
+        SetPort(statusWindow);
+        InvalRect(&valueRects[(short)Stat::timeRemaining]);
     }
 }
 
@@ -83,6 +206,8 @@ void StatusDisplay::SetStatus(AppStatus stat)
     if(stat != status)
     {
         status = stat;
+        if(status == AppStatus::downloading)
+            startTime = TickCount();
         GetIndString(statusString,128,(short)stat);
         SetPort(statusWindow);
         InvalRect(&statusRect);
@@ -93,10 +218,13 @@ void StatusDisplay::SetProgress(int done, int total)
 {
     if(done != progressDone || total != progressTotal)
     {
-        progressTotal = total;
-        progressDone = done;
         SetPort(statusWindow);
         InvalRect(&progressRect);
+        if(total != progressTotal)
+            InvalRect(&valueRects[(short)Stat::fileSize]);
+        InvalRect(&valueRects[(short)Stat::transferred]);
+        progressTotal = total;
+        progressDone = done;
     }
 }
 
@@ -105,3 +233,13 @@ void StatusDisplay::SetStatus(AppStatus stat, int done, int total)
     SetStatus(stat);
     SetProgress(done, total);
 }
+
+void StatusDisplay::SetErrorCount(int newErrorCount)
+{
+    if(newErrorCount != errorCount)
+    {
+        errorCount = newErrorCount;
+        SetPort(statusWindow);
+        InvalRect(&valueRects[(short)Stat::transmissionErrors]);
+    }
+}