Update upstream source from tag 'upstream/3.0.5'

Update to upstream version '3.0.5'
with Debian dir 10922042e094a59dc72f9c39ddd4bfd59c7a302c

1 files changed, 16 insertions, 0 deletions

diff --git a/Settings.h b/Settings.h
index 752970a..fdaf3e3 100644
--- a/Settings.h
+++ b/Settings.h
@@ -33,7 +33,9 @@ typedef struct Settings_ {
    int delay;
 
    int direction;
+   int treeDirection;
    ProcessField sortKey;
+   ProcessField treeSortKey;
 
    bool countCPUsFromOne;
    bool detailedCPUTime;
@@ -44,6 +46,7 @@ typedef struct Settings_ {
    bool degreeFahrenheit;
    #endif
    bool treeView;
+   bool treeViewAlwaysByPID;
    bool showProgramPath;
    bool shadowOtherUsers;
    bool showThreadNames;
@@ -61,6 +64,7 @@ typedef struct Settings_ {
    bool accountGuestInCPUMeter;
    bool headerMargin;
    bool enableMouse;
+   int hideFunctionBar;  // 0 - off, 1 - on ESC until next input, 2 - permanently
    #ifdef HAVE_LIBHWLOC
    bool topologyAffinity;
    #endif
@@ -70,6 +74,16 @@ typedef struct Settings_ {
 
 #define Settings_cpuId(settings, cpu) ((settings)->countCPUsFromOne ? (cpu)+1 : (cpu))
 
+static inline ProcessField Settings_getActiveSortKey(const Settings* this) {
+   return (this->treeView)
+          ? (this->treeViewAlwaysByPID ? PID : this->treeSortKey)
+          : this->sortKey;
+}
+
+static inline int Settings_getActiveDirection(const Settings* this) {
+   return this->treeView ? this->treeDirection : this->direction;
+}
+
 void Settings_delete(Settings* this);
 
 bool Settings_write(Settings* this);
@@ -78,4 +92,6 @@ Settings* Settings_new(int initialCpuCount);
 
 void Settings_invertSortOrder(Settings* this);
 
+void Settings_setSortKey(Settings* this, ProcessField sortKey);
+
 #endif