From e7372d18a1a661d8c3dba9f51e1f17b5f94171a7 Mon Sep 17 00:00:00 2001
From: Daniel Lange <DLange@git.local>
Date: Wed, 10 Jan 2024 11:17:08 +0100
Subject: New upstream version 3.3.0

---
 Header.c | 43 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

(limited to 'Header.c')

diff --git a/Header.c b/Header.c
index 8dff89b..4fee26b 100644
--- a/Header.c
+++ b/Header.c
@@ -5,6 +5,8 @@ Released under the GNU GPLv2+, see the COPYING file
 in the source distribution for its full text.
 */
 
+#include "config.h" // IWYU pragma: keep
+
 #include "Header.h"
 
 #include <assert.h>
@@ -22,15 +24,15 @@ in the source distribution for its full text.
 #include "Object.h"
 #include "Platform.h"
 #include "ProvideCurses.h"
+#include "Settings.h"
 #include "XUtils.h"
 
 
-Header* Header_new(ProcessList* pl, Settings* settings, HeaderLayout hLayout) {
+Header* Header_new(Machine* host, HeaderLayout hLayout) {
    Header* this = xCalloc(1, sizeof(Header));
    this->columns = xMallocArray(HeaderLayout_getColumns(hLayout), sizeof(Vector*));
-   this->settings = settings;
-   this->pl = pl;
    this->headerLayout = hLayout;
+   this->host = host;
 
    Header_forEachColumn(this, i) {
       this->columns[i] = Vector_new(Class(Meter), true, DEFAULT_SIZE);
@@ -92,7 +94,8 @@ static void Header_addMeterByName(Header* this, const char* name, MeterModeId mo
             if ((end = strrchr(dynamic, ')')) == NULL)
                return;    // htoprc parse failure
             *end = '\0';
-            if (!DynamicMeter_search(this->pl->dynamicMeters, dynamic, &param))
+            const Settings* settings = this->host->settings;
+            if (!DynamicMeter_search(settings->dynamicMeters, dynamic, &param))
                return;    // name lookup failure
          } else {
             param = 0;
@@ -105,7 +108,7 @@ static void Header_addMeterByName(Header* this, const char* name, MeterModeId mo
 
    for (const MeterClass* const* type = Platform_meterTypes; *type; type++) {
       if (0 == strncmp(name, (*type)->name, nameLen) && (*type)->name[nameLen] == '\0') {
-         Meter* meter = Meter_new(this->pl, param, *type);
+         Meter* meter = Meter_new(this->host, param, *type);
          if (mode != 0) {
             Meter_setMode(meter, mode);
          }
@@ -116,10 +119,11 @@ static void Header_addMeterByName(Header* this, const char* name, MeterModeId mo
 }
 
 void Header_populateFromSettings(Header* this) {
-   Header_setLayout(this, this->settings->hLayout);
+   const Settings* settings = this->host->settings;
+   Header_setLayout(this, settings->hLayout);
 
    Header_forEachColumn(this, col) {
-      const MeterColumnSetting* colSettings = &this->settings->hColumns[col];
+      const MeterColumnSetting* colSettings = &settings->hColumns[col];
       Vector_prune(this->columns[col]);
       for (size_t i = 0; i < colSettings->len; i++) {
          Header_addMeterByName(this, colSettings->names[i], colSettings->modes[i], col);
@@ -130,10 +134,11 @@ void Header_populateFromSettings(Header* this) {
 }
 
 void Header_writeBackToSettings(const Header* this) {
-   Settings_setHeaderLayout(this->settings, this->headerLayout);
+   Settings* settings = this->host->settings;
+   Settings_setHeaderLayout(settings, this->headerLayout);
 
    Header_forEachColumn(this, col) {
-      MeterColumnSetting* colSettings = &this->settings->hColumns[col];
+      MeterColumnSetting* colSettings = &settings->hColumns[col];
 
       if (colSettings->names) {
          for (size_t j = 0; j < colSettings->len; j++)
@@ -153,7 +158,7 @@ void Header_writeBackToSettings(const Header* this) {
          const Meter* meter = (Meter*) Vector_get(vec, i);
          char* name;
          if (meter->param && As_Meter(meter) == &DynamicMeter_class) {
-            const char* dynamic = DynamicMeter_lookup(this->pl->dynamicMeters, meter->param);
+            const char* dynamic = DynamicMeter_lookup(settings->dynamicMeters, meter->param);
             xAsprintf(&name, "%s(%s)", As_Meter(meter)->name, dynamic);
          } else if (meter->param && As_Meter(meter) == &CPUMeter_class) {
             xAsprintf(&name, "%s(%u)", As_Meter(meter)->name, meter->param);
@@ -171,7 +176,7 @@ Meter* Header_addMeterByClass(Header* this, const MeterClass* type, unsigned int
 
    Vector* meters = this->columns[column];
 
-   Meter* meter = Meter_new(this->pl, param, type);
+   Meter* meter = Meter_new(this->host, param, type);
    Vector_add(meters, meter);
    return meter;
 }
@@ -273,7 +278,8 @@ static int calcColumnWidthCount(const Header* this, const Meter* curMeter, const
 }
 
 int Header_calculateHeight(Header* this) {
-   const int pad = this->settings->headerMargin ? 2 : 0;
+   const Settings* settings = this->host->settings;
+   const int pad = settings->headerMargin ? 2 : 0;
    int maxHeight = pad;
 
    Header_forEachColumn(this, col) {
@@ -286,10 +292,19 @@ int Header_calculateHeight(Header* this) {
       }
       maxHeight = MAXIMUM(maxHeight, height);
    }
-   if (this->settings->screenTabs) {
+
+   if (maxHeight == pad) {
+      maxHeight = 0;
+      this->pad = 0;
+   } else {
+      this->pad = pad;
+   }
+
+   if (settings->screenTabs) {
       maxHeight++;
    }
+
    this->height = maxHeight;
-   this->pad = pad;
+
    return maxHeight;
 }
-- 
cgit v1.2.3