Bump version to 2.2.0

With this commit:

* if pkgconfig is installed, it will expand the code inside the shell if, adding the pkgconfig-based tests for the dependencies of Linux delay accounting.
* if pkgconfig is not installed, it will add an error message inside the test of Linux delay accounting, telling the user to install pkgconfig and rebuild the configure script if they want to use Linux delay accounting.

The end result is:

* people running Linux
  * will not need pkgconfig when not using delay accounting
  * will need pkgconfig when using delay accounting
    * if they don't have it
      * they are told by configure they need to install it and re-run autogen.sh when running from Git
      * they are told by configure they need to install it and re-run configure when running from the tarball
* people not running Linux
  * will never need pkgconfig

...and in none of the above scenarios the generated configure script produces unexpanded macros for users checking out the sources from Git.

.gitignore

@@ -20,7 +20,6 @@ htop
 .deps/
 Makefile
 Makefile.in
-INSTALL
 aclocal.m4
 autom4te.cache/
 compile

Action.c

@@ -26,7 +26,6 @@ in the source distribution for its full text.
 #include <math.h>
 #include <pwd.h>
 #include <stdlib.h>
-#include <string.h>
 #include <stdbool.h>
 #include <sys/param.h>
 #include <sys/time.h>
@@ -81,7 +80,7 @@ Object* Action_pickFromVector(State* st, Panel* list, int x) {
       header->pl->following = pid;
       unfollow = true;
    }
-   ScreenManager_run(scr, &panelFocus, &ch, NULL);
+   ScreenManager_run(scr, &panelFocus, &ch);
    if (unfollow) {
       header->pl->following = -1;
    }
@@ -107,7 +106,7 @@ static void Action_runSetup(Settings* settings, const Header* header, ProcessLis
    CategoriesPanel_makeMetersPage(panelCategories);
    Panel* panelFocus;
    int ch;
-   ScreenManager_run(scr, &panelFocus, &ch, "Setup");
+   ScreenManager_run(scr, &panelFocus, &ch);
    ScreenManager_delete(scr);
    if (settings->changed) {
       Header_writeBackToSettings(header);
@@ -172,10 +171,9 @@ static bool collapseIntoParent(Panel* panel) {
 }
 
 Htop_Reaction Action_setSortKey(Settings* settings, ProcessField sortKey) {
-   ScreenSettings* ss = settings->ss;
-   ss->sortKey = sortKey;
-   ss->direction = 1;
-   ss->treeView = false;
+   settings->sortKey = sortKey;
+   settings->direction = 1;
+   settings->treeView = false;
    return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_UPDATE_PANELHDR | HTOP_KEEP_FOLLOWING;
 }
 
@@ -183,12 +181,11 @@ static Htop_Reaction sortBy(State* st) {
    Htop_Reaction reaction = HTOP_OK;
    Panel* sortPanel = Panel_new(0, 0, 0, 0, true, Class(ListItem), FunctionBar_newEnterEsc("Sort   ", "Cancel "));
    Panel_setHeader(sortPanel, "Sort by");
-   ScreenSettings* ss = st->settings->ss;
-   ProcessField* fields = ss->fields;
+   ProcessField* fields = st->settings->fields;
    for (int i = 0; fields[i]; i++) {
       char* name = String_trim(Process_fields[fields[i]].name);
       Panel_add(sortPanel, (Object*) ListItem_new(name, fields[i]));
-      if (fields[i] == ss->sortKey)
+      if (fields[i] == st->settings->sortKey)
          Panel_setSelected(sortPanel, i);
       free(name);
    }
@@ -237,9 +234,8 @@ static Htop_Reaction actionToggleProgramPath(State* st) {
 }
 
 static Htop_Reaction actionToggleTreeView(State* st) {
-   ScreenSettings* ss = st->settings->ss;
-   ss->treeView = !ss->treeView;
-   if (ss->treeView) ss->direction = 1;
+   st->settings->treeView = !st->settings->treeView;
+   if (st->settings->treeView) st->settings->direction = 1;
    ProcessList_expandTree(st->pl);
    return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR;
 }
@@ -267,7 +263,7 @@ static Htop_Reaction actionLowerPriority(State* st) {
 }
 
 static Htop_Reaction actionInvertSortOrder(State* st) {
-   ScreenSettings_invertSortOrder(st->settings->ss);
+   Settings_invertSortOrder(st->settings);
    return HTOP_REFRESH | HTOP_SAVE_SETTINGS;
 }
 
@@ -281,7 +277,7 @@ static Htop_Reaction actionExpandOrCollapse(State* st) {
 }
 
 static Htop_Reaction actionCollapseIntoParent(State* st) {
-   if (!st->settings->ss->treeView) {
+   if (!st->settings->treeView) {
       return HTOP_OK;
    }
    bool changed = collapseIntoParent(st->panel);
@@ -289,52 +285,13 @@ static Htop_Reaction actionCollapseIntoParent(State* st) {
 }
 
 static Htop_Reaction actionExpandCollapseOrSortColumn(State* st) {
-   return st->settings->ss->treeView ? actionExpandOrCollapse(st) : actionSetSortColumn(st);
+   return st->settings->treeView ? actionExpandOrCollapse(st) : actionSetSortColumn(st);
 }
 
 static Htop_Reaction actionQuit() {
    return HTOP_QUIT;
 }
 
-static Htop_Reaction actionNextScreen(State* st) {
-   Settings* settings = st->settings;
-   settings->ssIndex++;
-   if (settings->ssIndex == settings->nScreens) {
-      settings->ssIndex = 0;
-   }
-   settings->ss = settings->screens[settings->ssIndex];
-   return HTOP_REFRESH;
-}
-
-static Htop_Reaction actionPrevScreen(State* st) {
-   Settings* settings = st->settings;
-   if (settings->ssIndex == 0) {
-      settings->ssIndex = settings->nScreens - 1;
-   } else {
-      settings->ssIndex--;
-   }
-   settings->ss = settings->screens[settings->ssIndex];
-   return HTOP_REFRESH;
-}
-
-Htop_Reaction Action_setScreenTab(Settings* settings, int x) {
-   int s = 2;
-   for (unsigned int i = 0; i < settings->nScreens; i++) {
-      if (x < s) {
-         return 0;
-      }
-      const char* name = settings->screens[i]->name;
-      int len = strlen(name);
-      if (x <= s + len + 1) {
-         settings->ssIndex = i;
-         settings->ss = settings->screens[i];
-         return HTOP_REFRESH;
-      }
-      s += len + 3;
-   }
-   return 0;
-}
-
 static Htop_Reaction actionSetAffinity(State* st) {
    if (st->pl->cpuCount == 1)
       return HTOP_OK;
@@ -517,7 +474,7 @@ static Htop_Reaction actionHelp(State* st) {
       addattrstr(CRT_colors[CPU_NICE_TEXT], "low-priority"); addstr("/");
       addattrstr(CRT_colors[CPU_NORMAL], "normal"); addstr("/");
       addattrstr(CRT_colors[CPU_KERNEL], "kernel"); addstr("/");
-      addattrstr(CRT_colors[CPU_GUEST], "virtualiz");
+      addattrstr(CRT_colors[CPU_STEAL], "virtualiz");
       addattrstr(CRT_colors[BAR_SHADOW], "               used%");
    }
    addattrstr(CRT_colors[BAR_BORDER], "]");
@@ -639,7 +596,5 @@ void Action_setBindings(Htop_Action* keys) {
    keys['U'] = actionUntagAll;
    keys['c'] = actionTagAllChildren;
    keys['e'] = actionShowEnvScreen;
-   keys['\t'] = actionNextScreen;
-   keys[KEY_SHIFT_TAB] = actionPrevScreen;
 }
 

Action.h

@@ -49,8 +49,6 @@ Htop_Reaction Action_setSortKey(Settings* settings, ProcessField sortKey);
 
 // ----------------------------------------
 
-Htop_Reaction Action_setScreenTab(Settings* settings, int x);
-
 Htop_Reaction Action_follow(State* st);
 
 

CRT.c

@@ -42,7 +42,6 @@ in the source distribution for its full text.
 #define KEY_WHEELUP KEY_F(20)
 #define KEY_WHEELDOWN KEY_F(21)
 #define KEY_RECLICK KEY_F(22)
-#define KEY_SHIFT_TAB KEY_F(23)
 
 //#link curses
 
@@ -129,11 +128,6 @@ typedef enum ColorElements_ {
    CPU_SOFTIRQ,
    CPU_STEAL,
    CPU_GUEST,
-   PANEL_EDIT,
-   SCREENS_OTH_BORDER,
-   SCREENS_OTH_TEXT,
-   SCREENS_CUR_BORDER,
-   SCREENS_CUR_TEXT,
    LAST_COLORELEMENT
 } ColorElements;
 
@@ -238,11 +232,6 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_SOFTIRQ] = ColorPair(Magenta,Black),
       [CPU_STEAL] = ColorPair(Cyan,Black),
       [CPU_GUEST] = ColorPair(Cyan,Black),
-      [PANEL_EDIT] = ColorPair(White,Blue),
-      [SCREENS_OTH_BORDER] = ColorPair(Blue,Blue),
-      [SCREENS_OTH_TEXT] = ColorPair(Black,Blue),
-      [SCREENS_CUR_BORDER] = ColorPair(Green,Green),
-      [SCREENS_CUR_TEXT] = ColorPair(Black,Green),
    },
    [COLORSCHEME_MONOCHROME] = {
       [RESET_COLOR] = A_NORMAL,
@@ -302,11 +291,6 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_SOFTIRQ] = A_BOLD,
       [CPU_STEAL] = A_REVERSE,
       [CPU_GUEST] = A_REVERSE,
-      [PANEL_EDIT] = A_BOLD,
-      [SCREENS_OTH_BORDER] = A_DIM,
-      [SCREENS_OTH_TEXT] = A_DIM,
-      [SCREENS_CUR_BORDER] = A_REVERSE,
-      [SCREENS_CUR_TEXT] = A_REVERSE,
    },
    [COLORSCHEME_BLACKONWHITE] = {
       [RESET_COLOR] = ColorPair(Black,White),
@@ -366,11 +350,6 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_SOFTIRQ] = ColorPair(Blue,White),
       [CPU_STEAL] = ColorPair(Cyan,White),
       [CPU_GUEST] = ColorPair(Cyan,White),
-      [PANEL_EDIT] = ColorPair(White,Blue),
-      [SCREENS_OTH_BORDER] = A_BOLD | ColorPair(Black,White),
-      [SCREENS_OTH_TEXT] = A_BOLD | ColorPair(Black,White),
-      [SCREENS_CUR_BORDER] = ColorPair(Green,Green),
-      [SCREENS_CUR_TEXT] = ColorPair(Black,Green),
    },
    [COLORSCHEME_LIGHTTERMINAL] = {
       [RESET_COLOR] = ColorPair(Black,Black),
@@ -430,11 +409,6 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_SOFTIRQ] = ColorPair(Blue,Black),
       [CPU_STEAL] = ColorPair(Black,Black),
       [CPU_GUEST] = ColorPair(Black,Black),
-      [PANEL_EDIT] = ColorPair(White,Blue),
-      [SCREENS_OTH_BORDER] = ColorPair(Blue,Black),
-      [SCREENS_OTH_TEXT] = ColorPair(Blue,Black),
-      [SCREENS_CUR_BORDER] = ColorPair(Green,Green),
-      [SCREENS_CUR_TEXT] = ColorPair(Black,Green),
    },
    [COLORSCHEME_MIDNIGHT] = {
       [RESET_COLOR] = ColorPair(White,Blue),
@@ -494,11 +468,6 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_SOFTIRQ] = ColorPair(Black,Blue),
       [CPU_STEAL] = ColorPair(White,Blue),
       [CPU_GUEST] = ColorPair(White,Blue),
-      [PANEL_EDIT] = ColorPair(White,Blue),
-      [SCREENS_OTH_BORDER] = A_BOLD | ColorPair(Yellow,Blue),
-      [SCREENS_OTH_TEXT] = ColorPair(Cyan,Blue),
-      [SCREENS_CUR_BORDER] = ColorPair(Cyan,Cyan),
-      [SCREENS_CUR_TEXT] = ColorPair(Black,Cyan),
    },
    [COLORSCHEME_BLACKNIGHT] = {
       [RESET_COLOR] = ColorPair(Cyan,Black),
@@ -558,15 +527,12 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [CPU_SOFTIRQ] = ColorPair(Blue,Black),
       [CPU_STEAL] = ColorPair(Cyan,Black),
       [CPU_GUEST] = ColorPair(Cyan,Black),
-      [PANEL_EDIT] = ColorPair(White,Cyan),
-      [SCREENS_OTH_BORDER] = ColorPair(White,Black),
-      [SCREENS_OTH_TEXT] = ColorPair(Cyan,Black),
-      [SCREENS_CUR_BORDER] = A_BOLD | ColorPair(White,Black),
-      [SCREENS_CUR_TEXT] = A_BOLD | ColorPair(Green,Black),
    },
    [COLORSCHEME_BROKENGRAY] = { 0 } // dynamically generated.
 };
 
+int CRT_cursorX = 0;
+
 int CRT_scrollHAmount = 5;
 
 int CRT_scrollWheelVAmount = 10;
@@ -675,16 +641,12 @@ void CRT_init(int delay, int colorScheme) {
       define_key("\033[13~", KEY_F(3));
       define_key("\033[14~", KEY_F(4));
       define_key("\033[17;2~", KEY_F(18));
-      define_key("\033[Z", KEY_SHIFT_TAB);
       char sequence[3] = "\033a";
       for (char c = 'a'; c <= 'z'; c++) {
          sequence[1] = c;
          define_key(sequence, KEY_ALT('A' + (c - 'a')));
       }
    }
-   if (String_startsWith(CRT_termType, "rxvt")) {
-      define_key("\033[Z", KEY_SHIFT_TAB);
-   }
 #ifndef DEBUG
    signal(11, CRT_handleSIGSEGV);
 #endif

CRT.h

@@ -31,7 +31,6 @@ in the source distribution for its full text.
 #define KEY_WHEELUP KEY_F(20)
 #define KEY_WHEELDOWN KEY_F(21)
 #define KEY_RECLICK KEY_F(22)
-#define KEY_SHIFT_TAB KEY_F(23)
 
 //#link curses
 
@@ -117,11 +116,6 @@ typedef enum ColorElements_ {
    CPU_SOFTIRQ,
    CPU_STEAL,
    CPU_GUEST,
-   PANEL_EDIT,
-   SCREENS_OTH_BORDER,
-   SCREENS_OTH_TEXT,
-   SCREENS_CUR_BORDER,
-   SCREENS_CUR_TEXT,
    LAST_COLORELEMENT
 } ColorElements;
 
@@ -150,6 +144,8 @@ int* CRT_colors;
 
 extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
 
+extern int CRT_cursorX;
+
 extern int CRT_scrollHAmount;
 
 extern int CRT_scrollWheelVAmount;

CategoriesPanel.c

@@ -10,7 +10,7 @@ in the source distribution for its full text.
 #include "AvailableMetersPanel.h"
 #include "MetersPanel.h"
 #include "DisplayOptionsPanel.h"
-#include "ScreensPanel.h"
+#include "ColumnsPanel.h"
 #include "ColorsPanel.h"
 #include "AvailableColumnsPanel.h"
 
@@ -64,11 +64,9 @@ static void CategoriesPanel_makeColorsPage(CategoriesPanel* this) {
    ScreenManager_add(this->scr, colors, -1);
 }
 
-static void CategoriesPanel_makeScreensPage(CategoriesPanel* this) {
-   Panel* screens = (Panel*) ScreensPanel_new(this->settings);
-   Panel* columns = (Panel*) ((ScreensPanel*)screens)->columns;
+static void CategoriesPanel_makeColumnsPage(CategoriesPanel* this) {
+   Panel* columns = (Panel*) ColumnsPanel_new(this->settings);
    Panel* availableColumns = (Panel*) AvailableColumnsPanel_new(columns);
-   ScreenManager_add(this->scr, screens, 20);
    ScreenManager_add(this->scr, columns, 20);
    ScreenManager_add(this->scr, availableColumns, -1);
 }
@@ -120,7 +118,7 @@ static HandlerResult CategoriesPanel_eventHandler(Panel* super, int ch) {
             CategoriesPanel_makeColorsPage(this);
             break;
          case 3:
-            CategoriesPanel_makeScreensPage(this);
+            CategoriesPanel_makeColumnsPage(this);
             break;
       }
    }
@@ -145,10 +143,10 @@ CategoriesPanel* CategoriesPanel_new(ScreenManager* scr, Settings* settings, Hea
    this->settings = settings;
    this->header = header;
    this->pl = pl;
-   Panel_setHeader(super, "Categories");
+   Panel_setHeader(super, "Setup");
    Panel_add(super, (Object*) ListItem_new("Meters", 0));
    Panel_add(super, (Object*) ListItem_new("Display options", 0));
    Panel_add(super, (Object*) ListItem_new("Colors", 0));
-   Panel_add(super, (Object*) ListItem_new("Screens", 0));
+   Panel_add(super, (Object*) ListItem_new("Columns", 0));
    return this;
 }

ColumnsPanel.c

@@ -22,9 +22,8 @@ in the source distribution for its full text.
 
 typedef struct ColumnsPanel_ {
    Panel super;
-   ScreenSettings* ss;
-   bool* changed;
 
+   Settings* settings;
    bool moving;
 } ColumnsPanel;
 
@@ -124,31 +123,22 @@ PanelClass ColumnsPanel_class = {
    .eventHandler = ColumnsPanel_eventHandler
 };
 
-void ColumnsPanel_fill(ColumnsPanel* this, ScreenSettings* ss) {
-   Panel* super = (Panel*) this;
-   Panel_prune(super);
-   ProcessField* fields = ss->fields;
-   for (; *fields; fields++) {
-      if (Process_fields[*fields].name) {
-         Panel_add(super, (Object*) ListItem_new(Process_fields[*fields].name, *fields));
-      }
-   }
-   this->ss = ss;
-}
-
-ColumnsPanel* ColumnsPanel_new(ScreenSettings* ss, bool* changed) {
+ColumnsPanel* ColumnsPanel_new(Settings* settings) {
    ColumnsPanel* this = AllocThis(ColumnsPanel);
    Panel* super = (Panel*) this;
    FunctionBar* fuBar = FunctionBar_new(ColumnsFunctions, NULL, NULL);
    Panel_init(super, 1, 1, 1, 1, Class(ListItem), true, fuBar);
 
-   this->ss = ss;
-   this->changed = changed;
+   this->settings = settings;
    this->moving = false;
    Panel_setHeader(super, "Active Columns");
-   
-   ColumnsPanel_fill(this, ss);
 
+   ProcessField* fields = this->settings->fields;
+   for (; *fields; fields++) {
+      if (Process_fields[*fields].name) {
+         Panel_add(super, (Object*) ListItem_new(Process_fields[*fields].name, *fields));
+      }
+   }
    return this;
 }
 
@@ -164,14 +154,14 @@ int ColumnsPanel_fieldNameToIndex(const char* name) {
 void ColumnsPanel_update(Panel* super) {
    ColumnsPanel* this = (ColumnsPanel*) super;
    int size = Panel_size(super);
-   *(this->changed) = true;
-   this->ss->fields = xRealloc(this->ss->fields, sizeof(ProcessField) * (size+1));
-   this->ss->flags = 0;
+   this->settings->changed = true;
+   this->settings->fields = xRealloc(this->settings->fields, sizeof(ProcessField) * (size+1));
+   this->settings->flags = 0;
    for (int i = 0; i < size; i++) {
       int key = ((ListItem*) Panel_get(super, i))->key;
-      this->ss->fields[i] = key;
-      this->ss->flags |= key < 1000 ? Process_fields[key].flags : 0;
+      this->settings->fields[i] = key;
+      this->settings->flags |= Process_fields[key].flags;
    }
-   this->ss->fields[size] = 0;
+   this->settings->fields[size] = 0;
 }
 

ColumnsPanel.h

@@ -14,18 +14,15 @@ in the source distribution for its full text.
 
 typedef struct ColumnsPanel_ {
    Panel super;
-   ScreenSettings* ss;
-   bool* changed;
 
+   Settings* settings;
    bool moving;
 } ColumnsPanel;
 
 
 extern PanelClass ColumnsPanel_class;
 
-void ColumnsPanel_fill(ColumnsPanel* this, ScreenSettings* ss);
-
-ColumnsPanel* ColumnsPanel_new(ScreenSettings* ss, bool* changed);
+ColumnsPanel* ColumnsPanel_new(Settings* settings);
 
 int ColumnsPanel_fieldNameToIndex(const char* name);
 

DisplayOptionsPanel.c

@@ -83,6 +83,7 @@ DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager*
    this->scr = scr;
 
    Panel_setHeader(super, "Display options");
+   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Tree view"), &(settings->treeView)));
    Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Shadow other users' processes"), &(settings->shadowOtherUsers)));
    Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Hide kernel threads"), &(settings->hideKernelThreads)));
    Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Hide userland process threads"), &(settings->hideUserlandThreads)));
@@ -96,6 +97,5 @@ DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager*
    Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Count CPUs from 0 instead of 1"), &(settings->countCPUsFromZero)));
    Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Update process names on every refresh"), &(settings->updateProcessNames)));
    Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Add guest time in CPU meter percentage"), &(settings->accountGuestInCPUMeter)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Show tabs for screens"), &(settings->screenTabs)));
    return this;
 }

FunctionBar.c

@@ -96,12 +96,11 @@ void FunctionBar_setLabel(FunctionBar* this, int event, const char* text) {
    }
 }
 
-int FunctionBar_draw(const FunctionBar* this, char* buffer) {
-   return FunctionBar_drawAttr(this, buffer, CRT_colors[FUNCTION_BAR]);
+void FunctionBar_draw(const FunctionBar* this, char* buffer) {
+   FunctionBar_drawAttr(this, buffer, CRT_colors[FUNCTION_BAR]);
 }
 
-int FunctionBar_drawAttr(const FunctionBar* this, char* buffer, int attr) {
-   int cursorX = 0;
+void FunctionBar_drawAttr(const FunctionBar* this, char* buffer, int attr) {
    attrset(CRT_colors[FUNCTION_BAR]);
    mvhline(LINES-1, 0, ' ', COLS);
    int x = 0;
@@ -116,10 +115,12 @@ int FunctionBar_drawAttr(const FunctionBar* this, char* buffer, int attr) {
    if (buffer) {
       attrset(attr);
       mvaddstr(LINES-1, x, buffer);
-      cursorX = x + strlen(buffer);
+      CRT_cursorX = x + strlen(buffer);
+      curs_set(1);
+   } else {
+      curs_set(0);
    }
    attrset(CRT_colors[RESET_COLOR]);
-   return cursorX;
 }
 
 int FunctionBar_synthesizeEvent(const FunctionBar* this, int pos) {

FunctionBar.h

@@ -30,9 +30,9 @@ void FunctionBar_delete(FunctionBar* this);
 
 void FunctionBar_setLabel(FunctionBar* this, int event, const char* text);
 
-int FunctionBar_draw(const FunctionBar* this, char* buffer);
+void FunctionBar_draw(const FunctionBar* this, char* buffer);
 
-int FunctionBar_drawAttr(const FunctionBar* this, char* buffer, int attr);
+void FunctionBar_drawAttr(const FunctionBar* this, char* buffer, int attr);
 
 int FunctionBar_synthesizeEvent(const FunctionBar* this, int pos);
 

Header.c

@@ -62,7 +62,7 @@ void Header_delete(Header* this) {
 
 void Header_populateFromSettings(Header* this) {
    Header_forEachColumn(this, col) {
-      MeterColumnSettings* colSettings = &this->settings->meterColumns[col];
+      MeterColumnSettings* colSettings = &this->settings->columns[col];
       for (int i = 0; i < colSettings->len; i++) {
          Header_addMeterByName(this, colSettings->names[i], col);
          if (colSettings->modes[i] != 0) {
@@ -75,7 +75,7 @@ void Header_populateFromSettings(Header* this) {
 
 void Header_writeBackToSettings(const Header* this) {
    Header_forEachColumn(this, col) {
-      MeterColumnSettings* colSettings = &this->settings->meterColumns[col];
+      MeterColumnSettings* colSettings = &this->settings->columns[col];
       
       String_freeArray(colSettings->names);
       free(colSettings->modes);
@@ -211,9 +211,6 @@ int Header_calculateHeight(Header* this) {
       }
       maxHeight = MAX(maxHeight, height);
    }
-   if (this->settings->screenTabs) {
-      maxHeight++;
-   }
    this->height = maxHeight;
    this->pad = pad;
    return maxHeight;

INSTALL

@@ -0,0 +1,370 @@
+Installation Instructions
+*************************
+
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
+Inc.
+
+   Copying and distribution of this file, with or without modification,
+are permitted in any medium without royalty provided the copyright
+notice and this notice are preserved.  This file is offered as-is,
+without warranty of any kind.
+
+Basic Installation
+==================
+
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
+more-detailed instructions are generic; see the `README' file for
+instructions specific to this package.  Some packages provide this
+`INSTALL' file but do not implement all of the features documented
+below.  The lack of an optional feature in a given package is not
+necessarily a bug.  More recommendations for GNU packages can be found
+in *note Makefile Conventions: (standards)Makefile Conventions.
+
+   The `configure' shell script attempts to guess correct values for
+various system-dependent variables used during compilation.  It uses
+those values to create a `Makefile' in each directory of the package.
+It may also create one or more `.h' files containing system-dependent
+definitions.  Finally, it creates a shell script `config.status' that
+you can run in the future to recreate the current configuration, and a
+file `config.log' containing compiler output (useful mainly for
+debugging `configure').
+
+   It can also use an optional file (typically called `config.cache'
+and enabled with `--cache-file=config.cache' or simply `-C') that saves
+the results of its tests to speed up reconfiguring.  Caching is
+disabled by default to prevent problems with accidental use of stale
+cache files.
+
+   If you need to do unusual things to compile the package, please try
+to figure out how `configure' could check whether to do them, and mail
+diffs or instructions to the address given in the `README' so they can
+be considered for the next release.  If you are using the cache, and at
+some point `config.cache' contains results you don't want to keep, you
+may remove or edit it.
+
+   The file `configure.ac' (or `configure.in') is used to create
+`configure' by a program called `autoconf'.  You need `configure.ac' if
+you want to change it or regenerate `configure' using a newer version
+of `autoconf'.
+
+   The simplest way to compile this package is:
+
+  1. `cd' to the directory containing the package's source code and type
+     `./configure' to configure the package for your system.
+
+     Running `configure' might take a while.  While running, it prints
+     some messages telling which features it is checking for.
+
+  2. Type `make' to compile the package.
+
+  3. Optionally, type `make check' to run any self-tests that come with
+     the package, generally using the just-built uninstalled binaries.
+
+  4. Type `make install' to install the programs and any data files and
+     documentation.  When installing into a prefix owned by root, it is
+     recommended that the package be configured and built as a regular
+     user, and only the `make install' phase executed with root
+     privileges.
+
+  5. Optionally, type `make installcheck' to repeat any self-tests, but
+     this time using the binaries in their final installed location.
+     This target does not install anything.  Running this target as a
+     regular user, particularly if the prior `make install' required
+     root privileges, verifies that the installation completed
+     correctly.
+
+  6. You can remove the program binaries and object files from the
+     source code directory by typing `make clean'.  To also remove the
+     files that `configure' created (so you can compile the package for
+     a different kind of computer), type `make distclean'.  There is
+     also a `make maintainer-clean' target, but that is intended mainly
+     for the package's developers.  If you use it, you may have to get
+     all sorts of other programs in order to regenerate files that came
+     with the distribution.
+
+  7. Often, you can also type `make uninstall' to remove the installed
+     files again.  In practice, not all packages have tested that
+     uninstallation works correctly, even though it is required by the
+     GNU Coding Standards.
+
+  8. Some packages, particularly those that use Automake, provide `make
+     distcheck', which can by used by developers to test that all other
+     targets like `make install' and `make uninstall' work correctly.
+     This target is generally not run by end users.
+
+Compilers and Options
+=====================
+
+   Some systems require unusual options for compilation or linking that
+the `configure' script does not know about.  Run `./configure --help'
+for details on some of the pertinent environment variables.
+
+   You can give `configure' initial values for configuration parameters
+by setting variables in the command line or in the environment.  Here
+is an example:
+
+     ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+
+   *Note Defining Variables::, for more details.
+
+Compiling For Multiple Architectures
+====================================
+
+   You can compile the package for more than one kind of computer at the
+same time, by placing the object files for each architecture in their
+own directory.  To do this, you can use GNU `make'.  `cd' to the
+directory where you want the object files and executables to go and run
+the `configure' script.  `configure' automatically checks for the
+source code in the directory that `configure' is in and in `..'.  This
+is known as a "VPATH" build.
+
+   With a non-GNU `make', it is safer to compile the package for one
+architecture at a time in the source code directory.  After you have
+installed the package for one architecture, use `make distclean' before
+reconfiguring for another architecture.
+
+   On MacOS X 10.5 and later systems, you can create libraries and
+executables that work on multiple system types--known as "fat" or
+"universal" binaries--by specifying multiple `-arch' options to the
+compiler but only a single `-arch' option to the preprocessor.  Like
+this:
+
+     ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
+                 CPP="gcc -E" CXXCPP="g++ -E"
+
+   This is not guaranteed to produce working output in all cases, you
+may have to build one architecture at a time and combine the results
+using the `lipo' tool if you have problems.
+
+Installation Names
+==================
+
+   By default, `make install' installs the package's commands under
+`/usr/local/bin', include files under `/usr/local/include', etc.  You
+can specify an installation prefix other than `/usr/local' by giving
+`configure' the option `--prefix=PREFIX', where PREFIX must be an
+absolute file name.
+
+   You can specify separate installation prefixes for
+architecture-specific files and architecture-independent files.  If you
+pass the option `--exec-prefix=PREFIX' to `configure', the package uses
+PREFIX as the prefix for installing programs and libraries.
+Documentation and other data files still use the regular prefix.
+
+   In addition, if you use an unusual directory layout you can give
+options like `--bindir=DIR' to specify different values for particular
+kinds of files.  Run `configure --help' for a list of the directories
+you can set and what kinds of files go in them.  In general, the
+default for these options is expressed in terms of `${prefix}', so that
+specifying just `--prefix' will affect all of the other directory
+specifications that were not explicitly provided.
+
+   The most portable way to affect installation locations is to pass the
+correct locations to `configure'; however, many packages provide one or
+both of the following shortcuts of passing variable assignments to the
+`make install' command line to change installation locations without
+having to reconfigure or recompile.
+
+   The first method involves providing an override variable for each
+affected directory.  For example, `make install
+prefix=/alternate/directory' will choose an alternate location for all
+directory configuration variables that were expressed in terms of
+`${prefix}'.  Any directories that were specified during `configure',
+but not in terms of `${prefix}', must each be overridden at install
+time for the entire installation to be relocated.  The approach of
+makefile variable overrides for each directory variable is required by
+the GNU Coding Standards, and ideally causes no recompilation.
+However, some platforms have known limitations with the semantics of
+shared libraries that end up requiring recompilation when using this
+method, particularly noticeable in packages that use GNU Libtool.
+
+   The second method involves providing the `DESTDIR' variable.  For
+example, `make install DESTDIR=/alternate/directory' will prepend
+`/alternate/directory' before all installation names.  The approach of
+`DESTDIR' overrides is not required by the GNU Coding Standards, and
+does not work on platforms that have drive letters.  On the other hand,
+it does better at avoiding recompilation issues, and works well even
+when some directory options were not specified in terms of `${prefix}'
+at `configure' time.
+
+Optional Features
+=================
+
+   If the package supports it, you can cause programs to be installed
+with an extra prefix or suffix on their names by giving `configure' the
+option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
+
+   Some packages pay attention to `--enable-FEATURE' options to
+`configure', where FEATURE indicates an optional part of the package.
+They may also pay attention to `--with-PACKAGE' options, where PACKAGE
+is something like `gnu-as' or `x' (for the X Window System).  The
+`README' should mention any `--enable-' and `--with-' options that the
+package recognizes.
+
+   For packages that use the X Window System, `configure' can usually
+find the X include and library files automatically, but if it doesn't,
+you can use the `configure' options `--x-includes=DIR' and
+`--x-libraries=DIR' to specify their locations.
+
+   Some packages offer the ability to configure how verbose the
+execution of `make' will be.  For these packages, running `./configure
+--enable-silent-rules' sets the default to minimal output, which can be
+overridden with `make V=1'; while running `./configure
+--disable-silent-rules' sets the default to verbose, which can be
+overridden with `make V=0'.
+
+Particular systems
+==================
+
+   On HP-UX, the default C compiler is not ANSI C compatible.  If GNU
+CC is not installed, it is recommended to use the following options in
+order to use an ANSI C compiler:
+
+     ./configure CC="cc -Ae -D_XOPEN_SOURCE=500"
+
+and if that doesn't work, install pre-built binaries of GCC for HP-UX.
+
+   HP-UX `make' updates targets which have the same time stamps as
+their prerequisites, which makes it generally unusable when shipped
+generated files such as `configure' are involved.  Use GNU `make'
+instead.
+
+   On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
+parse its `<wchar.h>' header file.  The option `-nodtk' can be used as
+a workaround.  If GNU CC is not installed, it is therefore recommended
+to try
+
+     ./configure CC="cc"
+
+and if that doesn't work, try
+
+     ./configure CC="cc -nodtk"
+
+   On Solaris, don't put `/usr/ucb' early in your `PATH'.  This
+directory contains several dysfunctional programs; working variants of
+these programs are available in `/usr/bin'.  So, if you need `/usr/ucb'
+in your `PATH', put it _after_ `/usr/bin'.
+
+   On Haiku, software installed for all users goes in `/boot/common',
+not `/usr/local'.  It is recommended to use the following options:
+
+     ./configure --prefix=/boot/common
+
+Specifying the System Type
+==========================
+
+   There may be some features `configure' cannot figure out
+automatically, but needs to determine by the type of machine the package
+will run on.  Usually, assuming the package is built to be run on the
+_same_ architectures, `configure' can figure that out, but if it prints
+a message saying it cannot guess the machine type, give it the
+`--build=TYPE' option.  TYPE can either be a short name for the system
+type, such as `sun4', or a canonical name which has the form:
+
+     CPU-COMPANY-SYSTEM
+
+where SYSTEM can have one of these forms:
+
+     OS
+     KERNEL-OS
+
+   See the file `config.sub' for the possible values of each field.  If
+`config.sub' isn't included in this package, then this package doesn't
+need to know the machine type.
+
+   If you are _building_ compiler tools for cross-compiling, you should
+use the option `--target=TYPE' to select the type of system they will
+produce code for.
+
+   If you want to _use_ a cross compiler, that generates code for a
+platform different from the build platform, you should specify the
+"host" platform (i.e., that on which the generated programs will
+eventually be run) with `--host=TYPE'.
+
+Sharing Defaults
+================
+
+   If you want to set default values for `configure' scripts to share,
+you can create a site shell script called `config.site' that gives
+default values for variables like `CC', `cache_file', and `prefix'.
+`configure' looks for `PREFIX/share/config.site' if it exists, then
+`PREFIX/etc/config.site' if it exists.  Or, you can set the
+`CONFIG_SITE' environment variable to the location of the site script.
+A warning: not all `configure' scripts look for a site script.
+
+Defining Variables
+==================
+
+   Variables not defined in a site shell script can be set in the
+environment passed to `configure'.  However, some packages may run
+configure again during the build, and the customized values of these
+variables may be lost.  In order to avoid this problem, you should set
+them in the `configure' command line, using `VAR=value'.  For example:
+
+     ./configure CC=/usr/local2/bin/gcc
+
+causes the specified `gcc' to be used as the C compiler (unless it is
+overridden in the site shell script).
+
+Unfortunately, this technique does not work for `CONFIG_SHELL' due to
+an Autoconf limitation.  Until the limitation is lifted, you can use
+this workaround:
+
+     CONFIG_SHELL=/bin/bash ./configure CONFIG_SHELL=/bin/bash
+
+`configure' Invocation
+======================
+
+   `configure' recognizes the following options to control how it
+operates.
+
+`--help'
+`-h'
+     Print a summary of all of the options to `configure', and exit.
+
+`--help=short'
+`--help=recursive'
+     Print a summary of the options unique to this package's
+     `configure', and exit.  The `short' variant lists options used
+     only in the top level, while the `recursive' variant lists options
+     also present in any nested packages.
+
+`--version'
+`-V'
+     Print the version of Autoconf used to generate the `configure'
+     script, and exit.
+
+`--cache-file=FILE'
+     Enable the cache: use and save the results of the tests in FILE,
+     traditionally `config.cache'.  FILE defaults to `/dev/null' to
+     disable caching.
+
+`--config-cache'
+`-C'
+     Alias for `--cache-file=config.cache'.
+
+`--quiet'
+`--silent'
+`-q'
+     Do not print messages saying which checks are being made.  To
+     suppress all normal output, redirect it to `/dev/null' (any error
+     messages will still be shown).
+
+`--srcdir=DIR'
+     Look for the package's source code in directory DIR.  Usually
+     `configure' can determine that directory automatically.
+
+`--prefix=DIR'
+     Use DIR as the installation prefix.  *note Installation Names::
+     for more details, including other options available for fine-tuning
+     the installation locations.
+
+`--no-create'
+`-n'
+     Run the configure checks, but stop before creating any output
+     files.
+
+`configure' also accepts some other, not widely useful, options.  Run
+`configure --help' for more details.

IncSet.c

@@ -38,7 +38,6 @@ typedef struct IncMode_ {
 typedef struct IncSet_ {
    IncMode modes[2];
    IncMode* active;
-   Panel* panel;
    FunctionBar* defaultBar;
    bool filtering;
    bool found;
@@ -116,35 +115,23 @@ static void updateWeakPanel(IncSet* this, Panel* panel, Vector* lines) {
    }
 }
 
-static bool search(IncSet* this, Panel* panel, IncMode_GetPanelValue getPanelValue) {
+static bool search(IncMode* mode, Panel* panel, IncMode_GetPanelValue getPanelValue) {
    int size = Panel_size(panel);
    bool found = false;
    for (int i = 0; i < size; i++) {
-      if (String_contains_i(getPanelValue(panel, i), this->active->buffer)) {
+      if (String_contains_i(getPanelValue(panel, i), mode->buffer)) {
          Panel_setSelected(panel, i);
          found = true;
          break;
       }
    }
-   IncSet_drawBar(this, found ? CRT_colors[FUNCTION_BAR] : CRT_colors[FAILED_SEARCH]);
+   if (found)
+      FunctionBar_draw(mode->bar, mode->buffer);
+   else
+      FunctionBar_drawAttr(mode->bar, mode->buffer, CRT_colors[FAILED_SEARCH]);
    return found;
 }
 
-void IncSet_activate(IncSet* this, IncType type, Panel* panel) {
-   this->active = &(this->modes[type]);
-   panel->currentBar = this->active->bar;
-   panel->cursorOn = true;
-   this->panel = panel;
-   IncSet_drawBar(this, CRT_colors[FUNCTION_BAR]);
-}
-
-static void IncSet_deactivate(IncSet* this, Panel* panel) {
-   this->active = NULL;
-   Panel_setDefaultBar(panel);
-   panel->cursorOn = false;
-   FunctionBar_draw(this->defaultBar, NULL);
-}
-
 bool IncSet_handleKey(IncSet* this, int ch, Panel* panel, IncMode_GetPanelValue getPanelValue, Vector* lines) {
    if (ch == ERR)
       return true;
@@ -202,11 +189,13 @@ bool IncSet_handleKey(IncSet* this, int ch, Panel* panel, IncMode_GetPanelValue
       } else {
          IncMode_reset(mode);
       }
-      IncSet_deactivate(this, panel);
+      this->active = NULL;
+      Panel_setDefaultBar(panel);
+      FunctionBar_draw(this->defaultBar, NULL);
       doSearch = false;
    }
    if (doSearch) {
-      this->found = search(this, panel, getPanelValue);
+      this->found = search(mode, panel, getPanelValue);
    }
    if (filterChanged && lines) {
       updateWeakPanel(this, panel, lines);
@@ -221,11 +210,15 @@ const char* IncSet_getListItemValue(Panel* panel, int i) {
    return "";
 }
 
-void IncSet_drawBar(IncSet* this, int attr) {
+void IncSet_activate(IncSet* this, IncType type, Panel* panel) {
+   this->active = &(this->modes[type]);
+   FunctionBar_draw(this->active->bar, this->active->buffer);
+   panel->currentBar = this->active->bar;
+}
+
+void IncSet_drawBar(IncSet* this) {
    if (this->active) {
-      int cursorX = FunctionBar_drawAttr(this->active->bar, this->active->buffer, attr);
-      this->panel->cursorY = LINES - 1;
-      this->panel->cursorX = cursorX;
+      FunctionBar_draw(this->active->bar, this->active->buffer);
    } else {
       FunctionBar_draw(this->defaultBar, NULL);
    }

IncSet.h

@@ -33,7 +33,6 @@ typedef struct IncMode_ {
 typedef struct IncSet_ {
    IncMode modes[2];
    IncMode* active;
-   Panel* panel;
    FunctionBar* defaultBar;
    bool filtering;
    bool found;
@@ -46,13 +45,13 @@ IncSet* IncSet_new(FunctionBar* bar);
 
 void IncSet_delete(IncSet* this);
 
-void IncSet_activate(IncSet* this, IncType type, Panel* panel);
-
 bool IncSet_handleKey(IncSet* this, int ch, Panel* panel, IncMode_GetPanelValue getPanelValue, Vector* lines);
 
 const char* IncSet_getListItemValue(Panel* panel, int i);
 
-void IncSet_drawBar(IncSet* this, int attr);
+void IncSet_activate(IncSet* this, IncType type, Panel* panel);
+
+void IncSet_drawBar(IncSet* this);
 
 int IncSet_synthesizeEvent(IncSet* this, int x);
 

InfoScreen.c

@@ -85,7 +85,7 @@ void InfoScreen_drawTitled(InfoScreen* this, char* fmt, ...) {
    attrset(CRT_colors[DEFAULT_COLOR]);
    this->display->needsRedraw = true;
    Panel_draw(this->display, true);
-   IncSet_drawBar(this->inc, CRT_colors[FUNCTION_BAR]);
+   IncSet_drawBar(this->inc);
    va_end(ap);
 }
 
@@ -115,7 +115,11 @@ void InfoScreen_run(InfoScreen* this) {
 
       Panel_draw(panel, true);
 
-      int ch = Panel_getCh(panel);
+      if (this->inc->active) {
+         (void) move(LINES-1, CRT_cursorX);
+      }
+      set_escdelay(25);
+      int ch = getch();
       
       if (ch == ERR) {
          if (As_InfoScreen(this)->onErr) {

ListItem.c

@@ -27,13 +27,13 @@ typedef struct ListItem_ {
 
 }*/
 
-void ListItem_delete(Object* cast) {
+static void ListItem_delete(Object* cast) {
    ListItem* this = (ListItem*)cast;
    free(this->value);
    free(this);
 }
 
-void ListItem_display(Object* cast, RichString* out) {
+static void ListItem_display(Object* cast, RichString* out) {
    ListItem* const this = (ListItem*)cast;
    assert (this != NULL);
    /*
@@ -59,15 +59,11 @@ ObjectClass ListItem_class = {
    .compare = ListItem_compare
 };
 
-void ListItem_init(ListItem* this, const char* value, int key) {
+ListItem* ListItem_new(const char* value, int key) {
+   ListItem* this = AllocThis(ListItem);
    this->value = xStrdup(value);
    this->key = key;
    this->moving = false;
-}
-
-ListItem* ListItem_new(const char* value, int key) {
-   ListItem* this = AllocThis(ListItem);
-   ListItem_init(this, value, key);
    return this;
 }
 

ListItem.h

@@ -19,14 +19,8 @@ typedef struct ListItem_ {
 } ListItem;
 
 
-void ListItem_delete(Object* cast);
-
-void ListItem_display(Object* cast, RichString* out);
-
 extern ObjectClass ListItem_class;
 
-void ListItem_init(ListItem* this, const char* value, int key);
-
 ListItem* ListItem_new(const char* value, int key);
 
 void ListItem_append(ListItem* this, const char* text);

MainPanel.c

@@ -72,26 +72,20 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) {
    
    Htop_Reaction reaction = HTOP_OK;
 
-   Settings* settings = this->state->settings;
-   ScreenSettings* ss = settings->ss;
-
    if (EVENT_IS_HEADER_CLICK(ch)) {
       int x = EVENT_HEADER_CLICK_GET_X(ch);
       ProcessList* pl = this->state->pl;
+      Settings* settings = this->state->settings;
       int hx = super->scrollH + x + 1;
       ProcessField field = ProcessList_keyAt(pl, hx);
-      if (field == ss->sortKey) {
-         ScreenSettings_invertSortOrder(ss);
-         ss->treeView = false;
+      if (field == settings->sortKey) {
+         Settings_invertSortOrder(settings);
+         settings->treeView = false;
       } else {
          reaction |= Action_setSortKey(settings, field);
       }
       reaction |= HTOP_RECALCULATE | HTOP_REDRAW_BAR | HTOP_SAVE_SETTINGS; 
       result = HANDLED;
-   } else if (EVENT_IS_SCREEN_TAB_CLICK(ch)) {
-      int x = EVENT_SCREEN_TAB_GET_X(ch);
-      reaction |= Action_setScreenTab(settings, x);
-      result = HANDLED;
    } else if (ch != ERR && this->inc->active) {
       bool filterChanged = IncSet_handleKey(this->inc, ch, super, (IncMode_GetPanelValue) MainPanel_getValue, NULL);
       if (filterChanged) {
@@ -119,8 +113,8 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) {
    }
 
    if (reaction & HTOP_REDRAW_BAR) {
-      MainPanel_updateTreeFunctions(this, settings->ss->treeView);
-      IncSet_drawBar(this->inc, CRT_colors[FUNCTION_BAR]);
+      MainPanel_updateTreeFunctions(this, this->state->settings->treeView);
+      IncSet_drawBar(this->inc);
    }
    if (reaction & HTOP_UPDATE_PANELHDR) {
       ProcessList_printHeader(this->state->pl, Panel_getHeader(super));

Makefile.am

@@ -21,7 +21,7 @@ ClockMeter.c ColorsPanel.c ColumnsPanel.c CPUMeter.c CRT.c MainPanel.c \
 DisplayOptionsPanel.c FunctionBar.c Hashtable.c Header.c htop.c ListItem.c \
 LoadAverageMeter.c MemoryMeter.c Meter.c MetersPanel.c Object.c Panel.c \
 BatteryMeter.c Process.c ProcessList.c RichString.c ScreenManager.c Settings.c \
-SignalsPanel.c StringUtils.c SwapMeter.c TasksMeter.c UptimeMeter.c ScreensPanel.c \
+SignalsPanel.c StringUtils.c SwapMeter.c TasksMeter.c UptimeMeter.c \
 TraceScreen.c UsersTable.c Vector.c AvailableColumnsPanel.c AffinityPanel.c \
 HostnameMeter.c OpenFilesScreen.c Affinity.c IncSet.c Action.c EnvScreen.c \
 InfoScreen.c XAlloc.c
@@ -31,7 +31,7 @@ CategoriesPanel.h CheckItem.h ClockMeter.h ColorsPanel.h ColumnsPanel.h \
 CPUMeter.h CRT.h MainPanel.h DisplayOptionsPanel.h FunctionBar.h \
 Hashtable.h Header.h htop.h ListItem.h LoadAverageMeter.h MemoryMeter.h \
 BatteryMeter.h Meter.h MetersPanel.h Object.h Panel.h ProcessList.h RichString.h \
-ScreenManager.h Settings.h SignalsPanel.h StringUtils.h SwapMeter.h ScreensPanel.h \
+ScreenManager.h Settings.h SignalsPanel.h StringUtils.h SwapMeter.h \
 TasksMeter.h UptimeMeter.h TraceScreen.h UsersTable.h Vector.h Process.h \
 AffinityPanel.h HostnameMeter.h OpenFilesScreen.h Affinity.h IncSet.h Action.h \
 EnvScreen.h InfoScreen.h XAlloc.h
@@ -48,16 +48,14 @@ linux_platform_headers = \
 	linux/LinuxProcess.h \
 	linux/LinuxProcessList.h \
 	linux/LinuxCRT.h \
-	linux/Battery.h \
-	linux/PerfCounter.h
+	linux/Battery.h
 
 all_platform_headers += $(linux_platform_headers)
 
 if HTOP_LINUX
 AM_CFLAGS += -rdynamic
 myhtopplatsources = linux/Platform.c linux/IOPriorityPanel.c linux/IOPriority.c \
-linux/LinuxProcess.c linux/LinuxProcessList.c linux/LinuxCRT.c linux/Battery.c \
-linux/PerfCounter.c
+linux/LinuxProcess.c linux/LinuxProcessList.c linux/LinuxCRT.c linux/Battery.c
 
 myhtopplatheaders = $(linux_platform_headers)
 endif
@@ -203,9 +201,6 @@ profile:
 debug:
 	$(MAKE) all CFLAGS="" AM_CPPFLAGS="-ggdb -DDEBUG"
 
-symbols:
-	$(MAKE) all CFLAGS="" AM_CPPFLAGS="-ggdb -DNDEBUG"
-
 coverage:
 	$(MAKE) all CFLAGS="" AM_CPPFLAGS="-fprofile-arcs -ftest-coverage -DDEBUG" LDFLAGS="-lgcov"
 
@@ -215,13 +210,6 @@ coverage:
 cppcheck:
 	cppcheck -q -v . --enable=all -DHAVE_CGROUP -DHAVE_OPENVZ -DHAVE_TASKSTATS
 
-dist-hook: $(top_distdir)/configure
-	@if grep 'pkg_m4_absent' '$(top_distdir)/configure'; then \
-	   echo 'configure is generated without pkg.m4. Please supply pkg.m4 and run ./autogen.sh to rebuild the configure script.'>&2; \
-	   (exit 1); \
-	else :; \
-	fi
-
 .PHONY: lcov
 
 lcov:

Panel.c

@@ -40,12 +40,8 @@ typedef enum HandlerResult_ {
 #define EVENT_SET_SELECTED -1
 
 #define EVENT_HEADER_CLICK(x_) (-10000 + x_)
+#define EVENT_IS_HEADER_CLICK(ev_) (ev_ >= -10000 && ev_ <= -9000)
 #define EVENT_HEADER_CLICK_GET_X(ev_) (ev_ + 10000)
-#define EVENT_IS_HEADER_CLICK(ev_) (ev_ >= -10000 && ev_ < -9000)
-
-#define EVENT_SCREEN_TAB_CLICK(x_) (-20000 + x_)
-#define EVENT_SCREEN_TAB_GET_X(ev_) (ev_ + 20000)
-#define EVENT_IS_SCREEN_TAB_CLICK(ev_) (ev_ >= -20000 && ev_ < -10000)
 
 typedef HandlerResult(*Panel_EventHandler)(Panel*, int);
 
@@ -61,7 +57,6 @@ typedef struct PanelClass_ {
 struct Panel_ {
    Object super;
    int x, y, w, h;
-   int cursorX, cursorY;
    WINDOW* window;
    Vector* items;
    int selected;
@@ -71,7 +66,6 @@ struct Panel_ {
    int scrollV;
    short scrollH;
    bool needsRedraw;
-   bool cursorOn;
    FunctionBar* currentBar;
    FunctionBar* defaultBar;
    RichString header;
@@ -91,11 +85,6 @@ struct Panel_ {
 
 #define KEY_CTRL(l) ((l)-'A'+1)
 
-void Panel_setCursorToSelection(Panel* this) {
-   this->cursorY = this->y + this->selected - this->scrollV + 1;
-   this->cursorX = this->x + this->selectedLen - this->scrollH;
-}
-
 PanelClass Panel_class = {
    .super = {
       .extends = Class(Object),
@@ -123,8 +112,6 @@ void Panel_init(Panel* this, int x, int y, int w, int h, ObjectClass* type, bool
    this->y = y;
    this->w = w;
    this->h = h;
-   this->cursorX = 0;
-   this->cursorY = 0;
    this->eventHandlerState = NULL;
    this->items = Vector_new(type, owner, DEFAULT_SIZE);
    this->scrollV = 0;
@@ -380,6 +367,7 @@ void Panel_draw(Panel* this, bool focus) {
       RichString_end(old);
    }
    this->oldSelected = this->selected;
+   move(0, 0);
 }
 
 bool Panel_onKey(Panel* this, int key) {
@@ -511,15 +499,3 @@ HandlerResult Panel_selectByTyping(Panel* this, int ch) {
    }
    return IGNORED;
 }
-
-int Panel_getCh(Panel* this) {
-   if (this->cursorOn) {
-      move(this->cursorY, this->cursorX);
-      curs_set(1);
-   } else {
-      curs_set(0);
-   }
-   set_escdelay(25);
-   return getch();
-}
-

Panel.h

@@ -29,12 +29,8 @@ typedef enum HandlerResult_ {
 #define EVENT_SET_SELECTED -1
 
 #define EVENT_HEADER_CLICK(x_) (-10000 + x_)
+#define EVENT_IS_HEADER_CLICK(ev_) (ev_ >= -10000 && ev_ <= -9000)
 #define EVENT_HEADER_CLICK_GET_X(ev_) (ev_ + 10000)
-#define EVENT_IS_HEADER_CLICK(ev_) (ev_ >= -10000 && ev_ < -9000)
-
-#define EVENT_SCREEN_TAB_CLICK(x_) (-20000 + x_)
-#define EVENT_SCREEN_TAB_GET_X(ev_) (ev_ + 20000)
-#define EVENT_IS_SCREEN_TAB_CLICK(ev_) (ev_ >= -20000 && ev_ < -10000)
 
 typedef HandlerResult(*Panel_EventHandler)(Panel*, int);
 
@@ -50,7 +46,6 @@ typedef struct PanelClass_ {
 struct Panel_ {
    Object super;
    int x, y, w, h;
-   int cursorX, cursorY;
    WINDOW* window;
    Vector* items;
    int selected;
@@ -60,7 +55,6 @@ struct Panel_ {
    int scrollV;
    short scrollH;
    bool needsRedraw;
-   bool cursorOn;
    FunctionBar* currentBar;
    FunctionBar* defaultBar;
    RichString header;
@@ -79,8 +73,6 @@ struct Panel_ {
 
 #define KEY_CTRL(l) ((l)-'A'+1)
 
-void Panel_setCursorToSelection(Panel* this);
-
 extern PanelClass Panel_class;
 
 Panel* Panel_new(int x, int y, int w, int h, bool owner, ObjectClass* type, FunctionBar* fuBar);
@@ -131,7 +123,4 @@ bool Panel_onKey(Panel* this, int key);
 
 HandlerResult Panel_selectByTyping(Panel* this, int ch);
 
-int Panel_getCh(Panel* this);
-
-
 #endif

Process.c

@@ -51,7 +51,6 @@ in the source distribution for its full text.
 #include "Object.h"
 
 #include <sys/types.h>
-#include <inttypes.h>
 
 #define PROCESS_FLAG_IO 0x0001
 
@@ -157,7 +156,7 @@ typedef struct ProcessFieldData_ {
    const char* name;
    const char* title;
    const char* description;
-   uint64_t flags;
+   int flags;
 } ProcessFieldData;
 
 // Implemented in platform-specific code:
@@ -371,21 +370,6 @@ void Process_outputRate(RichString* str, char* buffer, int n, double rate, int c
    }
 }
 
-void Process_printPercentage(float val, char* buffer, int n, int* attr) {
-   if (val >= 0) {
-      if (val < 100) {
-         xSnprintf(buffer, n, "%4.1f ", val);
-      } else if (val < 1000) {
-         xSnprintf(buffer, n, "%3d. ", (unsigned int)val); 
-      } else {
-         xSnprintf(buffer, n, "%4d ", (unsigned int)val); 
-      }
-   } else {
-      *attr = CRT_colors[PROCESS_SHADOW];
-      xSnprintf(buffer, n, " N/A ");
-   }
-}
-
 void Process_writeField(Process* this, RichString* str, ProcessField field) {
    char buffer[256]; buffer[255] = '\0';
    int attr = CRT_colors[DEFAULT_COLOR];
@@ -394,15 +378,30 @@ void Process_writeField(Process* this, RichString* str, ProcessField field) {
    bool coloring = this->settings->highlightMegabytes;
 
    switch (field) {
-   case PERCENT_CPU: Process_printPercentage(this->percent_cpu, buffer, n, &attr); break;
-   case PERCENT_MEM: Process_printPercentage(this->percent_mem, buffer, n, &attr); break;
+   case PERCENT_CPU: {
+      if (this->percent_cpu > 999.9) {
+         xSnprintf(buffer, n, "%4d ", (unsigned int)this->percent_cpu); 
+      } else if (this->percent_cpu > 99.9) {
+         xSnprintf(buffer, n, "%3d. ", (unsigned int)this->percent_cpu); 
+      } else {
+         xSnprintf(buffer, n, "%4.1f ", this->percent_cpu);
+      }
+      break;
+   }
+   case PERCENT_MEM: {
+      if (this->percent_mem > 99.9) {
+         xSnprintf(buffer, n, "100. "); 
+      } else {
+         xSnprintf(buffer, n, "%4.1f ", this->percent_mem);
+      }
+      break;
+   }
    case COMM: {
       if (this->settings->highlightThreads && Process_isThread(this)) {
          attr = CRT_colors[PROCESS_THREAD];
          baseattr = CRT_colors[PROCESS_THREAD_BASENAME];
       }
-      ScreenSettings* ss = this->settings->ss;
-      if (!ss->treeView || this->indent == 0) {
+      if (!this->settings->treeView || this->indent == 0) {
          Process_writeCommand(this, attr, baseattr, str);
          return;
       } else {
@@ -423,7 +422,7 @@ void Process_writeField(Process* this, RichString* str, ProcessField field) {
             buf += written;
             n -= written;
          }
-         const char* draw = CRT_treeStr[lastItem ? (ss->direction == 1 ? TREE_STR_BEND : TREE_STR_TEND) : TREE_STR_RTEE];
+         const char* draw = CRT_treeStr[lastItem ? (this->settings->direction == 1 ? TREE_STR_BEND : TREE_STR_TEND) : TREE_STR_RTEE];
          xSnprintf(buf, n, "%s%s ", draw, this->showChildren ? CRT_treeStr[TREE_STR_SHUT] : CRT_treeStr[TREE_STR_OPEN] );
          RichString_append(str, CRT_colors[PROCESS_TREE], buffer);
          Process_writeCommand(this, attr, baseattr, str);
@@ -494,7 +493,7 @@ void Process_writeField(Process* this, RichString* str, ProcessField field) {
 
 void Process_display(Object* cast, RichString* out) {
    Process* this = (Process*) cast;
-   ProcessField* fields = this->settings->ss->fields;
+   ProcessField* fields = this->settings->fields;
    RichString_prune(out);
    for (int i = 0; fields[i]; i++)
       As_Process(this)->writeField(this, out, fields[i]);
@@ -564,15 +563,14 @@ long Process_pidCompare(const void* v1, const void* v2) {
 long Process_compare(const void* v1, const void* v2) {
    Process *p1, *p2;
    Settings *settings = ((Process*)v1)->settings;
-   ScreenSettings* ss = settings->ss;
-   if (ss->direction == 1) {
+   if (settings->direction == 1) {
       p1 = (Process*)v1;
       p2 = (Process*)v2;
    } else {
       p2 = (Process*)v1;
       p1 = (Process*)v2;
    }
-   switch (ss->sortKey) {
+   switch (settings->sortKey) {
    case PERCENT_CPU:
       return (p2->percent_cpu > p1->percent_cpu ? 1 : -1);
    case PERCENT_MEM:

Process.h

@@ -29,7 +29,6 @@ in the source distribution for its full text.
 #include "Object.h"
 
 #include <sys/types.h>
-#include <inttypes.h>
 
 #define PROCESS_FLAG_IO 0x0001
 
@@ -135,7 +134,7 @@ typedef struct ProcessFieldData_ {
    const char* name;
    const char* title;
    const char* description;
-   uint64_t flags;
+   int flags;
 } ProcessFieldData;
 
 // Implemented in platform-specific code:
@@ -184,8 +183,6 @@ void Process_printTime(RichString* str, unsigned long long totalHundredths);
 
 void Process_outputRate(RichString* str, char* buffer, int n, double rate, int coloring);
 
-void Process_printPercentage(float val, char* buffer, int n, int* attr);
-
 void Process_writeField(Process* this, RichString* str, ProcessField field);
 
 void Process_display(Object* cast, RichString* out);

ProcessList.c

@@ -124,15 +124,14 @@ void ProcessList_setPanel(ProcessList* this, Panel* panel) {
 
 void ProcessList_printHeader(ProcessList* this, RichString* header) {
    RichString_prune(header);
-   ProcessField* fields = this->settings->ss->fields;
+   ProcessField* fields = this->settings->fields;
    for (int i = 0; fields[i]; i++) {
-      unsigned int key = fields[i];
-      const char* field = Process_fields[key].title;
+      const char* field = Process_fields[fields[i]].title;
       if (!field) field = "- ";
-      int color = (!this->settings->ss->treeView && this->settings->ss->sortKey == key)
-                ? CRT_colors[PANEL_SELECTION_FOCUS]
-                : CRT_colors[PANEL_HEADER_FOCUS];
-      RichString_append(header, color, field);
+      if (!this->settings->treeView && this->settings->sortKey == fields[i])
+         RichString_append(header, CRT_colors[PANEL_SELECTION_FOCUS], field);
+      else
+         RichString_append(header, CRT_colors[PANEL_HEADER_FOCUS], field);
    }
 }
 
@@ -201,19 +200,19 @@ static void ProcessList_buildTree(ProcessList* this, pid_t pid, int level, int i
 }
 
 void ProcessList_sort(ProcessList* this) {
-   if (!this->settings->ss->treeView) {
+   if (!this->settings->treeView) {
       Vector_insertionSort(this->processes);
    } else {
       // Save settings
-      int direction = this->settings->ss->direction;
-      int sortKey = this->settings->ss->sortKey;
+      int direction = this->settings->direction;
+      int sortKey = this->settings->sortKey;
       // Sort by PID
-      this->settings->ss->sortKey = PID;
-      this->settings->ss->direction = 1;
+      this->settings->sortKey = PID;
+      this->settings->direction = 1;
       Vector_quickSort(this->processes);
       // Restore settings
-      this->settings->ss->sortKey = sortKey;
-      this->settings->ss->direction = direction;
+      this->settings->sortKey = sortKey;
+      this->settings->direction = direction;
       int vsize = Vector_size(this->processes);
       // Find all processes whose parent is not visible
       int size;
@@ -272,7 +271,7 @@ void ProcessList_sort(ProcessList* this) {
 
 ProcessField ProcessList_keyAt(ProcessList* this, int at) {
    int x = 0;
-   ProcessField* fields = this->settings->ss->fields;
+   ProcessField* fields = this->settings->fields;
    ProcessField field;
    for (int i = 0; (field = fields[i]); i++) {
       const char* title = Process_fields[field].title;

ScreenManager.c

@@ -13,7 +13,6 @@ in the source distribution for its full text.
 
 #include <assert.h>
 #include <time.h>
-#include <string.h>
 #include <stdlib.h>
 #include <stdbool.h>
 
@@ -36,7 +35,6 @@ typedef struct ScreenManager_ {
    int y2;
    Orientation orientation;
    Vector* panels;
-   const char* name;
    int panelCount;
    const Header* header;
    const Settings* settings;
@@ -73,46 +71,30 @@ inline int ScreenManager_size(ScreenManager* this) {
 }
 
 void ScreenManager_add(ScreenManager* this, Panel* item, int size) {
-   ScreenManager_insert(this, item, size, Vector_size(this->panels));
-}
-
-void ScreenManager_insert(ScreenManager* this, Panel* item, int size, int idx) {
    if (this->orientation == HORIZONTAL) {
       int lastX = 0;
-      if (idx > 0) {
-         Panel* last = (Panel*) Vector_get(this->panels, idx - 1);
+      if (this->panelCount > 0) {
+         Panel* last = (Panel*) Vector_get(this->panels, this->panelCount - 1);
          lastX = last->x + last->w + 1;
       }
       int height = LINES - this->y1 + this->y2;
-      if (size <= 0) {
-         size = COLS-this->x1+this->x2-lastX;
+      if (size > 0) {
+         Panel_resize(item, size, height);
+      } else {
+         Panel_resize(item, COLS-this->x1+this->x2-lastX, height);
       }
-      Panel_resize(item, size, height);
       Panel_move(item, lastX, this->y1);
-      if (idx < this->panelCount) {
-         for (int i = idx + 1; i <= this->panelCount; i++) {
-            Panel* p = (Panel*) Vector_get(this->panels, i);
-            Panel_move(p, p->x + size, p->y);
-         }
-      }
    }
    // TODO: VERTICAL
-   Vector_insert(this->panels, idx, item);
+   Vector_add(this->panels, item);
    item->needsRedraw = true;
    this->panelCount++;
 }
 
 Panel* ScreenManager_remove(ScreenManager* this, int idx) {
    assert(this->panelCount > idx);
-   int w = ((Panel*) Vector_get(this->panels, idx))->w;
    Panel* panel = (Panel*) Vector_remove(this->panels, idx);
    this->panelCount--;
-   if (idx < this->panelCount) {
-      for (int i = idx; i < this->panelCount; i++) {
-         Panel* p = (Panel*) Vector_get(this->panels, i);
-         Panel_move(p, p->x - w, p->y);
-      }
-   }
    return panel;
 }
 
@@ -149,7 +131,7 @@ static void checkRecalculation(ScreenManager* this, double* oldTime, int* sortTi
    if (*rescan) {
       *oldTime = newTime;
       ProcessList_scan(pl);
-      if (*sortTimeout == 0 || this->settings->ss->treeView) {
+      if (*sortTimeout == 0 || this->settings->treeView) {
          ProcessList_sort(pl);
          *sortTimeout = 1;
       }
@@ -162,50 +144,7 @@ static void checkRecalculation(ScreenManager* this, double* oldTime, int* sortTi
    *rescan = false;
 }
 
-static inline bool drawTab(int* y, int* x, int l, const char* name, bool cur) {
-   attrset(CRT_colors[cur ? SCREENS_CUR_BORDER : SCREENS_OTH_BORDER]);
-   mvaddch(*y, *x, '[');
-   (*x)++;
-   if (*x >= l) return false;
-   int nameLen = strlen(name);
-   int n = MIN(l - *x, nameLen);
-   attrset(CRT_colors[cur ? SCREENS_CUR_TEXT : SCREENS_OTH_TEXT]);
-   mvaddnstr(*y, *x, name, n);
-   *x += n;
-   if (*x >= l) return false;
-   attrset(CRT_colors[cur ? SCREENS_CUR_BORDER : SCREENS_OTH_BORDER]);
-   mvaddch(*y, *x, ']');
-   *x += 2;
-   if (*x >= l) return false;
-   return true;
-}
-
-static void ScreenManager_drawScreenTabs(ScreenManager* this) {
-   ScreenSettings** screens = this->settings->screens;
-   int cur = this->settings->ssIndex;
-   int l = COLS;
-   Panel* panel = (Panel*) Vector_get(this->panels, 0);
-   int y = panel->y - 1;
-   int x = 2;
-   
-   if (this->name) {
-      drawTab(&y, &x, l, this->name, true);
-      return;
-   }
-   
-   for (int s = 0; screens[s]; s++) {
-      bool ok = drawTab(&y, &x, l, screens[s]->name, s == cur);
-      if (!ok) {
-         break;
-      }
-   }
-   attrset(CRT_colors[RESET_COLOR]);
-}
-
 static void ScreenManager_drawPanels(ScreenManager* this, int focus) {
-   if (this->settings->screenTabs) {
-      ScreenManager_drawScreenTabs(this);
-   }
    int nPanels = this->panelCount;
    for (int i = 0; i < nPanels; i++) {
       Panel* panel = (Panel*) Vector_get(this->panels, i);
@@ -218,17 +157,16 @@ static void ScreenManager_drawPanels(ScreenManager* this, int focus) {
    }
 }
 
-static Panel* setCurrentPanel(ScreenManager* this, int focus) {
-   Panel* panel = (Panel*) Vector_get(this->panels, focus);
+static Panel* setCurrentPanel(Panel* panel) {
    FunctionBar_draw(panel->currentBar, NULL);
    return panel;
 }
 
-void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey, char* name) {
+void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
    bool quit = false;
    int focus = 0;
    
-   Panel* panelFocus = setCurrentPanel(this, focus);
+   Panel* panelFocus = setCurrentPanel((Panel*) Vector_get(this->panels, focus));
 
    double oldTime = 0.0;
 
@@ -240,8 +178,6 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey, cha
    bool rescan = false;
    int sortTimeout = 0;
    int resetSortTimeout = 5;
-   
-   this->name = name;
 
    while (!quit) {
       if (this->header) {
@@ -253,7 +189,8 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey, cha
       }
 
       int prevCh = ch;
-      ch = Panel_getCh(panelFocus);
+      set_escdelay(25);
+      ch = getch();
 
       HandlerResult result = IGNORED;
       if (ch == KEY_MOUSE) {
@@ -271,14 +208,11 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey, cha
                         if (mevent.y == panel->y) {
                            ch = EVENT_HEADER_CLICK(mevent.x - panel->x);
                            break;
-                        } else if (this->settings->screenTabs && mevent.y == panel->y - 1) {
-                           ch = EVENT_SCREEN_TAB_CLICK(mevent.x);
-                           break;
                         } else if (mevent.y > panel->y && mevent.y <= panel->y+panel->h) {
                            ch = KEY_MOUSE;
                            if (panel == panelFocus || this->allowFocusChange) {
                               focus = i;
-                              panelFocus = setCurrentPanel(this, i);
+                              panelFocus = setCurrentPanel(panel);
                               Object* oldSelection = Panel_getSelected(panel);
                               Panel_setSelected(panel, mevent.y - panel->y + panel->scrollV - 1);
                               if (Panel_getSelected(panel) == oldSelection) {
@@ -354,7 +288,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey, cha
          tryLeft:
          if (focus > 0)
             focus--;
-         panelFocus = setCurrentPanel(this, focus);
+         panelFocus = setCurrentPanel((Panel*) Vector_get(this->panels, focus));
          if (Panel_size(panelFocus) == 0 && focus > 0)
             goto tryLeft;
          break;
@@ -369,7 +303,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey, cha
          tryRight:
          if (focus < this->panelCount - 1)
             focus++;
-         panelFocus = setCurrentPanel(this, focus);
+         panelFocus = setCurrentPanel((Panel*) Vector_get(this->panels, focus));
          if (Panel_size(panelFocus) == 0 && focus < this->panelCount - 1)
             goto tryRight;
          break;

ScreenManager.h

@@ -27,7 +27,6 @@ typedef struct ScreenManager_ {
    int y2;
    Orientation orientation;
    Vector* panels;
-   const char* name;
    int panelCount;
    const Header* header;
    const Settings* settings;
@@ -44,12 +43,10 @@ extern int ScreenManager_size(ScreenManager* this);
 
 void ScreenManager_add(ScreenManager* this, Panel* item, int size);
 
-void ScreenManager_insert(ScreenManager* this, Panel* item, int size, int idx);
-
 Panel* ScreenManager_remove(ScreenManager* this, int idx);
 
 void ScreenManager_resize(ScreenManager* this, int x1, int y1, int x2, int y2);
 
-void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey, char* name);
+void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey);
 
 #endif

ScreensPanel.c

@@ -1,331 +0,0 @@
-/*
-htop - ScreensPanel.c
-(C) 2004-2011 Hisham H. Muhammad
-Released under the GNU GPL, see the COPYING file
-in the source distribution for its full text.
-*/
-
-#include "ScreensPanel.h"
-#include "Platform.h"
-
-#include "StringUtils.h"
-#include "CRT.h"
-
-#include <assert.h>
-#include <stdlib.h>
-#include <ctype.h>
-#include <string.h>
-
-/*{
-#include "Panel.h"
-#include "ScreenManager.h"
-#include "ColumnsPanel.h"
-#include "Settings.h"
-#include "ListItem.h"
-
-#ifndef SCREEN_NAME_LEN
-#define SCREEN_NAME_LEN 20
-#endif
-
-typedef struct ScreensPanel_ {
-   Panel super;
-   
-   ScreenManager* scr;
-   Settings* settings;
-   ColumnsPanel* columns;
-   char buffer[SCREEN_NAME_LEN + 1];
-   char* saved;
-   int cursor;
-   bool moving;
-   bool renaming;
-} ScreensPanel;
-
-typedef struct ScreenListItem_ {
-   ListItem super;
-   ScreenSettings* ss;
-} ScreenListItem;
-
-}*/
-
-ObjectClass ScreenListItem_class = {
-   .extends = Class(ListItem),
-   .display = ListItem_display,
-   .delete = ListItem_delete,
-   .compare = ListItem_compare
-};
-
-ScreenListItem* ScreenListItem_new(const char* value, ScreenSettings* ss) {
-   ScreenListItem* this = AllocThis(ScreenListItem);
-   ListItem_init((ListItem*)this, value, 0);
-   this->ss = ss;
-   return this;
-}
-
-static const char* const ScreensFunctions[] = {"      ", "Rename", "      ", "      ", "New   ", "      ", "MoveUp", "MoveDn", "Remove", "Done  ", NULL};
-
-static void ScreensPanel_delete(Object* object) {
-   Panel* super = (Panel*) object;
-   ScreensPanel* this = (ScreensPanel*) object;
-   Panel_done(super);
-   free(this);
-}
-
-static HandlerResult ScreensPanel_eventHandlerRenaming(Panel* super, int ch) {
-   ScreensPanel* const this = (ScreensPanel*) super;
-
-   //ListItem* item = (ListItem*)Panel_getSelected(super);
-   if (ch >= 32 && ch < 127 && ch != 61 && ch != 22) {
-      if (this->cursor < SCREEN_NAME_LEN - 1) {
-         this->buffer[this->cursor] = ch;
-         this->cursor++;
-         super->selectedLen = strlen(this->buffer);
-         Panel_setCursorToSelection(super);
-      }
-   } else {
-      switch(ch) {
-         case 127:
-         case KEY_BACKSPACE:
-         {
-            if (this->cursor > 0) {
-               this->cursor--;
-               this->buffer[this->cursor] = '\0';
-               super->selectedLen = strlen(this->buffer);
-               Panel_setCursorToSelection(super);
-            }
-            break;
-         }
-         case 0x0a:
-         case 0x0d:
-         case KEY_ENTER:
-         {
-            ListItem* item = (ListItem*) Panel_getSelected(super);
-            free(this->saved);
-            item->value = xStrdup(this->buffer);
-            this->renaming = false;
-            super->cursorOn = false;
-            Panel_setSelectionColor(super, CRT_colors[PANEL_SELECTION_FOCUS]);
-            ScreensPanel_update(super);
-            break;
-         }
-         case 27: // Esc
-         {
-            ListItem* item = (ListItem*) Panel_getSelected(super);
-            item->value = this->saved;
-            this->renaming = false;
-            super->cursorOn = false;
-            Panel_setSelectionColor(super, CRT_colors[PANEL_SELECTION_FOCUS]);
-            break;
-         }
-      }
-   }
-   return HANDLED;
-}
-
-static void startRenaming(Panel* super) {
-   ScreensPanel* const this = (ScreensPanel*) super;
-
-   ListItem* item = (ListItem*) Panel_getSelected(super);
-   this->renaming = true;
-   super->cursorOn = true;
-   char* name = item->value;
-   this->saved = name;
-   strncpy(this->buffer, name, SCREEN_NAME_LEN);
-   this->buffer[SCREEN_NAME_LEN] = '\0';
-   this->cursor = strlen(this->buffer);
-   item->value = this->buffer;
-   Panel_setSelectionColor(super, CRT_colors[PANEL_EDIT]);
-   super->selectedLen = strlen(this->buffer);
-   Panel_setCursorToSelection(super);
-}
-
-static void rebuildSettingsArray(Panel* super) {
-   ScreensPanel* const this = (ScreensPanel*) super;
-
-   int n = Panel_size(super);
-   free(this->settings->screens);
-   this->settings->screens = xMalloc(sizeof(ScreenSettings*) * (n + 1));
-   this->settings->screens[n] = NULL;
-   for (int i = 0; i < n; i++) {
-      ScreenListItem* item = (ScreenListItem*) Panel_get(super, i);
-      this->settings->screens[i] = item->ss;
-   }
-   this->settings->nScreens = n;
-}
-
-static void addNewScreen(Panel* super) {
-   ScreensPanel* const this = (ScreensPanel*) super;
-
-   char* name = "New";
-   ScreenSettings* ss = Settings_newScreen(this->settings, name, "PID Command");
-   ScreenListItem* item = ScreenListItem_new(name, ss);
-   int idx = Panel_getSelectedIndex(super);
-   Panel_insert(super, idx + 1, (Object*) item);
-   Panel_setSelected(super, idx + 1);
-}
-
-static HandlerResult ScreensPanel_eventHandlerNormal(Panel* super, int ch) {
-   ScreensPanel* const this = (ScreensPanel*) super;
-   
-   int selected = Panel_getSelectedIndex(super);
-   ScreenListItem* oldFocus = (ScreenListItem*) Panel_getSelected(super);
-   bool shouldRebuildArray = false;
-   HandlerResult result = IGNORED;
-   switch(ch) {
-      case 0x0a:
-      case 0x0d:
-      case KEY_ENTER:
-      case KEY_MOUSE:
-      case KEY_RECLICK:
-      {
-         this->moving = !(this->moving);
-         Panel_setSelectionColor(super, this->moving ? CRT_colors[PANEL_SELECTION_FOLLOW] : CRT_colors[PANEL_SELECTION_FOCUS]);
-         ((ListItem*)Panel_getSelected(super))->moving = this->moving;
-         result = HANDLED;
-         break;
-      }
-      case EVENT_SET_SELECTED:
-         result = HANDLED;
-         break;
-      case KEY_NPAGE:
-      case KEY_PPAGE:
-      case KEY_HOME:
-      case KEY_END: {
-         Panel_onKey(super, ch);
-         break;
-      }
-      case KEY_F(2):
-      case KEY_CTRL('R'):
-      {
-         startRenaming(super);
-         result = HANDLED;
-         break;
-      }
-      case KEY_F(5):
-      case KEY_CTRL('N'):
-      {
-         addNewScreen(super);
-         startRenaming(super);
-         shouldRebuildArray = true;
-         result = HANDLED;
-         break;
-      }
-      case KEY_UP:
-      {
-         if (!this->moving) {
-            Panel_onKey(super, ch);
-            break;
-         }
-         /* else fallthrough */
-      }
-      case KEY_F(7):
-      case '[':
-      case '-':
-      {
-         Panel_moveSelectedUp(super);
-         shouldRebuildArray = true;
-         result = HANDLED;
-         break;
-      }
-      case KEY_DOWN:
-      {
-         if (!this->moving) {
-            Panel_onKey(super, ch);
-            break;
-         }
-         /* else fallthrough */
-      }
-      case KEY_F(8):
-      case ']':
-      case '+':
-      {
-         Panel_moveSelectedDown(super);
-         shouldRebuildArray = true;
-         result = HANDLED;
-         break;
-      }
-      case KEY_F(9):
-      //case KEY_DC:
-      {
-         if (Panel_size(super) > 1) {
-            Panel_remove(super, selected);
-         }
-         shouldRebuildArray = true;
-         result = HANDLED;
-         break;
-      }
-      default:
-      {
-         if (ch < 255 && isalpha(ch))
-            result = Panel_selectByTyping(super, ch);
-         if (result == BREAK_LOOP)
-            result = IGNORED;
-         break;
-      }
-   }
-   ScreenListItem* newFocus = (ScreenListItem*) Panel_getSelected(super);
-   if (oldFocus != newFocus) {
-      ColumnsPanel_fill(this->columns, newFocus->ss);
-      result = HANDLED;
-   }
-   if (shouldRebuildArray) {
-      rebuildSettingsArray(super);
-   }
-   if (result == HANDLED)
-      ScreensPanel_update(super);
-   return result;
-}
-   
-static HandlerResult ScreensPanel_eventHandler(Panel* super, int ch) {
-   ScreensPanel* const this = (ScreensPanel*) super;
-
-   if (this->renaming) {
-      return ScreensPanel_eventHandlerRenaming(super, ch);
-   } else {
-      return ScreensPanel_eventHandlerNormal(super, ch);
-   }
-}
-
-PanelClass ScreensPanel_class = {
-   .super = {
-      .extends = Class(Panel),
-      .delete = ScreensPanel_delete
-   },
-   .eventHandler = ScreensPanel_eventHandler
-};
-
-ScreensPanel* ScreensPanel_new(Settings* settings) {
-   ScreensPanel* this = AllocThis(ScreensPanel);
-   Panel* super = (Panel*) this;
-   FunctionBar* fuBar = FunctionBar_new(ScreensFunctions, NULL, NULL);
-   Panel_init(super, 1, 1, 1, 1, Class(ListItem), true, fuBar);
-
-   this->settings = settings;
-   this->columns = ColumnsPanel_new(settings->screens[0], &(settings->changed));
-   this->moving = false;
-   this->renaming = false;
-   super->cursorOn = false;
-   this->cursor = 0;
-   Panel_setHeader(super, "Screens");
-
-   for (unsigned int i = 0; i < settings->nScreens; i++) {
-      ScreenSettings* ss = settings->screens[i];
-      char* name = ss->name;
-      Panel_add(super, (Object*) ScreenListItem_new(name, ss));
-   }
-   return this;
-}
-
-void ScreensPanel_update(Panel* super) {
-   ScreensPanel* this = (ScreensPanel*) super;
-   int size = Panel_size(super);
-   this->settings->changed = true;
-   this->settings->screens = xRealloc(this->settings->screens, sizeof(char*) * (size+1));
-   for (int i = 0; i < size; i++) {
-      ScreenListItem* item = (ScreenListItem*) Panel_get(super, i);
-      ScreenSettings* ss = item->ss;
-      free(ss->name);
-      this->settings->screens[i] = ss;
-      ss->name = xStrdup(((ListItem*) item)->value);
-   }
-   this->settings->screens[size] = NULL;
-}

ScreensPanel.h

@@ -1,51 +0,0 @@
-/* Do not edit this file. It was automatically generated. */
-
-#ifndef HEADER_ScreensPanel
-#define HEADER_ScreensPanel
-/*
-htop - ScreensPanel.h
-(C) 2004-2011 Hisham H. Muhammad
-Released under the GNU GPL, see the COPYING file
-in the source distribution for its full text.
-*/
-
-#include "Panel.h"
-#include "ScreenManager.h"
-#include "ColumnsPanel.h"
-#include "Settings.h"
-#include "ListItem.h"
-
-#ifndef SCREEN_NAME_LEN
-#define SCREEN_NAME_LEN 20
-#endif
-
-typedef struct ScreensPanel_ {
-   Panel super;
-   
-   ScreenManager* scr;
-   Settings* settings;
-   ColumnsPanel* columns;
-   char buffer[SCREEN_NAME_LEN + 1];
-   char* saved;
-   int cursor;
-   bool moving;
-   bool renaming;
-} ScreensPanel;
-
-typedef struct ScreenListItem_ {
-   ListItem super;
-   ScreenSettings* ss;
-} ScreenListItem;
-
-
-extern ObjectClass ScreenListItem_class;
-
-ScreenListItem* ScreenListItem_new(const char* value, ScreenSettings* ss);
-
-extern PanelClass ScreensPanel_class;
-
-ScreensPanel* ScreensPanel_new(Settings* settings);
-
-void ScreensPanel_update(Panel* super);
-
-#endif

Settings.c

@@ -23,44 +23,29 @@ in the source distribution for its full text.
 #include "Process.h"
 #include <stdbool.h>
 
-typedef struct {
-   const char* name;
-   const char* columns;
-   const char* sortKey;
-} ScreenDefaults;
-
 typedef struct {
    int len;
    char** names;
    int* modes;
 } MeterColumnSettings;
 
-typedef struct {
-   char* name;
-   ProcessField* fields;
-   int flags;
-   int direction;
-   ProcessField sortKey;
-   bool treeView;
-} ScreenSettings;
-
 typedef struct Settings_ {
    char* filename;
    
-   MeterColumnSettings meterColumns[2];
-
-   ScreenSettings** screens;
-   unsigned int nScreens;
-   unsigned int ssIndex;
-   ScreenSettings* ss;
+   MeterColumnSettings columns[2];
 
+   ProcessField* fields;
+   int flags;
    int colorScheme;
    int delay;
 
    int cpuCount;
+   int direction;
+   ProcessField sortKey;
 
    bool countCPUsFromZero;
    bool detailedCPUTime;
+   bool treeView;
    bool showProgramPath;
    bool hideThreads;
    bool shadowOtherUsers;
@@ -73,7 +58,6 @@ typedef struct Settings_ {
    bool updateProcessNames;
    bool accountGuestInCPUMeter;
    bool headerMargin;
-   bool screenTabs;
 
    bool changed;
 } Settings;
@@ -84,82 +68,25 @@ typedef struct Settings_ {
 
 }*/
 
-static void writeList(FILE* fd, char** list, int len) {
-   const char* sep = "";
-   for (int i = 0; i < len; i++) {
-      fprintf(fd, "%s%s", sep, list[i]);
-      sep = " ";
-   }
-   fprintf(fd, "\n");
-}
-
-/*
-
-static char** readQuotedList(char* line) {
-   int n = 0;
-   char** list = xCalloc(sizeof(char*), 1);
-   int start = 0;
-   for (;;) {
-      while (line[start] && line[start] == ' ') {
-         start++;
-      }
-      if (line[start] != '"') {
-         break;
-      }
-      start++;
-      int close = start;
-      while (line[close] && line[close] != '"') {
-         close++;
-      }
-      int len = close - start;
-      char* item = xMalloc(len + 1);
-      strncpy(item, line + start, len);
-      item[len] = '\0';
-      list[n] = item;
-      n++;
-      list = xRealloc(list, sizeof(char*) * (n + 1));
-      start = close + 1;
-   }
-   list[n] = NULL;
-   return list;
-}
-
-static void writeQuotedList(FILE* fd, char** list) {
-   const char* sep = "";
-   for (int i = 0; list[i]; i++) {
-      fprintf(fd, "%s\"%s\"", sep, list[i]);
-      sep = " ";
-   }
-   fprintf(fd, "\n");
-}
-
-*/
-
 void Settings_delete(Settings* this) {
    free(this->filename);
-   for (unsigned int i = 0; i < (sizeof(this->meterColumns)/sizeof(MeterColumnSettings)); i++) {
-      String_freeArray(this->meterColumns[i].names);
-      free(this->meterColumns[i].modes);
-   }
-   if (this->screens) {
-      for (unsigned int i = 0; this->screens[i]; i++) {
-         free(this->screens[i]->name);
-         free(this->screens[i]->fields);
-      }
-      free(this->screens);
+   free(this->fields);
+   for (unsigned int i = 0; i < (sizeof(this->columns)/sizeof(MeterColumnSettings)); i++) {
+      String_freeArray(this->columns[i].names);
+      free(this->columns[i].modes);
    }
    free(this);
 }
 
-static void Settings_readMeters(Settings* this, char* line, int side) {
+static void Settings_readMeters(Settings* this, char* line, int column) {
    char* trim = String_trim(line);
    int nIds;
    char** ids = String_split(trim, ' ', &nIds);
    free(trim);
-   this->meterColumns[side].names = ids;
+   this->columns[column].names = ids;
 }
 
-static void Settings_readMeterModes(Settings* this, char* line, int side) {
+static void Settings_readMeterModes(Settings* this, char* line, int column) {
    char* trim = String_trim(line);
    int nIds;
    char** ids = String_split(trim, ' ', &nIds);
@@ -168,13 +95,13 @@ static void Settings_readMeterModes(Settings* this, char* line, int side) {
    for (int i = 0; ids[i]; i++) {
       len++;
    }
-   this->meterColumns[side].len = len;
+   this->columns[column].len = len;
    int* modes = xCalloc(len, sizeof(int));
    for (int i = 0; i < len; i++) {
       modes[i] = atoi(ids[i]);
    }
    String_freeArray(ids);
-   this->meterColumns[side].modes = modes;
+   this->columns[column].modes = modes;
 }
 
 static void Settings_defaultMeters(Settings* this) {
@@ -183,62 +110,37 @@ static void Settings_defaultMeters(Settings* this) {
       sizes[1]++;
    }
    for (int i = 0; i < 2; i++) {
-      this->meterColumns[i].names = xCalloc(sizes[i] + 1, sizeof(char*));
-      this->meterColumns[i].modes = xCalloc(sizes[i], sizeof(int));
-      this->meterColumns[i].len = sizes[i];
+      this->columns[i].names = xCalloc(sizes[i] + 1, sizeof(char*));
+      this->columns[i].modes = xCalloc(sizes[i], sizeof(int));
+      this->columns[i].len = sizes[i];
    }
    
    int r = 0;
    if (this->cpuCount > 8) {
-      this->meterColumns[0].names[0] = xStrdup("LeftCPUs2");
-      this->meterColumns[0].modes[0] = BAR_METERMODE;
-      this->meterColumns[1].names[r] = xStrdup("RightCPUs2");
-      this->meterColumns[1].modes[r++] = BAR_METERMODE;
+      this->columns[0].names[0] = xStrdup("LeftCPUs2");
+      this->columns[0].modes[0] = BAR_METERMODE;
+      this->columns[1].names[r] = xStrdup("RightCPUs2");
+      this->columns[1].modes[r++] = BAR_METERMODE;
    } else if (this->cpuCount > 4) {
-      this->meterColumns[0].names[0] = xStrdup("LeftCPUs");
-      this->meterColumns[0].modes[0] = BAR_METERMODE;
-      this->meterColumns[1].names[r] = xStrdup("RightCPUs");
-      this->meterColumns[1].modes[r++] = BAR_METERMODE;
+      this->columns[0].names[0] = xStrdup("LeftCPUs");
+      this->columns[0].modes[0] = BAR_METERMODE;
+      this->columns[1].names[r] = xStrdup("RightCPUs");
+      this->columns[1].modes[r++] = BAR_METERMODE;
    } else {
-      this->meterColumns[0].names[0] = xStrdup("AllCPUs");
-      this->meterColumns[0].modes[0] = BAR_METERMODE;
+      this->columns[0].names[0] = xStrdup("AllCPUs");
+      this->columns[0].modes[0] = BAR_METERMODE;
    }
-   this->meterColumns[0].names[1] = xStrdup("Memory");
-   this->meterColumns[0].modes[1] = BAR_METERMODE;
-   this->meterColumns[0].names[2] = xStrdup("Swap");
-   this->meterColumns[0].modes[2] = BAR_METERMODE;
+   this->columns[0].names[1] = xStrdup("Memory");
+   this->columns[0].modes[1] = BAR_METERMODE;
+   this->columns[0].names[2] = xStrdup("Swap");
+   this->columns[0].modes[2] = BAR_METERMODE;
    
-   this->meterColumns[1].names[r] = xStrdup("Tasks");
-   this->meterColumns[1].modes[r++] = TEXT_METERMODE;
-   this->meterColumns[1].names[r] = xStrdup("LoadAverage");
-   this->meterColumns[1].modes[r++] = TEXT_METERMODE;
-   this->meterColumns[1].names[r] = xStrdup("Uptime");
-   this->meterColumns[1].modes[r++] = TEXT_METERMODE;
-}
-
-static const char* toFieldName(int i) {
-   if (i < 0 || i > LAST_PROCESSFIELD) {
-      return "";
-   }
-   return Process_fields[i].name;
-}
-
-static int toFieldIndex(const char* str) {
-   if (isdigit(str[0])) {
-      // This "+1" is for compatibility with the older enum format.
-      int id = atoi(str) + 1;
-      if (id < Platform_numberOfFields && toFieldName(id)) {
-         return id;
-      }
-   } else {
-      for (int p = 1; p < LAST_PROCESSFIELD; p++) {
-         const char* pName = toFieldName(p);
-         if (pName && strcmp(pName, str) == 0) {
-            return p;
-         }
-      }
-   }
-   return -1;
+   this->columns[1].names[r] = xStrdup("Tasks");
+   this->columns[1].modes[r++] = TEXT_METERMODE;
+   this->columns[1].names[r] = xStrdup("LoadAverage");
+   this->columns[1].modes[r++] = TEXT_METERMODE;
+   this->columns[1].names[r] = xStrdup("Uptime");
+   this->columns[1].modes[r++] = TEXT_METERMODE;
 }
 
 static void readFields(ProcessField* fields, int* flags, const char* line) {
@@ -249,10 +151,11 @@ static void readFields(ProcessField* fields, int* flags, const char* line) {
    int i, j;
    *flags = 0;
    for (j = 0, i = 0; i < Platform_numberOfFields && ids[i]; i++) {
-      int idx = toFieldIndex(ids[i]);
-      if (idx != -1) {
-         fields[j] = idx;
-         *flags |= Process_fields[idx].flags;
+      // This "+1" is for compatibility with the older enum format.
+      int id = atoi(ids[i]) + 1;
+      if (id > 0 && Process_fields[id].name && id < Platform_numberOfFields) {
+         fields[j] = id;
+         *flags |= Process_fields[id].flags;
          j++;
       }
    }
@@ -260,30 +163,6 @@ static void readFields(ProcessField* fields, int* flags, const char* line) {
    String_freeArray(ids);
 }
 
-ScreenSettings* Settings_newScreen(Settings* this, const char* name, const char* line) {
-   ScreenSettings* ss = xCalloc(sizeof(ScreenSettings), 1);
-   ss->name = xStrdup(name);
-   ss->fields = xCalloc(Platform_numberOfFields+1, sizeof(ProcessField));
-   ss->flags = 0;
-   ss->direction = 1;
-   ss->treeView = 0;
-   readFields(ss->fields, &(ss->flags), line);
-   ss->sortKey = ss->fields[0];
-   this->screens[this->nScreens] = ss;
-   this->nScreens++;
-   this->screens = xRealloc(this->screens, sizeof(ScreenSettings*) * (this->nScreens + 1));
-   this->screens[this->nScreens] = NULL;
-   return ss;
-}
-
-static void Settings_defaultScreens(Settings* this) {
-   for (unsigned int i = 0; i < Platform_numberOfDefaultScreens; i++) {
-      ScreenDefaults* defaults = &Platform_defaultScreens[i];
-      Settings_newScreen(this, defaults->name, defaults->columns);
-      this->screens[i]->sortKey = toFieldIndex(defaults->sortKey);
-   }
-}
-
 static bool Settings_read(Settings* this, const char* fileName) {
    FILE* fd;
    
@@ -295,9 +174,6 @@ static bool Settings_read(Settings* this, const char* fileName) {
    
    bool didReadMeters = false;
    bool didReadFields = false;
-   ProcessField* legacyFields = xCalloc(Platform_numberOfFields+1, sizeof(ProcessField));
-   int legacyFlags;
-   bool legacyFieldsRead = false;
    for (;;) {
       char* line = String_readLine(fd);
       if (!line) {
@@ -311,8 +187,15 @@ static bool Settings_read(Settings* this, const char* fileName) {
          continue;
       }
       if (String_eq(option[0], "fields")) {
-         readFields(legacyFields, &legacyFlags, option[1]);
-         legacyFieldsRead = true;
+         readFields(this->fields, &(this->flags), option[1]);
+         didReadFields = true;
+      } else if (String_eq(option[0], "sort_key")) {
+         // This "+1" is for compatibility with the older enum format.
+         this->sortKey = atoi(option[1]) + 1;
+      } else if (String_eq(option[0], "sort_direction")) {
+         this->direction = atoi(option[1]);
+      } else if (String_eq(option[0], "tree_view")) {
+         this->treeView = atoi(option[1]);
       } else if (String_eq(option[0], "hide_threads")) {
          this->hideThreads = atoi(option[1]);
       } else if (String_eq(option[0], "hide_kernel_threads")) {
@@ -333,8 +216,6 @@ static bool Settings_read(Settings* this, const char* fileName) {
          this->highlightThreads = atoi(option[1]);
       } else if (String_eq(option[0], "header_margin")) {
          this->headerMargin = atoi(option[1]);
-      } else if (String_eq(option[0], "screen_tabs")) {
-         this->screenTabs = atoi(option[1]);
       } else if (String_eq(option[0], "expand_system_time")) {
          // Compatibility option.
          this->detailedCPUTime = atoi(option[1]);
@@ -363,62 +244,40 @@ static bool Settings_read(Settings* this, const char* fileName) {
       } else if (String_eq(option[0], "right_meter_modes")) {
          Settings_readMeterModes(this, option[1], 1);
          didReadMeters = true;
-      } else if (strncmp(option[0], "screen:", 7) == 0) {
-         Settings_newScreen(this, option[0] + 7, option[1]);
-         didReadFields = true;
-      } else if (String_eq(option[0], ".tree_view")) {
-         if (this->nScreens > 0) {
-            this->screens[this->nScreens - 1]->treeView = atoi(option[1]);
-         }
-      } else if (String_eq(option[0], ".sort_direction")) {
-         if (this->nScreens > 0) {
-            this->screens[this->nScreens - 1]->direction = atoi(option[1]);
-         }
-      } else if (String_eq(option[0], ".sort_key")) {
-         if (this->nScreens > 0) {
-            this->screens[this->nScreens - 1]->sortKey = toFieldIndex(option[1]);
-         }
       }
       String_freeArray(option);
    }
    fclose(fd);
-   if (this->nScreens == 0) {
-      Settings_defaultScreens(this);
-      if (legacyFieldsRead) {
-         didReadFields = true;
-         free(this->screens[0]->fields);
-         this->screens[0]->fields = legacyFields;
-         this->screens[0]->flags = legacyFlags;
-      }
-   }
    if (!didReadMeters) {
       Settings_defaultMeters(this);
    }
    return didReadFields;
 }
 
-static void writeFields(FILE* fd, ProcessField* fields, bool byName) {
+static void writeFields(FILE* fd, ProcessField* fields, const char* name) {
+   fprintf(fd, "%s=", name);
    const char* sep = "";
    for (int i = 0; fields[i]; i++) {
-      if (byName) {
-         fprintf(fd, "%s%s", sep, toFieldName(fields[i]));
-      } else {
-         // This " - 1" is for compatibility with the older enum format.
-         fprintf(fd, "%s%d", sep, (int) fields[i] - 1);
-      }
+      // This "-1" is for compatibility with the older enum format.
+      fprintf(fd, "%s%d", sep, (int) fields[i]-1);
       sep = " ";
    }
    fprintf(fd, "\n");
 }
 
-static void writeMeters(Settings* this, FILE* fd, int side) {
-   writeList(fd, this->meterColumns[side].names, this->meterColumns[side].len);
+static void writeMeters(Settings* this, FILE* fd, int column) {
+   const char* sep = "";
+   for (int i = 0; i < this->columns[column].len; i++) {
+      fprintf(fd, "%s%s", sep, this->columns[column].names[i]);
+      sep = " ";
+   }
+   fprintf(fd, "\n");
 }
 
-static void writeMeterModes(Settings* this, FILE* fd, int side) {
+static void writeMeterModes(Settings* this, FILE* fd, int column) {
    const char* sep = "";
-   for (int i = 0; i < this->meterColumns[side].len; i++) {
-      fprintf(fd, "%s%d", sep, this->meterColumns[side].modes[i]);
+   for (int i = 0; i < this->columns[column].len; i++) {
+      fprintf(fd, "%s%d", sep, this->columns[column].modes[i]);
       sep = " ";
    }
    fprintf(fd, "\n");
@@ -436,7 +295,10 @@ bool Settings_write(Settings* this) {
    }
    fprintf(fd, "# Beware! This file is rewritten by htop when settings are changed in the interface.\n");
    fprintf(fd, "# The parser is also very primitive, and not human-friendly.\n");
-   fprintf(fd, "fields="); writeFields(fd, this->screens[0]->fields, false);
+   writeFields(fd, this->fields, "fields");
+   // This "-1" is for compatibility with the older enum format.
+   fprintf(fd, "sort_key=%d\n", (int) this->sortKey-1);
+   fprintf(fd, "sort_direction=%d\n", (int) this->direction);
    fprintf(fd, "hide_threads=%d\n", (int) this->hideThreads);
    fprintf(fd, "hide_kernel_threads=%d\n", (int) this->hideKernelThreads);
    fprintf(fd, "hide_userland_threads=%d\n", (int) this->hideUserlandThreads);
@@ -446,8 +308,8 @@ bool Settings_write(Settings* this) {
    fprintf(fd, "highlight_base_name=%d\n", (int) this->highlightBaseName);
    fprintf(fd, "highlight_megabytes=%d\n", (int) this->highlightMegabytes);
    fprintf(fd, "highlight_threads=%d\n", (int) this->highlightThreads);
+   fprintf(fd, "tree_view=%d\n", (int) this->treeView);
    fprintf(fd, "header_margin=%d\n", (int) this->headerMargin);
-   fprintf(fd, "screen_tabs=%d\n", (int) this->screenTabs);
    fprintf(fd, "detailed_cpu_time=%d\n", (int) this->detailedCPUTime);
    fprintf(fd, "cpu_count_from_zero=%d\n", (int) this->countCPUsFromZero);
    fprintf(fd, "update_process_names=%d\n", (int) this->updateProcessNames);
@@ -458,23 +320,6 @@ bool Settings_write(Settings* this) {
    fprintf(fd, "left_meter_modes="); writeMeterModes(this, fd, 0);
    fprintf(fd, "right_meters="); writeMeters(this, fd, 1);
    fprintf(fd, "right_meter_modes="); writeMeterModes(this, fd, 1);
-
-   // Legacy compatibility with older versions of htop
-   fprintf(fd, "tree_view=%d\n", (int) this->screens[0]->treeView);
-   // This "-1" is for compatibility with the older enum format.
-   fprintf(fd, "sort_key=%d\n", (int) this->screens[0]->sortKey-1);
-   fprintf(fd, "sort_direction=%d\n", (int) this->screens[0]->direction);
-
-   if (this->screens && this->screens[0]) {
-      for (unsigned int i = 0; i < this->nScreens; i++) {
-         ScreenSettings* ss = this->screens[i];
-         fprintf(fd, "screen:%s=", ss->name);
-         writeFields(fd, ss->fields, true);
-         fprintf(fd, ".tree_view=%d\n", (int) ss->treeView);
-         fprintf(fd, ".sort_key=%s\n", toFieldName(ss->sortKey));
-         fprintf(fd, ".sort_direction=%d\n", (int) ss->direction);
-      }
-   }
    fclose(fd);
    return true;
 }
@@ -483,11 +328,14 @@ Settings* Settings_new(int cpuCount) {
   
    Settings* this = xCalloc(1, sizeof(Settings));
 
+   this->sortKey = PERCENT_CPU;
+   this->direction = 1;
    this->hideThreads = false;
    this->shadowOtherUsers = false;
    this->showThreadNames = false;
    this->hideKernelThreads = false;
    this->hideUserlandThreads = false;
+   this->treeView = false;
    this->highlightBaseName = false;
    this->highlightMegabytes = false;
    this->detailedCPUTime = false;
@@ -497,8 +345,15 @@ Settings* Settings_new(int cpuCount) {
    this->showProgramPath = true;
    this->highlightThreads = true;
    
-   this->screens = xCalloc(sizeof(ScreenSettings*), 1);
-   this->nScreens = 0;
+   this->fields = xCalloc(Platform_numberOfFields+1, sizeof(ProcessField));
+   // TODO: turn 'fields' into a Vector,
+   // (and ProcessFields into proper objects).
+   this->flags = 0;
+   ProcessField* defaults = Platform_defaultFields;
+   for (int i = 0; defaults[i]; i++) {
+      this->fields[i] = defaults[i];
+      this->flags |= Process_fields[defaults[i]].flags;
+   }
 
    char* legacyDotfile = NULL;
    char* rcfile = getenv("HTOPRC");
@@ -559,21 +414,15 @@ Settings* Settings_new(int cpuCount) {
    }
    if (!ok) {
       Settings_defaultMeters(this);
-      Settings_defaultScreens(this);
       this->hideKernelThreads = true;
       this->highlightMegabytes = true;
       this->highlightThreads = true;
       this->headerMargin = true;
-      this->screenTabs = true;
    }
-
-   this->ssIndex = 0;
-   this->ss = this->screens[this->ssIndex];
-
    return this;
 }
 
-void ScreenSettings_invertSortOrder(ScreenSettings* this) {
+void Settings_invertSortOrder(Settings* this) {
    if (this->direction == 1)
       this->direction = -1;
    else

Settings.h

@@ -14,44 +14,29 @@ in the source distribution for its full text.
 #include "Process.h"
 #include <stdbool.h>
 
-typedef struct {
-   const char* name;
-   const char* columns;
-   const char* sortKey;
-} ScreenDefaults;
-
 typedef struct {
    int len;
    char** names;
    int* modes;
 } MeterColumnSettings;
 
-typedef struct {
-   char* name;
-   ProcessField* fields;
-   int flags;
-   int direction;
-   ProcessField sortKey;
-   bool treeView;
-} ScreenSettings;
-
 typedef struct Settings_ {
    char* filename;
    
-   MeterColumnSettings meterColumns[2];
-
-   ScreenSettings** screens;
-   unsigned int nScreens;
-   unsigned int ssIndex;
-   ScreenSettings* ss;
+   MeterColumnSettings columns[2];
 
+   ProcessField* fields;
+   int flags;
    int colorScheme;
    int delay;
 
    int cpuCount;
+   int direction;
+   ProcessField sortKey;
 
    bool countCPUsFromZero;
    bool detailedCPUTime;
+   bool treeView;
    bool showProgramPath;
    bool hideThreads;
    bool shadowOtherUsers;
@@ -64,7 +49,6 @@ typedef struct Settings_ {
    bool updateProcessNames;
    bool accountGuestInCPUMeter;
    bool headerMargin;
-   bool screenTabs;
 
    bool changed;
 } Settings;
@@ -74,18 +58,12 @@ typedef struct Settings_ {
 #endif
 
 
-/*
-
-*/
-
 void Settings_delete(Settings* this);
 
-ScreenSettings* Settings_newScreen(Settings* this, const char* name, const char* line);
-
 bool Settings_write(Settings* this);
 
 Settings* Settings_new(int cpuCount);
 
-void ScreenSettings_invertSortOrder(ScreenSettings* this);
+void Settings_invertSortOrder(Settings* this);
 
 #endif

StringUtils.c

@@ -27,11 +27,11 @@ in the source distribution for its full text.
  */
 
 char* String_cat(const char* s1, const char* s2) {
-   size_t l1 = strlen(s1);
-   size_t l2 = strlen(s2);
+   int l1 = strlen(s1);
+   int l2 = strlen(s2);
    char* out = xMalloc(l1 + l2 + 1);
    strncpy(out, s1, l1);
-   strncpy(out + l1, s2, l2 + 1);
+   strncpy(out+l1, s2, l2+1);
    return out;
 }
 
@@ -39,7 +39,7 @@ char* String_trim(const char* in) {
    while (in[0] == ' ' || in[0] == '\t' || in[0] == '\n') {
       in++;
    }
-   size_t len = strlen(in);
+   int len = strlen(in);
    while (len > 0 && (in[len-1] == ' ' || in[len-1] == '\t' || in[len-1] == '\n')) {
       len--;
    }
@@ -80,7 +80,7 @@ char** String_split(const char* s, char sep, int* n) {
       s += size + 1;
    }
    if (s[0] != '\0') {
-      size_t size = strlen(s);
+      int size = strlen(s);
       char* token = xMalloc(size + 1);
       strncpy(token, s, size + 1);
       out[ctr] = token;

TraceScreen.c

@@ -86,7 +86,7 @@ void TraceScreen_draw(InfoScreen* this) {
    mvhline(0, 0, ' ', COLS);
    mvprintw(0, 0, "Trace of process %d - %s", this->process->pid, this->process->comm);
    attrset(CRT_colors[DEFAULT_COLOR]);
-   IncSet_drawBar(this->inc, CRT_colors[FUNCTION_BAR]);
+   IncSet_drawBar(this->inc);
 }
 
 bool TraceScreen_forkTracer(TraceScreen* this) {

configure.ac

@@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.65)
-AC_INIT([htop],[3.0.0beta5],[hisham@gobolinux.org])
+AC_INIT([htop],[2.2.0],[hisham@gobolinux.org])
 
 SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:-$(date +%s)}"
 year=$(date -u -d "@$SOURCE_DATE_EPOCH" "+%Y" 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" "+%Y" 2>/dev/null || date -u "+%Y")
@@ -245,10 +245,6 @@ if test "$my_htop_platform" = "solaris"; then
    AC_CHECK_LIB([kstat], [kstat_open], [], [missing_libraries="$missing_libraries libkstat"])
    AC_CHECK_LIB([proc], [Pgrab_error], [], [missing_libraries="$missing_libraries libproc"])
    AC_CHECK_LIB([malloc], [free], [], [missing_libraries="$missing_libraries libmalloc"])
-   AC_CHECK_HEADERS([err.h],[:],[
-      missing_headers="$missing_headers err.h"
-      AC_MSG_ERROR([You appear to be on Solaris 10, or very early Solaris Express, which are currently unsupported.])
-   ])
 fi
 
 AC_ARG_ENABLE(linux_affinity, [AS_HELP_STRING([--enable-linux-affinity], [enable Linux sched_setaffinity and sched_getaffinity for affinity support, disables hwloc])], ,enable_linux_affinity="yes")
@@ -285,53 +281,7 @@ then
    AC_DEFINE(HAVE_SETUID_ENABLED, 1, [Define if setuid support should be enabled.])
 fi
 
-AC_ARG_ENABLE(perfcounters, [AS_HELP_STRING([--enable-perfcounters], [enable hardware performance counters])],, enable_perfcounters="yes")
-if test "x$enable_perfcounters" = "xyes" -a "$my_htop_platform" = "linux"
-then
-   AC_DEFINE(HAVE_PERFCOUNTERS, 1, [Define if hardware performance counter support should be enabled.])
-
-   AC_CHECK_HEADERS([linux/perf_counter.h], [have_perf_counter=yes],
-                                            [have_perf_counter=no])
-   
-   AC_CHECK_HEADERS([linux/perf_event.h], [have_perf_event=yes],
-                                          [have_perf_event=no])
-   
-   if test "x${have_perf_counter}" = xno -a "x${have_perf_event}" = xno; then
-      os=`uname -s -r`
-      AC_MSG_FAILURE([
-     ------------------------------------------------------------
-      Could not locate linux/perf_count.h or linux/perf_event.h.
-      Are performance counters supported on this machine?
-      Linux 2.6.31+ is required.
-      uname reports: ${os}
-     ------------------------------------------------------------])
-   fi
-   
-   # Check for hardware architecture
-   no_target=yes
-   AC_MSG_CHECKING([hardware])
-   hw=`uname -m`
-   case $hw in
-      x86_64 | i386 | i686 ) :
-         AC_MSG_RESULT([x86])
-         AC_DEFINE([TARGET_X86], [1], [Define to 1 if the target is x86.])
-         no_target=no
-         ;;
-      unknown ) :
-         AC_MSG_RESULT([unknown])
-         AC_MSG_WARN([Could not detect architecture])
-         ;;
-      * ) :
-         AC_MSG_RESULT([$hw])
-         ;;
-   esac
-   
-   if test x$no_target = xyes; then
-      AC_DEFINE([NOTARGET], [1], [Define to 1 when no specific target is supported.])
-   fi
-fi
-
-AC_ARG_ENABLE(delayacct, [AS_HELP_STRING([--enable-delayacct], [enable linux delay accounting])],, enable_delayacct="no")
+AC_ARG_ENABLE(delayacct, [AS_HELP_STRING([--enable-delayacct], [enable Linux delay accounting])],, enable_delayacct="no")
 if test "x$enable_delayacct" = xyes
 then
    m4_ifdef([PKG_PROG_PKG_CONFIG], [
@@ -342,9 +292,7 @@ then
       LIBS="$LIBS $LIBNL3_LIBS $LIBNL3GENL_LIBS"
       AC_DEFINE(HAVE_DELAYACCT, 1, [Define if delay accounting support should be enabled.])
    ], [
-      pkg_m4_absent=1
-      m4_warning([configure is generated without pkg.m4. 'make dist' target will be disabled.])
-      AC_MSG_ERROR([htop on Linux requires pkg-config for checking delayacct requirements. Please install pkg-config and run ./autogen.sh to rebuild the configure script.])
+     AC_MSG_ERROR([htop on Linux requires pkg-config for checking delayacct requirements. Please install pkg-config and run ./autogen.sh to rebuild the configure script.])
    ])
 fi
 

darwin/DarwinProcessList.c

@@ -21,6 +21,37 @@ in the source distribution for its full text.
 #include <sys/sysctl.h>
 #include <stdbool.h>
 
+struct kern {
+    short int version[3];
+};
+
+void GetKernelVersion(struct kern *k) {
+   static short int version_[3] = {0};
+   if (!version_[0]) {
+      // just in case it fails someday
+      version_[0] = version_[1] = version_[2] = -1;
+      char str[256] = {0};
+      size_t size = sizeof(str);
+      int ret = sysctlbyname("kern.osrelease", str, &size, NULL, 0);
+      if (ret == 0) sscanf(str, "%hd.%hd.%hd", &version_[0], &version_[1], &version_[2]);
+    }
+    memcpy(k->version, version_, sizeof(version_));
+}
+
+/* compare the given os version with the one installed returns:
+0 if equals the installed version
+positive value if less than the installed version
+negative value if more than the installed version
+*/
+int CompareKernelVersion(short int major, short int minor, short int component) {
+    struct kern k;
+    GetKernelVersion(&k);
+    if ( k.version[0] !=  major) return k.version[0] - major;
+    if ( k.version[1] !=  minor) return k.version[1] - minor;
+    if ( k.version[2] !=  component) return k.version[2] - component;
+    return 0;
+}
+
 /*{
 #include "ProcessList.h"
 #include <mach/mach_host.h>
@@ -40,51 +71,19 @@ typedef struct DarwinProcessList_ {
 
 }*/
 
-typedef struct kern {
-   short int version[3];
-} kern_;
-
-static void getKernelVersion(struct kern *k) {
-   static short int version_[3] = {0};
-   if (!version_[0]) {
-      // just in case it fails someday
-      version_[0] = version_[1] = version_[2] = -1;
-      char str[256] = {0};
-      size_t size = sizeof(str);
-      int ret = sysctlbyname("kern.osrelease", str, &size, NULL, 0);
-      if (ret == 0) sscanf(str, "%hd.%hd.%hd", &version_[0], &version_[1], &version_[2]);
-   }
-   memcpy(k->version, version_, sizeof(version_));
-}
-
-static int compareKernelVersion(short int major, short int minor, short int component) {
-   /*
-   compare the given os version with the one installed returns:
-   0 if equals the installed version
-   positive value if less than the installed version
-   negative value if more than the installed version
-   */
-   struct kern k;
-   getKernelVersion(&k);
-   if ( k.version[0] != major) return k.version[0] - major;
-   if ( k.version[1] != minor) return k.version[1] - minor;
-   if ( k.version[2] != component) return k.version[2] - component;
-   return 0;
-}
-
 void ProcessList_getHostInfo(host_basic_info_data_t *p) {
    mach_msg_type_number_t info_size = HOST_BASIC_INFO_COUNT;
 
-   if (0 != host_info(mach_host_self(), HOST_BASIC_INFO, (host_info_t)p, &info_size)) {
-      CRT_fatalError("Unable to retrieve host info\n");
+   if(0 != host_info(mach_host_self(), HOST_BASIC_INFO, (host_info_t)p, &info_size)) {
+       CRT_fatalError("Unable to retrieve host info\n");
    }
 }
 
 void ProcessList_freeCPULoadInfo(processor_cpu_load_info_t *p) {
-   if (NULL != p && NULL != *p) {
-      if (0 != munmap(*p, vm_page_size)) {
-         CRT_fatalError("Unable to free old CPU load information\n");
-      }
+   if(NULL != p && NULL != *p) {
+       if(0 != munmap(*p, vm_page_size)) {
+           CRT_fatalError("Unable to free old CPU load information\n");
+       }
    }
 
    *p = NULL;
@@ -95,7 +94,7 @@ unsigned ProcessList_allocateCPULoadInfo(processor_cpu_load_info_t *p) {
    unsigned cpu_count;
 
    // TODO Improving the accuracy of the load counts woule help a lot.
-   if (0 != host_processor_info(mach_host_self(), PROCESSOR_CPU_LOAD_INFO, &cpu_count, (processor_info_array_t *)p, &info_size)) {
+   if(0 != host_processor_info(mach_host_self(), PROCESSOR_CPU_LOAD_INFO, &cpu_count, (processor_info_array_t *)p, &info_size)) {
        CRT_fatalError("Unable to retrieve CPU info\n");
    }
 
@@ -103,10 +102,10 @@ unsigned ProcessList_allocateCPULoadInfo(processor_cpu_load_info_t *p) {
 }
 
 void ProcessList_getVMStats(vm_statistics_t p) {
-   mach_msg_type_number_t info_size = HOST_VM_INFO_COUNT;
+    mach_msg_type_number_t info_size = HOST_VM_INFO_COUNT;
 
-   if (host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t)p, &info_size) != 0)
-      CRT_fatalError("Unable to retrieve VM statistics\n");
+    if (host_statistics(mach_host_self(), HOST_VM_INFO, (host_info_t)p, &info_size) != 0)
+       CRT_fatalError("Unable to retrieve VM statistics\n");
 }
 
 struct kinfo_proc *ProcessList_getKInfoProcs(size_t *count) {
@@ -161,65 +160,65 @@ void ProcessList_delete(ProcessList* this) {
 }
 
 void ProcessList_goThroughEntries(ProcessList* super) {
-   DarwinProcessList *dpl = (DarwinProcessList *)super;
-   bool preExisting = true;
-   struct kinfo_proc *ps;
-   size_t count;
-   DarwinProcess *proc;
-   struct timeval tv;
+    DarwinProcessList *dpl = (DarwinProcessList *)super;
+	bool preExisting = true;
+	struct kinfo_proc *ps;
+	size_t count;
+    DarwinProcess *proc;
+    struct timeval tv;
 
-   gettimeofday(&tv, NULL); /* Start processing time */
+    gettimeofday(&tv, NULL); /* Start processing time */
 
-   /* Update the global data (CPU times and VM stats) */
-   ProcessList_freeCPULoadInfo(&dpl->prev_load);
-   dpl->prev_load = dpl->curr_load;
-   ProcessList_allocateCPULoadInfo(&dpl->curr_load);
-   ProcessList_getVMStats(&dpl->vm_stats);
+    /* Update the global data (CPU times and VM stats) */
+    ProcessList_freeCPULoadInfo(&dpl->prev_load);
+    dpl->prev_load = dpl->curr_load;
+    ProcessList_allocateCPULoadInfo(&dpl->curr_load);
+    ProcessList_getVMStats(&dpl->vm_stats);
 
-   /* Get the time difference */
-   dpl->global_diff = 0;
-   for(int i = 0; i < dpl->super.cpuCount; ++i) {
-      for(size_t j = 0; j < CPU_STATE_MAX; ++j) {
-         dpl->global_diff += dpl->curr_load[i].cpu_ticks[j] - dpl->prev_load[i].cpu_ticks[j];
-      }
-   }
+    /* Get the time difference */
+    dpl->global_diff = 0;
+    for(int i = 0; i < dpl->super.cpuCount; ++i) {
+        for(size_t j = 0; j < CPU_STATE_MAX; ++j) {
+            dpl->global_diff += dpl->curr_load[i].cpu_ticks[j] - dpl->prev_load[i].cpu_ticks[j];
+        }
+    }
 
-   /* Clear the thread counts */
-   super->kernelThreads = 0;
-   super->userlandThreads = 0;
-   super->totalTasks = 0;
-   super->runningTasks = 0;
+    /* Clear the thread counts */
+    super->kernelThreads = 0;
+    super->userlandThreads = 0;
+    super->totalTasks = 0;
+    super->runningTasks = 0;
 
-   /* We use kinfo_procs for initial data since :
-    *
-    * 1) They always succeed.
-    * 2) The contain the basic information.
-    *
-    * We attempt to fill-in additional information with libproc.
-    */
-   ps = ProcessList_getKInfoProcs(&count);
+    /* We use kinfo_procs for initial data since :
+     *
+     * 1) They always succeed.
+     * 2) The contain the basic information.
+     *
+     * We attempt to fill-in additional information with libproc.
+     */
+    ps = ProcessList_getKInfoProcs(&count);
 
-   for(size_t i = 0; i < count; ++i) {
-      proc = (DarwinProcess *)ProcessList_getProcess(super, ps[i].kp_proc.p_pid, &preExisting, (Process_New)DarwinProcess_new);
+    for(size_t i = 0; i < count; ++i) {
+       proc = (DarwinProcess *)ProcessList_getProcess(super, ps[i].kp_proc.p_pid, &preExisting, (Process_New)DarwinProcess_new);
 
-      DarwinProcess_setFromKInfoProc(&proc->super, &ps[i], tv.tv_sec, preExisting);
-      DarwinProcess_setFromLibprocPidinfo(proc, dpl);
+       DarwinProcess_setFromKInfoProc(&proc->super, &ps[i], tv.tv_sec, preExisting);
+       DarwinProcess_setFromLibprocPidinfo(proc, dpl);
 
-      // Disabled for High Sierra due to bug in macOS High Sierra
-      bool isScanThreadSupported  = ! ( compareKernelVersion(17, 0, 0) >= 0 && compareKernelVersion(17, 5, 0) < 0);
+       // Disabled for High Sierra due to bug in macOS High Sierra
+       bool isScanThreadSupported  = ! ( CompareKernelVersion(17, 0, 0) >= 0 && CompareKernelVersion(17, 5, 0) < 0);
 
-      if (isScanThreadSupported){
-         DarwinProcess_scanThreads(proc);
-      }
+       if (isScanThreadSupported){
+           DarwinProcess_scanThreads(proc);
+       }
 
-      super->totalTasks += 1;
+       super->totalTasks += 1;
 
-      if (!preExisting) {
-         proc->super.user = UsersTable_getRef(super->usersTable, proc->super.st_uid);
+       if(!preExisting) {
+           proc->super.user = UsersTable_getRef(super->usersTable, proc->super.st_uid);
 
-         ProcessList_add(super, &proc->super);
-      }
-   }
+           ProcessList_add(super, &proc->super);
+       }
+    }
 
-   free(ps);
+    free(ps);
 }

darwin/DarwinProcessList.h

@@ -26,7 +26,6 @@ typedef struct DarwinProcessList_ {
 } DarwinProcessList;
 
 
-
 void ProcessList_getHostInfo(host_basic_info_data_t *p);
 
 void ProcessList_freeCPULoadInfo(processor_cpu_load_info_t *p);

darwin/Platform.c

@@ -25,26 +25,13 @@ in the source distribution for its full text.
 #include "CPUMeter.h"
 #include "BatteryMeter.h"
 #include "DarwinProcess.h"
-
-typedef enum DarwinProcessFields {
-   LAST_PROCESSFIELD = 100,
-} DarwinProcessField;
-
 }*/
 
 #ifndef CLAMP
 #define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
 #endif
 
-ScreenDefaults Platform_defaultScreens[] = {
-   {
-      .name = "Main",
-      .columns = "PID USER PRIORITY NICE M_SIZE M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command",
-      .sortKey = "PERCENT_CPU",
-   },
-};
-
-const unsigned int Platform_numberOfDefaultScreens = sizeof(Platform_defaultScreens)/sizeof(ScreenDefaults);
+ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
 
 const SignalItem Platform_signals[] = {
    { .name = " 0 Cancel",    .number =  0 },
@@ -110,7 +97,7 @@ ProcessFieldData Process_fields[] = {
    [TIME] = { .name = "TIME", .title = "  TIME+  ", .description = "Total time the process has spent in user and system time", .flags = 0, },
    [NLWP] = { .name = "NLWP", .title = "NLWP ", .description = "Number of threads in the process", .flags = 0, },
    [TGID] = { .name = "TGID", .title = "   TGID ", .description = "Thread group ID (i.e. process ID)", .flags = 0, },
-   [LAST_PROCESSFIELD] = { .name = "*** report bug! ***", .title = NULL, .description = NULL, .flags = 0, },
+   [100] = { .name = "*** report bug! ***", .title = NULL, .description = NULL, .flags = 0, },
 };
 
 MeterClass* Platform_meterTypes[] = {

darwin/Platform.h

@@ -16,18 +16,11 @@ in the source distribution for its full text.
 #include "BatteryMeter.h"
 #include "DarwinProcess.h"
 
-typedef enum DarwinProcessFields {
-   LAST_PROCESSFIELD = 100,
-} DarwinProcessField;
-
-
 #ifndef CLAMP
 #define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
 #endif
 
-extern ScreenDefaults Platform_defaultScreens[];
-
-extern const unsigned int Platform_numberOfDefaultScreens;
+extern ProcessField Platform_defaultFields[];
 
 extern const SignalItem Platform_signals[];
 

dragonflybsd/DragonFlyBSDProcess.c

@@ -138,14 +138,14 @@ void DragonFlyBSDProcess_writeField(Process* this, RichString* str, ProcessField
 long DragonFlyBSDProcess_compare(const void* v1, const void* v2) {
    DragonFlyBSDProcess *p1, *p2;
    Settings *settings = ((Process*)v1)->settings;
-   if (settings->ss->direction == 1) {
+   if (settings->direction == 1) {
       p1 = (DragonFlyBSDProcess*)v1;
       p2 = (DragonFlyBSDProcess*)v2;
    } else {
       p2 = (DragonFlyBSDProcess*)v1;
       p1 = (DragonFlyBSDProcess*)v2;
    }
-   switch ((int) settings->ss->sortKey) {
+   switch ((int) settings->sortKey) {
    // add Platform-specific fields here
    case JID:
       return (p1->jid - p2->jid);

dragonflybsd/Platform.c

@@ -40,15 +40,7 @@ extern ProcessFieldData Process_fields[];
 #define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
 #endif
 
-ScreenDefaults Platform_defaultScreens[] = {
-   {
-      .name = "Main",
-      .columns = "PID USER PRIORITY NICE M_SIZE M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command",
-      .sortKey = "PERCENT_CPU",
-   },
-};
-
-const unsigned int Platform_numberOfDefaultScreens = sizeof(Platform_defaultScreens)/sizeof(ScreenDefaults);
+ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
 
 int Platform_numberOfFields = LAST_PROCESSFIELD;
 

dragonflybsd/Platform.h

@@ -21,9 +21,7 @@ extern ProcessFieldData Process_fields[];
 #define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
 #endif
 
-extern ScreenDefaults Platform_defaultScreens[];
-
-extern const unsigned int Platform_numberOfDefaultScreens;
+extern ProcessField Platform_defaultFields[];
 
 extern int Platform_numberOfFields;
 

freebsd/FreeBSDProcess.c

@@ -136,14 +136,14 @@ void FreeBSDProcess_writeField(Process* this, RichString* str, ProcessField fiel
 long FreeBSDProcess_compare(const void* v1, const void* v2) {
    FreeBSDProcess *p1, *p2;
    Settings *settings = ((Process*)v1)->settings;
-   if (settings->ss->direction == 1) {
+   if (settings->direction == 1) {
       p1 = (FreeBSDProcess*)v1;
       p2 = (FreeBSDProcess*)v2;
    } else {
       p2 = (FreeBSDProcess*)v1;
       p1 = (FreeBSDProcess*)v2;
    }
-   switch ((int) settings->ss->sortKey) {
+   switch ((int) settings->sortKey) {
    // add FreeBSD-specific fields here
    case JID:
       return (p1->jid - p2->jid);

freebsd/Platform.c

@@ -39,16 +39,6 @@ extern ProcessFieldData Process_fields[];
 #define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
 #endif
 
-ScreenDefaults Platform_defaultScreens[] = {
-   {
-      .name = "Main",
-      .columns = "PID USER PRIORITY NICE M_SIZE M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command",
-      .sortKey = "PERCENT_CPU",
-   },
-};
-
-const unsigned int Platform_numberOfDefaultScreens = sizeof(Platform_defaultScreens)/sizeof(ScreenDefaults);
-
 ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
 
 int Platform_numberOfFields = LAST_PROCESSFIELD;

freebsd/Platform.h

@@ -20,10 +20,6 @@ extern ProcessFieldData Process_fields[];
 #define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
 #endif
 
-extern ScreenDefaults Platform_defaultScreens[];
-
-extern const unsigned int Platform_numberOfDefaultScreens;
-
 extern ProcessField Platform_defaultFields[];
 
 extern int Platform_numberOfFields;

htop.1.in

@@ -85,13 +85,8 @@ Tag or untag a process. Commands that can operate on multiple processes,
 like "kill", will then apply over the list of tagged processes, instead
 of the currently highlighted one.
 .TP
-.B c
-Tag the current process and its children. Commands that can operate on multiple
-processes, like "kill", will then apply over the list of tagged processes,
-instead of the currently highlighted one.
-.TP
 .B U
-Untag all processes (remove all tags added with the Space or c keys).
+Untag all processes (remove all tags added with the Space key).
 .TP
 .B s
 Trace process system calls: if strace(1) is installed, pressing this key

htop.c

@@ -93,7 +93,7 @@ static CommandLineSettings parseArguments(int argc, char** argv) {
 
    int opt, opti=0;
    /* Parse arguments */
-   while ((opt = getopt_long(argc, argv, "hvCs:td:u:p:i", long_opts, &opti))) {
+   while ((opt = getopt_long(argc, argv, "hvCst::d:u:p:i", long_opts, &opti))) {
       if (opt == EOF) break;
       switch (opt) {
          case 'h':
@@ -205,19 +205,19 @@ int main(int argc, char** argv) {
    if (!flags.useColors) 
       settings->colorScheme = COLORSCHEME_MONOCHROME;
    if (flags.treeView)
-      settings->screens[0]->treeView = true;
+      settings->treeView = true;
 
    CRT_init(settings->delay, settings->colorScheme);
    
    MainPanel* panel = MainPanel_new();
    ProcessList_setPanel(pl, (Panel*) panel);
 
-   MainPanel_updateTreeFunctions(panel, settings->screens[0]->treeView);
+   MainPanel_updateTreeFunctions(panel, settings->treeView);
       
    if (flags.sortKey > 0) {
-      settings->screens[0]->sortKey = flags.sortKey;
-      settings->screens[0]->treeView = false;
-      settings->screens[0]->direction = 1;
+      settings->sortKey = flags.sortKey;
+      settings->treeView = false;
+      settings->direction = 1;
    }
    ProcessList_printHeader(pl, Panel_getHeader((Panel*)panel));
 
@@ -237,7 +237,7 @@ int main(int argc, char** argv) {
    millisleep(75);
    ProcessList_scan(pl);
 
-   ScreenManager_run(scr, NULL, NULL, NULL);
+   ScreenManager_run(scr, NULL, NULL);   
    
    attron(CRT_colors[RESET_COLOR]);
    mvhline(LINES-1, 0, ' ', COLS);

htop.desktop

@@ -1,37 +1,9 @@
 [Desktop Entry]
-Type=Application
 Version=1.0
 Name=Htop
-GenericName=Process Viewer
-GenericName[ca]=Visualitzador de processos
-GenericName[de]=Prozessanzeige
-GenericName[en_GB]=Process Viewer
-GenericName[es]=Visor de procesos
-GenericName[fi]=Prosessikatselin
-GenericName[fr]=Visualiseur de processus
-GenericName[gl]=Visor de procesos
-GenericName[it]=Visore dei processi
-GenericName[ko]=프로세스 뷰어
-GenericName[nb]=Prosessviser
-GenericName[nl]=Viewer van processen
-GenericName[nn]=Prosessvisar
-GenericName[pl]=Przeglądarka procesów
-GenericName[pt]=Visualizador de Processos
-GenericName[pt_BR]=Visualizador de processos
-GenericName[ru]=Монитор процессов
-GenericName[sk]=Prehliadač procesov
-GenericName[sl]=Pregledovalnik opravil
-GenericName[sr@ijekavian]=Приказивач процеса
-GenericName[sr@ijekavianlatin]=Prikazivač procesa
-GenericName[sr@latin]=Prikazivač procesa
-GenericName[sr]=Приказивач процеса
-GenericName[sv]=Processvisning
-GenericName[tr]=Süreç Görüntüleyici
-GenericName[uk]=Перегляд процесів
-GenericName[zh_CN]=进程查看器
-GenericName[zh_TW]=行程檢視器
+Type=Application
 Comment=Show System Processes
-Comment[ca]=Visualitzeu els processos del sistema
+Comment[ca]=Mostra els processos del sistema
 Comment[de]=Systemprozesse anzeigen
 Comment[en_GB]=Show System Processes
 Comment[es]=Mostrar procesos del sistema
@@ -49,17 +21,45 @@ Comment[pt_BR]=Mostra os processos do sistema
 Comment[ru]=Просмотр списка процессов в системе
 Comment[sk]=Zobraziť systémové procesy
 Comment[sl]=Prikaz sistemskih opravil
+Comment[sr]=Приказ системских процеса
 Comment[sr@ijekavian]=Приказ системских процеса
 Comment[sr@ijekavianlatin]=Prikaz sistemskih procesa
 Comment[sr@latin]=Prikaz sistemskih procesa
-Comment[sr]=Приказ системских процеса
 Comment[sv]=Visa systemprocesser
 Comment[tr]=Sistem Süreçlerini Göster
 Comment[uk]=Перегляд системних процесів
 Comment[zh_CN]=显示系统进程
 Comment[zh_TW]=顯示系統行程
-Icon=htop
-Exec=htop
 Terminal=true
-Categories=System;Monitor;ConsoleOnly;
+Exec=htop
+Icon=htop
+Categories=ConsoleOnly;System;
+GenericName=Process Viewer
+GenericName[ca]=Visor de processos
+GenericName[de]=Prozessanzeige
+GenericName[en_GB]=Process Viewer
+GenericName[es]=Visor de procesos
+GenericName[fi]=Prosessikatselin
+GenericName[fr]=Visualiseur de processus
+GenericName[gl]=Visor de procesos
+GenericName[it]=Visore dei processi
+GenericName[ko]=프로세스 뷰어
+GenericName[nb]=Prosessviser
+GenericName[nl]=Viewer van processen
+GenericName[nn]=Prosessvisar
+GenericName[pl]=Przeglądarka procesów
+GenericName[pt]=Visualizador de Processos
+GenericName[pt_BR]=Visualizador de processos
+GenericName[ru]=Монитор процессов
+GenericName[sk]=Prehliadač procesov
+GenericName[sl]=Pregledovalnik opravil
+GenericName[sr]=Приказивач процеса
+GenericName[sr@ijekavian]=Приказивач процеса
+GenericName[sr@ijekavianlatin]=Prikazivač procesa
+GenericName[sr@latin]=Prikazivač procesa
+GenericName[sv]=Processvisning
+GenericName[tr]=Süreç Görüntüleyici
+GenericName[uk]=Перегляд процесів
+GenericName[zh_CN]=进程查看器
+GenericName[zh_TW]=行程檢視器
 Keywords=system;process;task

linux/LinuxProcess.c

@@ -15,28 +15,14 @@ in the source distribution for its full text.
 #include <unistd.h>
 #include <string.h>
 #include <sys/syscall.h>
-#include <time.h>
 
 /*{
 
-#include "PerfCounter.h"
-
-#define PROCESS_FLAG_LINUX_IOPRIO   0x0100L
-#define PROCESS_FLAG_LINUX_OPENVZ   0x0200L
-#define PROCESS_FLAG_LINUX_VSERVER  0x0400L
-#define PROCESS_FLAG_LINUX_CGROUP   0x0800L
-#define PROCESS_FLAG_LINUX_OOM      0x1000L
-
-#define PROCESS_FLAG_LINUX_HPC       0xff0000L
-#define PROCESS_FLAG_LINUX_HPC_CYCLE 0x10000L
-#define PROCESS_FLAG_LINUX_HPC_INSN  0x20000L
-#define PROCESS_FLAG_LINUX_HPC_MISS  0x40000L
-#define PROCESS_FLAG_LINUX_HPC_BMISS 0x80000L
-
-#define PROCESS_FLAG_LINUX_HPC_L1DR   0x100000L
-#define PROCESS_FLAG_LINUX_HPC_L1DW   0x200000L
-#define PROCESS_FLAG_LINUX_HPC_L1DRM  0x400000L
-#define PROCESS_FLAG_LINUX_HPC_L1DWM  0x800000L
+#define PROCESS_FLAG_LINUX_IOPRIO   0x0100
+#define PROCESS_FLAG_LINUX_OPENVZ   0x0200
+#define PROCESS_FLAG_LINUX_VSERVER  0x0400
+#define PROCESS_FLAG_LINUX_CGROUP   0x0800
+#define PROCESS_FLAG_LINUX_OOM      0x1000
 
 typedef enum UnsupportedProcessFields {
    FLAGS = 9,
@@ -100,18 +86,7 @@ typedef enum LinuxProcessFields {
    PERCENT_IO_DELAY = 117,
    PERCENT_SWAP_DELAY = 118,
    #endif
-   #ifdef HAVE_PERFCOUNTERS
-   IPC = 119,
-   MCYCLE = 120,
-   MINSTR = 121,
-   PERCENT_MISS = 122,
-   PERCENT_BMISS = 123,
-   L1DREADS = 124,
-   L1DRMISSES = 125,
-   L1DWRITES = 126,
-   L1DWMISSES = 127,
-   #endif
-   LAST_PROCESSFIELD = 128,
+   LAST_PROCESSFIELD = 119,
 } LinuxProcessField;
 
 #include "IOPriority.h"
@@ -131,7 +106,6 @@ typedef struct LinuxProcess_ {
    long m_drs;
    long m_lrs;
    long m_dt;
-   unsigned long long starttime;
    #ifdef HAVE_TASKSTATS
    unsigned long long io_rchar;
    unsigned long long io_wchar;
@@ -166,29 +140,10 @@ typedef struct LinuxProcess_ {
    float blkio_delay_percent;
    float swapin_delay_percent;
    #endif
-   #ifdef HAVE_PERFCOUNTERS
-   PerfCounter* cycleCounter;
-   PerfCounter* insnCounter;
-   PerfCounter* missCounter;
-   PerfCounter* brCounter;
-   PerfCounter* l1drCounter;
-   PerfCounter* l1drmCounter;
-   PerfCounter* l1dwCounter;
-   PerfCounter* l1dwmCounter;
-   float ipc;
-   float mcycle;
-   float minstr;
-   float pMiss;
-   float pBMiss;
-   float l1dr;
-   float l1drm;
-   float l1dw;
-   float l1dwm;
-   #endif
 } LinuxProcess;
 
 #ifndef Process_isKernelThread
-#define Process_isKernelThread(_process) (((LinuxProcess*)(_process))->isKernelThread)
+#define Process_isKernelThread(_process) ((LinuxProcess*)(_process)->isKernelThread)
 #endif
 
 #ifndef Process_isUserlandThread
@@ -197,8 +152,6 @@ typedef struct LinuxProcess_ {
 
 }*/
 
-long long btime; /* semi-global */
-
 ProcessFieldData Process_fields[] = {
    [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },
    [PID] = { .name = "PID", .title = "    PID ", .description = "Process/thread ID", .flags = 0, },
@@ -278,20 +231,9 @@ ProcessFieldData Process_fields[] = {
    [OOM] = { .name = "OOM", .title = "    OOM ", .description = "OOM (Out-of-Memory) killer score", .flags = PROCESS_FLAG_LINUX_OOM, },
    [IO_PRIORITY] = { .name = "IO_PRIORITY", .title = "IO ", .description = "I/O priority", .flags = PROCESS_FLAG_LINUX_IOPRIO, },
 #ifdef HAVE_DELAYACCT
-   [PERCENT_CPU_DELAY] = { .name = "PERCENT_CPU_DELAY", .title = "CPD% ", .description = "CPU delay %", .flags = 0, },
+   [PERCENT_CPU_DELAY] = { .name = "PERCENT_CPU_DELAY", .title = "CPUD% ", .description = "CPU delay %", .flags = 0, },
    [PERCENT_IO_DELAY] = { .name = "PERCENT_IO_DELAY", .title = "IOD% ", .description = "Block I/O delay %", .flags = 0, },
-   [PERCENT_SWAP_DELAY] = { .name = "PERCENT_SWAP_DELAY", .title = "SWD% ", .description = "Swapin delay %", .flags = 0, },
-#endif
-#ifdef HAVE_PERFCOUNTERS
-   [IPC] = { .name = "IPC", .title = "   IPC ", .description = "Executed instructions per cycle", .flags = PROCESS_FLAG_LINUX_HPC_CYCLE | PROCESS_FLAG_LINUX_HPC_INSN, },
-   [MCYCLE] = { .name = "MCYCLE", .title = "  Mcycle ", .description = "Cycles (millions)", .flags = PROCESS_FLAG_LINUX_HPC_CYCLE, },
-   [MINSTR] = { .name = "MINSTR", .title = "  Minstr ", .description = "Instructions (millions)", .flags = PROCESS_FLAG_LINUX_HPC_INSN, },
-   [PERCENT_MISS] = { .name = "PERCENT_MISS", .title = "MIS% ", .description = "Cache misses per 100 instructions", .flags = PROCESS_FLAG_LINUX_HPC_MISS | PROCESS_FLAG_LINUX_HPC_INSN, },
-   [PERCENT_BMISS] = { .name = "PERCENT_BMISS", .title = "BrM% ", .description = "Branch misprediction per 100 instructions", .flags = PROCESS_FLAG_LINUX_HPC_BMISS | PROCESS_FLAG_LINUX_HPC_INSN, },
-   [L1DREADS] = { .name = "L1DREADS", .title =     "  L1Dread ", .description = "L1 data cache: reads (thousands)", .flags = PROCESS_FLAG_LINUX_HPC_L1DR, },
-   [L1DRMISSES] = { .name = "L1DRMISSES", .title = "   R miss ", .description = "L1 data cache: reads misses (thousands)", .flags = PROCESS_FLAG_LINUX_HPC_L1DRM, },
-   [L1DWRITES] = { .name = "L1DWRITES", .title =   " L1Dwrite ", .description = "L1D data cache: writes (thousands)", .flags = PROCESS_FLAG_LINUX_HPC_L1DW, },
-   [L1DWMISSES] = { .name = "L1DWMISSES", .title = "   W miss ", .description = "L1D data cache: write misses (thousands)", .flags = PROCESS_FLAG_LINUX_HPC_L1DWM, },
+   [PERCENT_SWAP_DELAY] = { .name = "PERCENT_SWAP_DELAY", .title = "SWAPD% ", .description = "Swapin delay %", .flags = 0, },
 #endif
    [LAST_PROCESSFIELD] = { .name = "*** report bug! ***", .title = NULL, .description = NULL, .flags = 0, },
 };
@@ -332,10 +274,6 @@ void Process_delete(Object* cast) {
    Process_done((Process*)cast);
 #ifdef HAVE_CGROUP
    free(this->cgroup);
-#endif
-#ifdef HAVE_PERFCOUNTERS
-   PerfCounter_delete(this->cycleCounter);
-   PerfCounter_delete(this->insnCounter);
 #endif
    free(this->ttyDevice);
    free(this);
@@ -369,43 +307,14 @@ bool LinuxProcess_setIOPriority(LinuxProcess* this, IOPriority ioprio) {
    return (LinuxProcess_updateIOPriority(this) == ioprio);
 }
 
-#if HAVE_DELAYACCT || HAVE_PERFCOUNTERS
-
-static char* perfFmt[] = {
-   "%6.2f ",
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   "%6.1f ",
-   "%7.1f ",
-   "%8.2f ",
-   "%9.1f ",
-};
-
-static char* perfNA[] = {
-   "   N/A ",
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   NULL,
-   "   N/A ",
-   "    N/A ",
-   "     N/A ",
-   "      N/A ",
-};
-
-static inline void LinuxProcess_printPerfCounter(float val, int len, char* buffer, int n, int* attr) {
-   if (val != -1) {
-      xSnprintf(buffer, n, perfFmt[len], val);
-   } else {
-      xSnprintf(buffer, n, perfNA[len]);
-      *attr = CRT_colors[PROCESS_SHADOW];
-   }
+#ifdef HAVE_DELAYACCT
+void LinuxProcess_printDelay(float delay_percent, char* buffer, int n) {
+  if (delay_percent == -1LL) {
+    xSnprintf(buffer, n, " N/A  ");
+  } else {
+    xSnprintf(buffer, n, "%4.1f  ", delay_percent);
+  }
 }
-
 #endif
 
 void LinuxProcess_writeField(Process* this, RichString* str, ProcessField field) {
@@ -435,13 +344,6 @@ void LinuxProcess_writeField(Process* this, RichString* str, ProcessField field)
    case STIME: Process_printTime(str, lp->stime); return;
    case CUTIME: Process_printTime(str, lp->cutime); return;
    case CSTIME: Process_printTime(str, lp->cstime); return;
-   case STARTTIME: {
-     struct tm date;
-     time_t starttimewall = btime + (lp->starttime / sysconf(_SC_CLK_TCK));
-     (void) localtime_r(&starttimewall, &date);
-     strftime(buffer, n, ((starttimewall > time(NULL) - 86400) ? "%R " : "%b%d "), &date);
-     break;
-   }
    #ifdef HAVE_TASKSTATS
    case RCHAR:  Process_colorNumber(str, lp->io_rchar, coloring); return;
    case WCHAR:  Process_colorNumber(str, lp->io_wchar, coloring); return;
@@ -489,20 +391,9 @@ void LinuxProcess_writeField(Process* this, RichString* str, ProcessField field)
       break;
    }
    #ifdef HAVE_DELAYACCT
-   case PERCENT_CPU_DELAY:  Process_printPercentage(lp->cpu_delay_percent,    buffer, n, &attr); break;
-   case PERCENT_IO_DELAY:   Process_printPercentage(lp->blkio_delay_percent,  buffer, n, &attr); break;
-   case PERCENT_SWAP_DELAY: Process_printPercentage(lp->swapin_delay_percent, buffer, n, &attr); break;
-   #endif
-   #ifdef HAVE_PERFCOUNTERS
-   case PERCENT_MISS:  Process_printPercentage(lp->pMiss,  buffer, n, &attr); break;
-   case PERCENT_BMISS: Process_printPercentage(lp->pBMiss, buffer, n, &attr); break;
-   case IPC:            LinuxProcess_printPerfCounter(lp->ipc,    0, buffer, n, &attr); break;
-   case MCYCLE:         LinuxProcess_printPerfCounter(lp->mcycle, 8, buffer, n, &attr); break;
-   case MINSTR:         LinuxProcess_printPerfCounter(lp->minstr, 8, buffer, n, &attr); break;
-   case L1DREADS:       LinuxProcess_printPerfCounter(lp->l1dr,   9, buffer, n, &attr); break;
-   case L1DRMISSES:     LinuxProcess_printPerfCounter(lp->l1drm,  9, buffer, n, &attr); break;
-   case L1DWRITES:      LinuxProcess_printPerfCounter(lp->l1dw,   9, buffer, n, &attr); break;
-   case L1DWMISSES:     LinuxProcess_printPerfCounter(lp->l1dwm,  9, buffer, n, &attr); break;
+   case PERCENT_CPU_DELAY: LinuxProcess_printDelay(lp->cpu_delay_percent, buffer, n); break;
+   case PERCENT_IO_DELAY: LinuxProcess_printDelay(lp->blkio_delay_percent, buffer, n); break;
+   case PERCENT_SWAP_DELAY: LinuxProcess_printDelay(lp->swapin_delay_percent, buffer, n); break;
    #endif
    default:
       Process_writeField((Process*)this, str, field);
@@ -511,12 +402,10 @@ void LinuxProcess_writeField(Process* this, RichString* str, ProcessField field)
    RichString_append(str, attr, buffer);
 }
 
-#define COMPARE_FIELD(_f) return (p2->_f > p1->_f ? 1 : -1)
-
 long LinuxProcess_compare(const void* v1, const void* v2) {
    LinuxProcess *p1, *p2;
    Settings *settings = ((Process*)v1)->settings;
-   if (settings->ss->direction == 1) {
+   if (settings->direction == 1) {
       p1 = (LinuxProcess*)v1;
       p2 = (LinuxProcess*)v2;
    } else {
@@ -524,11 +413,7 @@ long LinuxProcess_compare(const void* v1, const void* v2) {
       p1 = (LinuxProcess*)v2;
    }
    long long diff;
-   switch ((int)settings->ss->sortKey) {
-   case CMAJFLT:
-      return (p2->cmajflt - p1->cmajflt);
-   case CMINFLT:
-      return (p2->cminflt - p1->cminflt);
+   switch ((int)settings->sortKey) {
    case M_DRS:
       return (p2->m_drs - p1->m_drs);
    case M_DT:
@@ -543,12 +428,6 @@ long LinuxProcess_compare(const void* v1, const void* v2) {
    case CUTIME: diff = p2->cutime - p1->cutime; goto test_diff;
    case STIME:  diff = p2->stime - p1->stime; goto test_diff;
    case CSTIME: diff = p2->cstime - p1->cstime; goto test_diff;
-   case STARTTIME: {
-      if (p1->starttime == p2->starttime)
-         return (p1->super.pid - p2->super.pid);
-      else
-         return (p1->starttime - p2->starttime);
-   }
    #ifdef HAVE_TASKSTATS
    case RCHAR:  diff = p2->io_rchar - p1->io_rchar; goto test_diff;
    case WCHAR:  diff = p2->io_wchar - p1->io_wchar; goto test_diff;
@@ -578,20 +457,12 @@ long LinuxProcess_compare(const void* v1, const void* v2) {
    case OOM:
       return (p2->oom - p1->oom);
    #ifdef HAVE_DELAYACCT
-   case PERCENT_CPU_DELAY:  COMPARE_FIELD(cpu_delay_percent);
-   case PERCENT_IO_DELAY:   COMPARE_FIELD(blkio_delay_percent);
-   case PERCENT_SWAP_DELAY: COMPARE_FIELD(swapin_delay_percent);
-   #endif
-   #ifdef HAVE_PERFCOUNTERS
-   case PERCENT_MISS:   COMPARE_FIELD(pMiss);
-   case PERCENT_BMISS:  COMPARE_FIELD(pBMiss);
-   case IPC:            COMPARE_FIELD(ipc);
-   case MCYCLE:         COMPARE_FIELD(mcycle);
-   case MINSTR:         COMPARE_FIELD(minstr);
-   case L1DREADS:       COMPARE_FIELD(l1dr);
-   case L1DRMISSES:     COMPARE_FIELD(l1drm);
-   case L1DWRITES:      COMPARE_FIELD(l1dw);
-   case L1DWMISSES:     COMPARE_FIELD(l1dwm);
+   case PERCENT_CPU_DELAY:
+      return (p2->cpu_delay_percent > p1->cpu_delay_percent ? 1 : -1);
+   case PERCENT_IO_DELAY:
+      return (p2->blkio_delay_percent > p1->blkio_delay_percent ? 1 : -1);
+   case PERCENT_SWAP_DELAY:
+      return (p2->swapin_delay_percent > p1->swapin_delay_percent ? 1 : -1);
    #endif
    case IO_PRIORITY:
       return LinuxProcess_effectiveIOPriority(p1) - LinuxProcess_effectiveIOPriority(p2);
@@ -605,3 +476,4 @@ long LinuxProcess_compare(const void* v1, const void* v2) {
 bool Process_isThread(Process* this) {
    return (Process_isUserlandThread(this) || Process_isKernelThread(this));
 }
+

linux/LinuxProcess.h

@@ -10,24 +10,11 @@ in the source distribution for its full text.
 */
 
 
-#include "PerfCounter.h"
-
-#define PROCESS_FLAG_LINUX_IOPRIO   0x0100L
-#define PROCESS_FLAG_LINUX_OPENVZ   0x0200L
-#define PROCESS_FLAG_LINUX_VSERVER  0x0400L
-#define PROCESS_FLAG_LINUX_CGROUP   0x0800L
-#define PROCESS_FLAG_LINUX_OOM      0x1000L
-
-#define PROCESS_FLAG_LINUX_HPC       0xff0000L
-#define PROCESS_FLAG_LINUX_HPC_CYCLE 0x10000L
-#define PROCESS_FLAG_LINUX_HPC_INSN  0x20000L
-#define PROCESS_FLAG_LINUX_HPC_MISS  0x40000L
-#define PROCESS_FLAG_LINUX_HPC_BMISS 0x80000L
-
-#define PROCESS_FLAG_LINUX_HPC_L1DR   0x100000L
-#define PROCESS_FLAG_LINUX_HPC_L1DW   0x200000L
-#define PROCESS_FLAG_LINUX_HPC_L1DRM  0x400000L
-#define PROCESS_FLAG_LINUX_HPC_L1DWM  0x800000L
+#define PROCESS_FLAG_LINUX_IOPRIO   0x0100
+#define PROCESS_FLAG_LINUX_OPENVZ   0x0200
+#define PROCESS_FLAG_LINUX_VSERVER  0x0400
+#define PROCESS_FLAG_LINUX_CGROUP   0x0800
+#define PROCESS_FLAG_LINUX_OOM      0x1000
 
 typedef enum UnsupportedProcessFields {
    FLAGS = 9,
@@ -91,18 +78,7 @@ typedef enum LinuxProcessFields {
    PERCENT_IO_DELAY = 117,
    PERCENT_SWAP_DELAY = 118,
    #endif
-   #ifdef HAVE_PERFCOUNTERS
-   IPC = 119,
-   MCYCLE = 120,
-   MINSTR = 121,
-   PERCENT_MISS = 122,
-   PERCENT_BMISS = 123,
-   L1DREADS = 124,
-   L1DRMISSES = 125,
-   L1DWRITES = 126,
-   L1DWMISSES = 127,
-   #endif
-   LAST_PROCESSFIELD = 128,
+   LAST_PROCESSFIELD = 119,
 } LinuxProcessField;
 
 #include "IOPriority.h"
@@ -122,7 +98,6 @@ typedef struct LinuxProcess_ {
    long m_drs;
    long m_lrs;
    long m_dt;
-   unsigned long long starttime;
    #ifdef HAVE_TASKSTATS
    unsigned long long io_rchar;
    unsigned long long io_wchar;
@@ -157,25 +132,6 @@ typedef struct LinuxProcess_ {
    float blkio_delay_percent;
    float swapin_delay_percent;
    #endif
-   #ifdef HAVE_PERFCOUNTERS
-   PerfCounter* cycleCounter;
-   PerfCounter* insnCounter;
-   PerfCounter* missCounter;
-   PerfCounter* brCounter;
-   PerfCounter* l1drCounter;
-   PerfCounter* l1drmCounter;
-   PerfCounter* l1dwCounter;
-   PerfCounter* l1dwmCounter;
-   float ipc;
-   float mcycle;
-   float minstr;
-   float pMiss;
-   float pBMiss;
-   float l1dr;
-   float l1drm;
-   float l1dw;
-   float l1dwm;
-   #endif
 } LinuxProcess;
 
 #ifndef Process_isKernelThread
@@ -187,8 +143,6 @@ typedef struct LinuxProcess_ {
 #endif
 
 
-long long btime; /* semi-global */
-
 extern ProcessFieldData Process_fields[];
 
 extern ProcessPidColumn Process_pidColumns[];
@@ -213,16 +167,15 @@ IOPriority LinuxProcess_updateIOPriority(LinuxProcess* this);
 
 bool LinuxProcess_setIOPriority(LinuxProcess* this, IOPriority ioprio);
 
-#if HAVE_DELAYACCT || HAVE_PERFCOUNTERS
-
+#ifdef HAVE_DELAYACCT
+void LinuxProcess_printDelay(float delay_percent, char* buffer, int n);
 #endif
 
 void LinuxProcess_writeField(Process* this, RichString* str, ProcessField field);
 
-#define COMPARE_FIELD(_f) return (p2->_f > p1->_f ? 1 : -1)
-
 long LinuxProcess_compare(const void* v1, const void* v2);
 
 bool Process_isThread(Process* this);
 
+
 #endif

linux/LinuxProcessList.c

@@ -47,8 +47,6 @@ in the source distribution for its full text.
 
 #include "ProcessList.h"
 
-extern long long btime;
-
 typedef struct CPUData_ {
    unsigned long long int totalTime;
    unsigned long long int userTime;
@@ -113,7 +111,7 @@ typedef struct LinuxProcessList_ {
 #endif
 
 #ifndef PROC_LINE_LENGTH
-#define PROC_LINE_LENGTH 4096
+#define PROC_LINE_LENGTH 512
 #endif
 
 }*/
@@ -232,8 +230,8 @@ static void LinuxProcessList_initNetlinkSocket(LinuxProcessList* this) {
 ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, uid_t userId) {
    LinuxProcessList* this = xCalloc(1, sizeof(LinuxProcessList));
    ProcessList* pl = &(this->super);
-
    ProcessList_init(pl, Class(LinuxProcess), usersTable, pidWhiteList, userId);
+   
    LinuxProcessList_initTtyDrivers(this);
 
    #ifdef HAVE_DELAYACCT
@@ -245,19 +243,13 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, ui
    if (file == NULL) {
       CRT_fatalError("Cannot open " PROCSTATFILE);
    }
-   int cpus = 0;
+   char buffer[PROC_LINE_LENGTH + 1];
+   int cpus = -1;
    do {
-      char buffer[PROC_LINE_LENGTH + 1];
-      if (fgets(buffer, PROC_LINE_LENGTH + 1, file) == NULL) {
-         CRT_fatalError("No btime in " PROCSTATFILE);
-      } else if (String_startsWith(buffer, "cpu")) {
-         cpus++;
-      } else if (String_startsWith(buffer, "btime ")) {
-         sscanf(buffer, "btime %lld\n", &btime);
-         break;
-      }
-   } while(true);
-
+      cpus++;
+      char * s = fgets(buffer, PROC_LINE_LENGTH, file);
+      (void) s;
+   } while (String_startsWith(buffer, "cpu"));
    fclose(file);
 
    pl->cpuCount = MAX(cpus - 1, 1);
@@ -267,6 +259,7 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, ui
       this->cpus[i].totalTime = 1;
       this->cpus[i].totalPeriod = 1;
    }
+
    return pl;
 }
 
@@ -362,10 +355,7 @@ static bool LinuxProcessList_readStatFile(Process *process, const char* dirname,
    location += 1;
    process->nlwp = strtol(location, &location, 10);
    location += 1;
-   location = strchr(location, ' ')+1;
-   lp->starttime = strtoll(location, &location, 10);
-   location += 1;
-   for (int i=0; i<15; i++) location = strchr(location, ' ')+1;
+   for (int i=0; i<17; i++) location = strchr(location, ' ')+1;
    process->exit_signal = strtol(location, &location, 10);
    location += 1;
    assert(location != NULL);
@@ -377,7 +367,7 @@ static bool LinuxProcessList_readStatFile(Process *process, const char* dirname,
 }
 
 
-static bool LinuxProcessList_statProcessDir(Process* process, const char* dirname, char* name) {
+static bool LinuxProcessList_statProcessDir(Process* process, const char* dirname, char* name, time_t curTime) {
    char filename[MAX_NAME+1];
    filename[MAX_NAME] = '\0';
 
@@ -387,6 +377,13 @@ static bool LinuxProcessList_statProcessDir(Process* process, const char* dirnam
    if (statok == -1)
       return false;
    process->st_uid = sstat.st_uid;
+  
+   struct tm date;
+   time_t ctime = sstat.st_ctime;
+   process->starttime_ctime = ctime;
+   (void) localtime_r((time_t*) &ctime, &date);
+   strftime(process->starttime_show, 7, ((ctime > curTime - 86400) ? "%R " : "%b%d "), &date);
+   
    return true;
 }
 
@@ -656,9 +653,9 @@ static void LinuxProcessList_readDelayAcctData(LinuxProcessList* this, LinuxProc
    }
 
    if (nl_send_sync(this->netlink_socket, msg) < 0) {
-      process->swapin_delay_percent = -1;
-      process->blkio_delay_percent = -1;
-      process->cpu_delay_percent = -1;
+      process->swapin_delay_percent = -1LL;
+      process->blkio_delay_percent = -1LL;
+      process->cpu_delay_percent = -1LL;
       return;
    }
    
@@ -669,77 +666,6 @@ static void LinuxProcessList_readDelayAcctData(LinuxProcessList* this, LinuxProc
 
 #endif
 
-#ifdef HAVE_PERFCOUNTERS
-
-#define READ_COUNTER(_b, _var, _flag, _type, _config)           \
-   bool _b ## Ok = false;                                       \
-   uint64_t _b ## Delta = 0;                                    \
-   if (flags & _flag && lp->super.show) {                       \
-      if (!_var) {                                              \
-         _var = PerfCounter_new(lp->super.pid, _type, _config); \
-         _b ## Ok = PerfCounter_read(_var);                     \
-         _b ## Delta = 0;                                       \
-      } else {                                                  \
-         _b ## Ok = PerfCounter_read(_var);                     \
-         _b ## Delta = PerfCounter_delta(_var);                 \
-      }                                                         \
-      if (_b ## Ok) {                                           \
-      }                                                         \
-   } else {                                                     \
-      if (_var) {                                               \
-         PerfCounter_delete(_var);                              \
-         _var = NULL;                                           \
-      }                                                         \
-   }
-
-#define SET_IF(_ok, _var, _exp) \
-   if (_ok) {                   \
-      _var = _exp;              \
-   } else {                     \
-      _var = -1;                \
-   }
-
-#define SET_IFNZ(_ok, _z, _var, _exp) \
-   if (_ok) {                         \
-      if (_z > 0) {                   \
-         _var = _exp;                 \
-      } else {                        \
-         _var = 0;                    \
-      }                               \
-   } else {                           \
-      _var = -1;                      \
-   }
-
-#define L1DR  (PERF_COUNT_HW_CACHE_L1D | (PERF_COUNT_HW_CACHE_OP_READ  << 8) | (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16))
-#define L1DRM (PERF_COUNT_HW_CACHE_L1D | (PERF_COUNT_HW_CACHE_OP_READ  << 8) | (PERF_COUNT_HW_CACHE_RESULT_MISS   << 16))
-#define L1DW  (PERF_COUNT_HW_CACHE_L1D | (PERF_COUNT_HW_CACHE_OP_WRITE << 8) | (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16))
-#define L1DWM (PERF_COUNT_HW_CACHE_L1D | (PERF_COUNT_HW_CACHE_OP_WRITE << 8) | (PERF_COUNT_HW_CACHE_RESULT_MISS   << 16))
-
-static void LinuxProcessList_readPerfCounters(LinuxProcess* lp, uint64_t flags) {
-
-   READ_COUNTER(c, lp->cycleCounter, PROCESS_FLAG_LINUX_HPC_CYCLE, PERF_TYPE_HARDWARE, PERF_COUNT_HW_CPU_CYCLES);
-   READ_COUNTER(i, lp->insnCounter,  PROCESS_FLAG_LINUX_HPC_INSN,  PERF_TYPE_HARDWARE, PERF_COUNT_HW_INSTRUCTIONS);
-   READ_COUNTER(m, lp->missCounter,  PROCESS_FLAG_LINUX_HPC_MISS,  PERF_TYPE_HARDWARE, PERF_COUNT_HW_CACHE_MISSES);
-   READ_COUNTER(b, lp->brCounter,    PROCESS_FLAG_LINUX_HPC_BMISS, PERF_TYPE_HARDWARE, PERF_COUNT_HW_BRANCH_MISSES);
-
-   READ_COUNTER(r, lp->l1drCounter,  PROCESS_FLAG_LINUX_HPC_L1DR,  PERF_TYPE_HW_CACHE, L1DR);
-   READ_COUNTER(R, lp->l1drmCounter, PROCESS_FLAG_LINUX_HPC_L1DRM, PERF_TYPE_HW_CACHE, L1DRM);
-   READ_COUNTER(w, lp->l1dwCounter,  PROCESS_FLAG_LINUX_HPC_L1DW,  PERF_TYPE_HW_CACHE, L1DW);
-   READ_COUNTER(W, lp->l1dwmCounter, PROCESS_FLAG_LINUX_HPC_L1DWM, PERF_TYPE_HW_CACHE, L1DWM);
-
-   SET_IF(cOk, lp->mcycle, (double)cDelta / 1000000);
-   SET_IF(iOk, lp->minstr, (double)iDelta / 1000000);
-   SET_IFNZ(cOk && iOk, cDelta, lp->ipc,    (double)iDelta / cDelta);
-   SET_IFNZ(mOk && iOk, iDelta, lp->pMiss,  100 * ((double)mDelta / iDelta));
-   SET_IFNZ(bOk && iOk, iDelta, lp->pBMiss, 100 * ((double)bDelta / iDelta));
-   SET_IF(rOk, lp->l1dr,  (double)rDelta / 1000);
-   SET_IF(ROk, lp->l1drm, (double)RDelta / 1000);
-   SET_IF(wOk, lp->l1dw,  (double)wDelta / 1000);
-   SET_IF(WOk, lp->l1dwm, (double)WDelta / 1000);
-}
-
-#endif
-
 static void setCommand(Process* process, const char* command, int len) {
    if (process->comm && process->commLen >= len) {
       strncpy(process->comm, command, len + 1);
@@ -783,7 +709,7 @@ static bool LinuxProcessList_readCmdlineFile(Process* process, const char* dirna
    }
    command[lastChar + 1] = '\0';
    process->basenameOffset = tokenEnd;
-   setCommand(process, command, lastChar + 1);
+   setCommand(process, command, lastChar);
 
    return true;
 }
@@ -835,8 +761,8 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char*
    DIR* dir;
    struct dirent* entry;
    Settings* settings = pl->settings;
-   ScreenSettings* ss = settings->ss;
 
+   time_t curTime = tv.tv_sec;
    #ifdef HAVE_TASKSTATS
    unsigned long long now = tv.tv_sec*1000LL+tv.tv_usec/1000LL;
    #endif
@@ -880,7 +806,7 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char*
       LinuxProcessList_recurseProcTree(this, subdirname, proc, period, tv);
 
       #ifdef HAVE_TASKSTATS
-      if (ss->flags & PROCESS_FLAG_IO)
+      if (settings->flags & PROCESS_FLAG_IO)
          LinuxProcessList_readIoFile(lp, dirname, name, now);
       #endif
 
@@ -899,7 +825,7 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char*
          free(lp->ttyDevice);
          lp->ttyDevice = LinuxProcessList_updateTtyDevice(this->ttyDrivers, proc->tty_nr);
       }
-      if (ss->flags & PROCESS_FLAG_LINUX_IOPRIO)
+      if (settings->flags & PROCESS_FLAG_LINUX_IOPRIO)
          LinuxProcess_updateIOPriority(lp);
       float percent_cpu = (lp->utime + lp->stime - lasttimes) / period * 100.0;
       proc->percent_cpu = CLAMP(percent_cpu, 0.0, cpus * 100.0);
@@ -908,19 +834,19 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char*
 
       if(!preExisting) {
 
-         if (! LinuxProcessList_statProcessDir(proc, dirname, name))
+         if (! LinuxProcessList_statProcessDir(proc, dirname, name, curTime))
             goto errorReadingProcess;
 
          proc->user = UsersTable_getRef(pl->usersTable, proc->st_uid);
 
          #ifdef HAVE_OPENVZ
-         if (ss->flags & PROCESS_FLAG_LINUX_OPENVZ) {
+         if (settings->flags & PROCESS_FLAG_LINUX_OPENVZ) {
             LinuxProcessList_readOpenVZData(lp, dirname, name);
          }
          #endif
          
          #ifdef HAVE_VSERVER
-         if (ss->flags & PROCESS_FLAG_LINUX_VSERVER) {
+         if (settings->flags & PROCESS_FLAG_LINUX_VSERVER) {
             LinuxProcessList_readVServerData(lp, dirname, name);
          }
          #endif
@@ -943,18 +869,13 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char*
       #endif
 
       #ifdef HAVE_CGROUP
-      if (ss->flags & PROCESS_FLAG_LINUX_CGROUP)
+      if (settings->flags & PROCESS_FLAG_LINUX_CGROUP)
          LinuxProcessList_readCGroupFile(lp, dirname, name);
       #endif
       
-      if (ss->flags & PROCESS_FLAG_LINUX_OOM)
+      if (settings->flags & PROCESS_FLAG_LINUX_OOM)
          LinuxProcessList_readOomData(lp, dirname, name);
 
-      #ifdef HAVE_PERFCOUNTERS
-      if (ss->flags & PROCESS_FLAG_LINUX_HPC)
-         LinuxProcessList_readPerfCounters(lp, ss->flags);
-      #endif
-
       if (proc->state == 'Z' && (proc->basenameOffset == 0)) {
          proc->basenameOffset = -1;
          setCommand(proc, command, commLen);

linux/LinuxProcessList.h

@@ -20,8 +20,6 @@ in the source distribution for its full text.
 
 #include "ProcessList.h"
 
-extern long long btime;
-
 typedef struct CPUData_ {
    unsigned long long int totalTime;
    unsigned long long int userTime;
@@ -86,7 +84,7 @@ typedef struct LinuxProcessList_ {
 #endif
 
 #ifndef PROC_LINE_LENGTH
-#define PROC_LINE_LENGTH 4096
+#define PROC_LINE_LENGTH 512
 #endif
 
 
@@ -123,54 +121,6 @@ void ProcessList_delete(ProcessList* pl);
 
 #endif
 
-#ifdef HAVE_PERFCOUNTERS
-
-#define READ_COUNTER(_b, _var, _flag, _type, _config)           \
-   bool _b ## Ok = false;                                       \
-   uint64_t _b ## Delta = 0;                                    \
-   if (flags & _flag && lp->super.show) {                       \
-      if (!_var) {                                              \
-         _var = PerfCounter_new(lp->super.pid, _type, _config); \
-         _b ## Ok = PerfCounter_read(_var);                     \
-         _b ## Delta = 0;                                       \
-      } else {                                                  \
-         _b ## Ok = PerfCounter_read(_var);                     \
-         _b ## Delta = PerfCounter_delta(_var);                 \
-      }                                                         \
-      if (_b ## Ok) {                                           \
-      }                                                         \
-   } else {                                                     \
-      if (_var) {                                               \
-         PerfCounter_delete(_var);                              \
-         _var = NULL;                                           \
-      }                                                         \
-   }
-
-#define SET_IF(_ok, _var, _exp) \
-   if (_ok) {                   \
-      _var = _exp;              \
-   } else {                     \
-      _var = -1;                \
-   }
-
-#define SET_IFNZ(_ok, _z, _var, _exp) \
-   if (_ok) {                         \
-      if (_z > 0) {                   \
-         _var = _exp;                 \
-      } else {                        \
-         _var = 0;                    \
-      }                               \
-   } else {                           \
-      _var = -1;                      \
-   }
-
-#define L1DR  (PERF_COUNT_HW_CACHE_L1D | (PERF_COUNT_HW_CACHE_OP_READ  << 8) | (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16))
-#define L1DRM (PERF_COUNT_HW_CACHE_L1D | (PERF_COUNT_HW_CACHE_OP_READ  << 8) | (PERF_COUNT_HW_CACHE_RESULT_MISS   << 16))
-#define L1DW  (PERF_COUNT_HW_CACHE_L1D | (PERF_COUNT_HW_CACHE_OP_WRITE << 8) | (PERF_COUNT_HW_CACHE_RESULT_ACCESS << 16))
-#define L1DWM (PERF_COUNT_HW_CACHE_L1D | (PERF_COUNT_HW_CACHE_OP_WRITE << 8) | (PERF_COUNT_HW_CACHE_RESULT_MISS   << 16))
-
-#endif
-
 void ProcessList_goThroughEntries(ProcessList* super);
 
 #endif

linux/PerfCounter.c

@@ -1,135 +0,0 @@
-/*
- * This file is based on tiptop.
- * by Erven ROHOU
- * Copyright (c) 2011, 2012, 2014 Inria
- * License: GNU General Public License version 2.
- */
- 
-#include "PerfCounter.h"
-
-#include <errno.h>
-#include <stdlib.h>
-#include <stdio.h>
-
-#include "XAlloc.h"
-
-/*{
-
-#include <config.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <asm/unistd.h>
-#include <inttypes.h>
-#include <stdbool.h>
-// The sys_perf_counter_open syscall and header files changed names
-// between Linux 2.6.31 and 2.6.32. Do the mangling here.
-#ifdef HAVE_LINUX_PERF_COUNTER_H
-#include <linux/perf_counter.h>
-#define STRUCT_NAME perf_counter_attr
-#define SYSCALL_NUM __NR_perf_counter_open
-
-#elif HAVE_LINUX_PERF_EVENT_H
-#include <linux/perf_event.h>
-#define STRUCT_NAME perf_event_attr
-#define SYSCALL_NUM __NR_perf_event_open
-
-#else
-#error Sorry, performance counters not supported on this system.
-#endif
-
-typedef struct PerfCounter_ {
-   struct STRUCT_NAME events;
-   pid_t pid;
-   int fd;
-   uint64_t prevValue;
-   uint64_t value;
-} PerfCounter;
-
-#define PerfCounter_delta(pc_) ((pc_)->value - (pc_)->prevValue)
-
-}*/
-
-int PerfCounter_openFds = 0;
-static int PerfCounter_fdLimit = -1;
-
-static void PerfCounter_initFdLimit() {
-   char name[100] = { 0 };  /* needs to fit the name /proc/xxxx/limits */
-   snprintf(name, sizeof(name) - 1, "/proc/%d/limits", getpid());
-   FILE* f = fopen(name, "r");
-   if (f) {
-     char line[100];
-     while (fgets(line, 100, f)) {
-       int n = sscanf(line, "Max open files %d", &PerfCounter_fdLimit);
-       if (n) {
-         break;
-       }
-     }
-     fclose(f);
-   }
-
-   PerfCounter_fdLimit -= 20; /* keep some slack */
-   if (PerfCounter_fdLimit == 0) {  /* something went wrong */
-      PerfCounter_fdLimit = 200;  /* reasonable default? */
-   }
-}
-
-static long perf_event_open(struct STRUCT_NAME *hw_event, pid_t pid, int cpu, int group_fd, unsigned long flags) {
-   int ret = syscall(SYSCALL_NUM, hw_event, pid, cpu, group_fd, flags);
-   #if defined(__x86_64__) || defined(__i386__)
-   if (ret < 0 && ret > -4096) {
-      errno = -ret;
-      ret = -1;
-   }
-   #endif
-   return ret;
-}
-
-PerfCounter* PerfCounter_new(pid_t pid, uint32_t type, uint64_t config) {
-   if (PerfCounter_fdLimit == -1) {
-      PerfCounter_initFdLimit();
-   }
-   PerfCounter* this = xCalloc(sizeof(PerfCounter), 1);
-   this->pid = pid;
-   this->events.disabled = 0;
-   this->events.pinned = 1;
-   this->events.exclude_hv = 1;
-   this->events.exclude_kernel = 1;
-   this->events.type = type;
-   this->events.config = config;
-   if (PerfCounter_openFds < PerfCounter_fdLimit) {
-      this->fd = perf_event_open(&this->events, pid, -1, -1, 0);
-   } else {
-      this->fd = -1;
-   }
-   if (this->fd != -1) {
-      PerfCounter_openFds++;
-   }
-   return this;
-}
-
-void PerfCounter_delete(PerfCounter* this) {
-   if (!this) {
-      return;
-   }
-   if (this->fd != -1) {
-      PerfCounter_openFds--;
-   }
-   close(this->fd);
-   free(this);
-}
-
-bool PerfCounter_read(PerfCounter* this) {
-   if (this->fd == -1) {
-      return false;
-   }
-   uint64_t value;
-   int r = read(this->fd, &value, sizeof(value));
-   if (r != sizeof(value)) {
-      close(this->fd);
-      this->fd = perf_event_open(&this->events, this->pid, -1, -1, 0);
-      return false;
-   }
-   this->prevValue = this->value;
-   this->value = value;
-   return true;
-}

linux/PerfCounter.h

@@ -1,54 +0,0 @@
-/* Do not edit this file. It was automatically generated. */
-
-#ifndef HEADER_PerfCounter
-#define HEADER_PerfCounter
-/*
- * This file is based on tiptop.
- * by Erven ROHOU
- * Copyright (c) 2011, 2012, 2014 Inria
- * License: GNU General Public License version 2.
- */
- 
-
-
-#include <config.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <asm/unistd.h>
-#include <inttypes.h>
-#include <stdbool.h>
-// The sys_perf_counter_open syscall and header files changed names
-// between Linux 2.6.31 and 2.6.32. Do the mangling here.
-#ifdef HAVE_LINUX_PERF_COUNTER_H
-#include <linux/perf_counter.h>
-#define STRUCT_NAME perf_counter_attr
-#define SYSCALL_NUM __NR_perf_counter_open
-
-#elif HAVE_LINUX_PERF_EVENT_H
-#include <linux/perf_event.h>
-#define STRUCT_NAME perf_event_attr
-#define SYSCALL_NUM __NR_perf_event_open
-
-#else
-#error Sorry, performance counters not supported on this system.
-#endif
-
-typedef struct PerfCounter_ {
-   struct STRUCT_NAME events;
-   pid_t pid;
-   int fd;
-   uint64_t prevValue;
-   uint64_t value;
-} PerfCounter;
-
-#define PerfCounter_delta(pc_) ((pc_)->value - (pc_)->prevValue)
-
-
-extern int PerfCounter_openFds;
-PerfCounter* PerfCounter_new(pid_t pid, uint32_t type, uint64_t config);
-
-void PerfCounter_delete(PerfCounter* this);
-
-bool PerfCounter_read(PerfCounter* this);
-
-#endif

linux/Platform.c

@@ -22,7 +22,6 @@ in the source distribution for its full text.
 #include "ClockMeter.h"
 #include "HostnameMeter.h"
 #include "LinuxProcess.h"
-#include "CRT.h"
 
 #include <math.h>
 #include <assert.h>
@@ -36,13 +35,16 @@ in the source distribution for its full text.
 #include "BatteryMeter.h"
 #include "LinuxProcess.h"
 #include "SignalsPanel.h"
-#include "Settings.h"
 }*/
 
 #ifndef CLAMP
 #define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
 #endif
 
+ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, M_SHARE, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
+
+//static ProcessField defaultIoFields[] = { PID, IO_PRIORITY, USER, IO_READ_RATE, IO_WRITE_RATE, IO_RATE, COMM, 0 };
+
 int Platform_numberOfFields = LAST_PROCESSFIELD;
 
 const SignalItem Platform_signals[] = {
@@ -82,31 +84,6 @@ const SignalItem Platform_signals[] = {
    { .name = "31 SIGSYS",    .number = 31 },
 };
 
-ScreenDefaults Platform_defaultScreens[] = {
-   {
-      .name = "Main",
-      .columns = "PID USER PRIORITY NICE M_SIZE M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command",
-      .sortKey = "PERCENT_CPU",
-   },
-   {
-      .name = "I/O",
-      .columns = "PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command",
-      .sortKey = "IO_RATE",
-   },
-   {
-      .name = "Perf Counters",
-      .columns = "PID USER PERCENT_CPU PROCESSOR MCYCLE MINSTR IPC PERCENT_MISS PERCENT_BMISS Command",
-      .sortKey = "MCYCLE",
-   },
-   {
-      .name = "L1 Data Cache",
-      .columns = "PID USER PERCENT_CPU L1DREADS L1DRMISSES L1DWRITES L1DWMISSES Command",
-      .sortKey = "L1DREADS",
-   },
-};
-
-const unsigned int Platform_numberOfDefaultScreens = sizeof(Platform_defaultScreens)/sizeof(ScreenDefaults);
-
 const unsigned int Platform_numberOfSignals = sizeof(Platform_signals)/sizeof(SignalItem);
 
 static Htop_Reaction Platform_actionSetIOPriority(State* st) {

linux/Platform.h

@@ -14,20 +14,17 @@ in the source distribution for its full text.
 #include "BatteryMeter.h"
 #include "LinuxProcess.h"
 #include "SignalsPanel.h"
-#include "Settings.h"
 
 #ifndef CLAMP
 #define CLAMP(x,low,high) (((x)>(high))?(high):(((x)<(low))?(low):(x)))
 #endif
 
+extern ProcessField Platform_defaultFields[];
+
 extern int Platform_numberOfFields;
 
 extern const SignalItem Platform_signals[];
 
-extern ScreenDefaults Platform_defaultScreens[];
-
-extern const unsigned int Platform_numberOfDefaultScreens;
-
 extern const unsigned int Platform_numberOfSignals;
 
 void Platform_setBindings(Htop_Action* keys);

openbsd/Battery.h

@@ -12,4 +12,5 @@ in the source distribution for its full text.
 
 void Battery_getData(double* level, ACPresence* isOnAC);
 
+
 #endif

openbsd/OpenBSDProcess.c

@@ -215,14 +215,14 @@ void OpenBSDProcess_writeField(Process* this, RichString* str, ProcessField fiel
 long OpenBSDProcess_compare(const void* v1, const void* v2) {
    OpenBSDProcess *p1, *p2;
    Settings *settings = ((Process*)v1)->settings;
-   if (settings->ss->direction == 1) {
+   if (settings->direction == 1) {
       p1 = (OpenBSDProcess*)v1;
       p2 = (OpenBSDProcess*)v2;
    } else {
       p2 = (OpenBSDProcess*)v1;
       p1 = (OpenBSDProcess*)v2;
    }
-   switch (settings->ss->sortKey) {
+   switch (settings->sortKey) {
    // add OpenBSD-specific fields here
    default:
       return Process_compare(v1, v2);

openbsd/OpenBSDProcessList.c

@@ -223,8 +223,6 @@ void ProcessList_goThroughEntries(ProcessList* this) {
    bool preExisting;
    Process* proc;
    OpenBSDProcess* fp;
-   struct tm date;
-   struct timeval tv;
    int count = 0;
    int i;
 
@@ -234,8 +232,6 @@ void ProcessList_goThroughEntries(ProcessList* this) {
    struct kinfo_proc* kprocs = kvm_getprocs(opl->kd, KERN_PROC_ALL, 0, sizeof(struct kinfo_proc), &count);
    //struct kinfo_proc* kprocs = getprocs(KERN_PROC_ALL, 0, &count);
 
-   gettimeofday(&tv, NULL);
-
    for (i = 0; i < count; i++) {
       kproc = &kprocs[i];
 
@@ -258,8 +254,6 @@ void ProcessList_goThroughEntries(ProcessList* this) {
          proc->user = UsersTable_getRef(this->usersTable, proc->st_uid);
          ProcessList_add((ProcessList*)this, proc);
          proc->comm = OpenBSDProcessList_readProcessName(opl->kd, kproc, &proc->basenameOffset);
-         (void) localtime_r((time_t*) &kproc->p_ustart_sec, &date);
-         strftime(proc->starttime_show, 7, ((proc->starttime_ctime > tv.tv_sec - 86400) ? "%R " : "%b%d "), &date);
       } else {
          if (settings->updateProcessNames) {
             free(proc->comm);

openbsd/Platform.c

@@ -23,7 +23,6 @@ in the source distribution for its full text.
 #include <sys/sched.h>
 #include <uvm/uvmexp.h>
 #include <sys/param.h>
-#include <sys/sysctl.h>
 #include <sys/swap.h>
 
 #include <unistd.h>
@@ -35,9 +34,6 @@ in the source distribution for its full text.
 #include <sys/time.h>
 #include <sys/resource.h>
 #include <time.h>
-#include <fcntl.h>
-#include <kvm.h>
-#include <limits.h>
 
 /*{
 #include "Action.h"
@@ -96,15 +92,7 @@ static int percentages(int cnt, int64_t *out, int64_t *new, int64_t *old, int64_
    return (total_change);
 }
 
-ScreenDefaults Platform_defaultScreens[] = {
-   {
-      .name = "Main",
-      .columns = "PID USER PRIORITY NICE M_SIZE M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command",
-      .sortKey = "PERCENT_CPU",
-   },
-};
-
-const unsigned int Platform_numberOfDefaultScreens = sizeof(Platform_defaultScreens)/sizeof(ScreenDefaults);
+ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
 
 int Platform_numberOfFields = LAST_PROCESSFIELD;
 
@@ -306,48 +294,6 @@ void Platform_setTasksValues(Meter* this) {
 }
 
 char* Platform_getProcessEnv(pid_t pid) {
-   char errbuf[_POSIX2_LINE_MAX];
-   char *env;
-   char **ptr;
-   int count;
-   kvm_t *kt;
-   struct kinfo_proc *kproc;
-   size_t capacity = 4096, size = 0;
-
-   if ((kt = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, errbuf)) == NULL)
-      return NULL;
-
-   if ((kproc = kvm_getprocs(kt, KERN_PROC_PID, pid,
-                             sizeof(struct kinfo_proc), &count)) == NULL) {\
-      (void) kvm_close(kt);
-      return NULL;
-   }
-
-   if ((ptr = kvm_getenvv(kt, kproc, 0)) == NULL) {
-      (void) kvm_close(kt);
-      return NULL;
-   }
-
-   env = xMalloc(capacity);
-   for (char **p = ptr; *p; p++) {
-      size_t len = strlen(*p) + 1;
-
-      if (size + len > capacity) {
-         capacity *= 2;
-         env = xRealloc(env, capacity);
-      }
-
-      strlcpy(env + size, *p, len);
-      size += len;
-   }
-
-   if (size < 2 || env[size - 1] || env[size - 2]) {
-       if (size + 2 < capacity)
-           env = xRealloc(env, capacity + 2);
-       env[size] = 0;
-       env[size+1] = 0;
-   }
-
-   (void) kvm_close(kt);
-   return env;
+   // TODO
+   return NULL;
 }

openbsd/Platform.h

@@ -32,9 +32,7 @@ extern ProcessFieldData Process_fields[];
  * The routine assumes modulo arithmetic.  This function is especially
  * useful on BSD machines for calculating cpu state percentages.
  */
-extern ScreenDefaults Platform_defaultScreens[];
-
-extern const unsigned int Platform_numberOfDefaultScreens;
+extern ProcessField Platform_defaultFields[];
 
 extern int Platform_numberOfFields;
 

scripts/MakeHeader.py

@@ -9,7 +9,6 @@ ANY=1
 COPY=2
 SKIP=3
 SKIPONE=4
-COPYDEFINE=5
 
 state = ANY
 static = 0
@@ -47,11 +46,7 @@ for line in file.readlines():
       elif len(line) > 1:
          static = 0
          equals = line.find(" = ")
-         if line[:7] == "#define":
-            if line[-1:] == "\\":
-               state = COPYDEFINE
-            out.write( line + "\n")
-         elif line[-3:] == "= {":
+         if line[-3:] == "= {":
             out.write( "extern " + line[:-4] + ";\n" )
             state = SKIP
          elif equals != -1:
@@ -62,7 +57,7 @@ for line in file.readlines():
             out.write( line[:-2].replace("inline", "extern") + ";\n" )
             state = SKIP
          else:
-            out.write( line + "\n" )
+            out.write( line + "\n")
          is_blank = False
       elif line == "":
          if not is_blank:
@@ -71,11 +66,6 @@ for line in file.readlines():
       else:
          out.write( line  + "\n")
          is_blank = False
-   elif state == COPYDEFINE:
-      is_blank = False
-      out.write( line + "\n")
-      if line[-1:] != "\\":
-         state = ANY
    elif state == COPY:
       is_blank = False
       if line == "}*/":

solaris/Platform.c

@@ -35,7 +35,6 @@ in the source distribution for its full text.
 #include "Action.h"
 #include "BatteryMeter.h"
 #include "SignalsPanel.h"
-#include "SolarisProcess.h"
 #include <signal.h>
 #include <sys/mkdev.h>
 #include <sys/proc.h>
@@ -104,15 +103,7 @@ const SignalItem Platform_signals[] = {
 
 const unsigned int Platform_numberOfSignals = sizeof(Platform_signals)/sizeof(SignalItem);
 
-ScreenDefaults Platform_defaultScreens[] = {
-   {
-      .name = "Default",
-      .columns = "PID LWPID USER PRIORITY NICE M_SIZE M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command",
-      .sortKey = "PERCENT_CPU",
-   },
-};
-
-const unsigned int Platform_numberOfDefaultScreens = sizeof(Platform_defaultScreens)/sizeof(ScreenDefaults);
+ProcessField Platform_defaultFields[] = { PID, LWPID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
 
 MeterClass* Platform_meterTypes[] = {
    &CPUMeter_class,

solaris/Platform.h

@@ -14,7 +14,6 @@ in the source distribution for its full text.
 #include "Action.h"
 #include "BatteryMeter.h"
 #include "SignalsPanel.h"
-#include "SolarisProcess.h"
 #include <signal.h>
 #include <sys/mkdev.h>
 #include <sys/proc.h>
@@ -39,9 +38,7 @@ extern const SignalItem Platform_signals[];
 
 extern const unsigned int Platform_numberOfSignals;
 
-extern ScreenDefaults Platform_defaultScreens[];
-
-extern const unsigned int Platform_numberOfDefaultScreens;
+extern ProcessField Platform_defaultFields[];
 
 extern MeterClass* Platform_meterTypes[];
 

solaris/SolarisProcess.c

@@ -170,14 +170,14 @@ void SolarisProcess_writeField(Process* this, RichString* str, ProcessField fiel
 long SolarisProcess_compare(const void* v1, const void* v2) {
    SolarisProcess *p1, *p2;
    Settings* settings = ((Process*)v1)->settings;
-   if (settings->ss->direction == 1) {
+   if (settings->direction == 1) {
       p1 = (SolarisProcess*)v1;
       p2 = (SolarisProcess*)v2;
    } else {
       p2 = (SolarisProcess*)v1;
       p1 = (SolarisProcess*)v2;
    }
-   switch ((int) settings->ss->sortKey) {
+   switch ((int) settings->sortKey) {
    case ZONEID:
       return (p1->zoneid - p2->zoneid);
    case PROJID:

unsupported/Platform.c

@@ -29,15 +29,7 @@ const SignalItem Platform_signals[] = {
 
 const unsigned int Platform_numberOfSignals = sizeof(Platform_signals)/sizeof(SignalItem);
 
-ScreenDefaults Platform_defaultScreens[] = {
-   {
-      .name = "Main",
-      .columns = "PID LWPID USER PRIORITY NICE M_SIZE M_RESIDENT STATE PERCENT_CPU PERCENT_MEM TIME Command",
-      .sortKey = "PERCENT_CPU",
-   },
-};
-
-const unsigned int Platform_numberOfDefaultScreens = sizeof(Platform_defaultScreens)/sizeof(ScreenDefaults);
+ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };
 
 ProcessFieldData Process_fields[] = {
    [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },

unsupported/Platform.h

@@ -19,9 +19,7 @@ extern const SignalItem Platform_signals[];
 
 extern const unsigned int Platform_numberOfSignals;
 
-extern ScreenDefaults Platform_defaultScreens[];
-
-extern const unsigned int Platform_numberOfDefaultScreens;
+extern ProcessField Platform_defaultFields[];
 
 extern ProcessFieldData Process_fields[];