diff options
author | Daniel Lange <DLange@git.local> | 2020-12-07 10:26:01 +0100 |
---|---|---|
committer | Daniel Lange <DLange@git.local> | 2020-12-07 10:26:01 +0100 |
commit | 65357c8c46154de4e4eca14075bfe5523bb5fc14 (patch) | |
tree | 8f430ee5a0d5de377c4e7c94e47842a27c70d7e8 /Settings.h | |
parent | f80394a20254938142011855f2954b3f63fe5909 (diff) | |
download | debian_htop-65357c8c46154de4e4eca14075bfe5523bb5fc14.tar.gz debian_htop-65357c8c46154de4e4eca14075bfe5523bb5fc14.tar.bz2 debian_htop-65357c8c46154de4e4eca14075bfe5523bb5fc14.zip |
New upstream version 3.0.3upstream/3.0.3
Diffstat (limited to 'Settings.h')
-rw-r--r-- | Settings.h | 30 |
1 files changed, 21 insertions, 9 deletions
@@ -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); |