Merge branch 'header_fmt' of cgzones/htop

1 files changed, 7 insertions, 3 deletions

diff --git a/Settings.h b/Settings.h
index a512341b..20f583c3 100644
--- a/Settings.h
+++ b/Settings.h
@@ -13,6 +13,7 @@ in the source distribution for its full text.
 #include <stdint.h>
 
 #include "Hashtable.h"
+#include "HeaderLayout.h"
 #include "Process.h"
 
 
@@ -21,15 +22,16 @@ in the source distribution for its full text.
 #define CONFIG_READER_MIN_VERSION 2
 
 typedef struct {
-   int len;
+   uint8_t len;
    char** names;
    int* modes;
-} MeterColumnSettings;
+} MeterColumnSetting;
 
 typedef struct Settings_ {
    char* filename;
    int config_version;
-   MeterColumnSettings columns[2];
+   HeaderLayout hLayout;
+   MeterColumnSetting* hColumns;
    Hashtable* dynamicColumns;
 
    ProcessField* fields;
@@ -107,4 +109,6 @@ void Settings_enableReadonly(void);
 
 bool Settings_isReadonly(void);
 
+void Settings_setHeaderLayout(Settings* this, HeaderLayout hLayout);
+
 #endif