Merge tag 'upstream/2.0.0'

Upstream version 2.0.0

1 files changed, 21 insertions, 19 deletions

diff --git a/Header.h b/Header.h
index e778459..772e25d 100644
--- a/Header.h
+++ b/Header.h
@@ -9,21 +9,17 @@ Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */
 
-#include "ProcessList.h"
 #include "Meter.h"
-
-typedef enum HeaderSide_ {
-   LEFT_HEADER,
-   RIGHT_HEADER
-} HeaderSide;
+#include "Settings.h"
+#include "Vector.h"
 
 typedef struct Header_ {
-   Vector* leftMeters;
-   Vector* rightMeters;
-   ProcessList* pl;
-   int height;
+   Vector** columns;
+   Settings* settings;
+   struct ProcessList_* pl;
+   int nrColumns;
    int pad;
-   bool margin;
+   int height;
 } Header;
 
 
@@ -31,23 +27,29 @@ typedef struct Header_ {
 #define MAX(a,b) ((a)>(b)?(a):(b))
 #endif
 
-Header* Header_new(ProcessList* pl);
+#ifndef Header_forEachColumn
+#define Header_forEachColumn(this_, i_) for (int i_=0; i_ < this->nrColumns; i_++)
+#endif
+
+Header* Header_new(struct ProcessList_* pl, Settings* settings, int nrColumns);
 
 void Header_delete(Header* this);
 
-void Header_createMeter(Header* this, char* name, HeaderSide side);
+void Header_populateFromSettings(Header* this);
+
+void Header_writeBackToSettings(const Header* this);
 
-void Header_setMode(Header* this, int i, MeterModeId mode, HeaderSide side);
+MeterModeId Header_addMeterByName(Header* this, char* name, int column);
 
-Meter* Header_addMeter(Header* this, MeterClass* type, int param, HeaderSide side);
+void Header_setMode(Header* this, int i, MeterModeId mode, int column);
 
-int Header_size(Header* this, HeaderSide side);
+Meter* Header_addMeterByClass(Header* this, MeterClass* type, int param, int column);
 
-char* Header_readMeterName(Header* this, int i, HeaderSide side);
+int Header_size(Header* this, int column);
 
-MeterModeId Header_readMeterMode(Header* this, int i, HeaderSide side);
+char* Header_readMeterName(Header* this, int i, int column);
 
-void Header_defaultMeters(Header* this, int cpuCount);
+MeterModeId Header_readMeterMode(Header* this, int i, int column);
 
 void Header_reinit(Header* this);