New upstream version 3.0.3upstream/3.0.3

1 files changed, 21 insertions, 9 deletions

diff --git a/Settings.h b/Settings.h
index e1518ec..752970a 100644
--- a/Settings.h
+++ b/Settings.h
@@ -3,14 +3,19 @@
 /*
 htop - Settings.h
 (C) 2004-2011 Hisham H. Muhammad
-Released under the GNU GPL, see the COPYING file
+Released under the GNU GPLv2, see the COPYING file
 in the source distribution for its full text.
 */
 
-#define DEFAULT_DELAY 15
+#include "config.h" // IWYU pragma: keep
 
-#include "Process.h"
 #include <stdbool.h>
+#include <stdint.h>
+
+#include "Process.h"
+
+
+#define DEFAULT_DELAY 15
 
 typedef struct {
    int len;
@@ -23,21 +28,23 @@ typedef struct Settings_ {
    MeterColumnSettings columns[2];
 
    ProcessField* fields;
-   int flags;
+   uint32_t flags;
    int colorScheme;
    int delay;
 
-   int cpuCount;
    int direction;
    ProcessField sortKey;
 
-   bool countCPUsFromZero;
+   bool countCPUsFromOne;
    bool detailedCPUTime;
    bool showCPUUsage;
    bool showCPUFrequency;
+   #ifdef HAVE_SENSORS_SENSORS_H
+   bool showCPUTemperature;
+   bool degreeFahrenheit;
+   #endif
    bool treeView;
    bool showProgramPath;
-   bool hideThreads;
    bool shadowOtherUsers;
    bool showThreadNames;
    bool hideKernelThreads;
@@ -45,6 +52,11 @@ typedef struct Settings_ {
    bool highlightBaseName;
    bool highlightMegabytes;
    bool highlightThreads;
+   bool highlightChanges;
+   int highlightDelaySecs;
+   bool findCommInCmdline;
+   bool stripExeFromCmdline;
+   bool showMergedCommand;
    bool updateProcessNames;
    bool accountGuestInCPUMeter;
    bool headerMargin;
@@ -56,13 +68,13 @@ typedef struct Settings_ {
    bool changed;
 } Settings;
 
-#define Settings_cpuId(settings, cpu) ((settings)->countCPUsFromZero ? (cpu) : (cpu)+1)
+#define Settings_cpuId(settings, cpu) ((settings)->countCPUsFromOne ? (cpu)+1 : (cpu))
 
 void Settings_delete(Settings* this);
 
 bool Settings_write(Settings* this);
 
-Settings* Settings_new(int cpuCount);
+Settings* Settings_new(int initialCpuCount);
 
 void Settings_invertSortOrder(Settings* this);