Bump version to 2.1.0

parseBatInfo: check line for NULL before passing it to String_getToken()
Clarify we are looking for the null termination
2025-07-15 13:34:35 +03:00 · 2018-02-04 20:13:55 +01:00 · 2018-02-04 17:04:47 +01:00 · 2018-02-04 17:02:30 +01:00 · 2018-02-04 17:01:39 +01:00 · 2018-02-04 16:51:06 +01:00
42 changed files with 334 additions and 1261 deletions
--- a/Action.c
+++ b/Action.c
@ -156,10 +156,9 @@ static bool expandCollapse(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;
 }

@ -167,12 +166,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);
   }
@ -220,9 +218,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;
 }
@ -250,7 +247,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;
 }

@ -264,23 +261,13 @@ static Htop_Reaction actionExpandOrCollapse(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 actionSetAffinity(State* st) {
   if (st->pl->cpuCount == 1)
      return HTOP_OK;
@ -584,6 +571,5 @@ void Action_setBindings(Htop_Action* keys) {
   keys['U'] = actionUntagAll;
   keys['c'] = actionTagAllChildren;
   keys['e'] = actionShowEnvScreen;
-   keys['\t'] = actionNextScreen;
 }

--- a/CRT.c
+++ b/CRT.c
@ -127,7 +127,6 @@ typedef enum ColorElements_ {
   CPU_SOFTIRQ,
   CPU_STEAL,
   CPU_GUEST,
-   PANEL_EDIT,
   LAST_COLORELEMENT
 } ColorElements;

@ -232,7 +231,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),
   },
   [COLORSCHEME_MONOCHROME] = {
      [RESET_COLOR] = A_NORMAL,
@ -292,7 +290,6 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
      [CPU_SOFTIRQ] = A_BOLD,
      [CPU_STEAL] = A_REVERSE,
      [CPU_GUEST] = A_REVERSE,
-      [PANEL_EDIT] = A_BOLD,
   },
   [COLORSCHEME_BLACKONWHITE] = {
      [RESET_COLOR] = ColorPair(Black,White),
@ -352,7 +349,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),
   },
   [COLORSCHEME_LIGHTTERMINAL] = {
      [RESET_COLOR] = ColorPair(Black,Black),
@ -412,7 +408,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),
   },
   [COLORSCHEME_MIDNIGHT] = {
      [RESET_COLOR] = ColorPair(White,Blue),
@ -472,7 +467,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),
   },
   [COLORSCHEME_BLACKNIGHT] = {
      [RESET_COLOR] = ColorPair(Cyan,Black),
@ -532,11 +526,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),
   },
   [COLORSCHEME_BROKENGRAY] = { 0 } // dynamically generated.
 };

+int CRT_cursorX = 0;
+
 int CRT_scrollHAmount = 5;

 int CRT_scrollWheelVAmount = 10;
--- a/CRT.h
+++ b/CRT.h
@ -115,7 +115,6 @@ typedef enum ColorElements_ {
   CPU_SOFTIRQ,
   CPU_STEAL,
   CPU_GUEST,
-   PANEL_EDIT,
   LAST_COLORELEMENT
 } ColorElements;

@ -144,6 +143,8 @@ int* CRT_colors;

 extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];

+extern int CRT_cursorX;
+
 extern int CRT_scrollHAmount;

 extern int CRT_scrollWheelVAmount;
--- a/CategoriesPanel.c
+++ b/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;
      }
   }
@ -149,6 +147,6 @@ CategoriesPanel* CategoriesPanel_new(ScreenManager* scr, Settings* settings, Hea
   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;
 }
--- a/30
+++ b/30
@ -1,4 +1,34 @@

+What's new in version 2.1.0
+
+* Linux: Delay accounting metrics
+  (thanks to André Carvalho)
+* DragonFlyBSD support
+  (thanks to Diederik de Groot)
+* Support for real-time signals
+  (thanks to Kang-Che Sung)
+* 'c' key now works with threads as well
+* Session column renamed from SESN to SID
+  (thanks to Kamyar Rasta)
+* Improved UI for meter style selection
+  (thanks to Kang-Che Sung)
+* Improved code for constructing process tree
+  (thanks to wangqr)
+* Compile-time option to disable setuid
+* Error checking of various standard library operations
+* Replacement of sprintf with snprintf
+  (thanks to Tomasz Kramkowski)
+* Linux: performance improvements in battery meter
+* Linux: update process TTY device
+* Linux: add support for sorting TASK_IDLE
+  (thanks to Vladimir Panteleev)
+* Linux: add upper-bound to running process counter
+  (thanks to Lucas Correia Villa Real)
+* BUGFIX: avoid crash when battery is removed
+  (thanks to Jan Chren)
+* BUGFIX: macOS: fix infinite loop in tree view
+  (thanks to Wataru Ashihara)
+
 What's new in version 2.0.2

 * Mac OS X: stop trying when task_for_pid fails for a process,
--- a/ColumnsPanel.c
+++ b/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;
 }

--- a/ColumnsPanel.h
+++ b/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);

--- a/DisplayOptionsPanel.c
+++ b/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)));
--- a/FunctionBar.c
+++ b/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) {
--- a/FunctionBar.h
+++ b/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);

--- a/Header.c
+++ b/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);
--- a/IncSet.c
+++ b/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);
   }
--- a/IncSet.h
+++ b/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);

--- a/InfoScreen.c
+++ b/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,10 @@ void InfoScreen_run(InfoScreen* this) {

      Panel_draw(panel, true);

-      int ch = Panel_getCh(panel);
+      if (this->inc->active)
+         move(LINES-1, CRT_cursorX);
+      set_escdelay(25);
+      int ch = getch();
      
      if (ch == ERR) {
         if (As_InfoScreen(this)->onErr) {
--- a/ListItem.c
+++ b/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;
 }

--- a/ListItem.h
+++ b/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);
--- a/MainPanel.c
+++ b/MainPanel.c
@ -67,17 +67,15 @@ 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);
      }
@ -110,8 +108,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));
--- a/Makefile.am
+++ b/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
@ -39,12 +39,10 @@ EnvScreen.h InfoScreen.h XAlloc.h
 if HTOP_LINUX
 htop_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.h linux/IOPriorityPanel.h linux/IOPriority.h \
-linux/LinuxProcess.h linux/LinuxProcessList.h linux/LinuxCRT.h linux/Battery.h \
-linux/PerfCounter.h
+linux/LinuxProcess.h linux/LinuxProcessList.h linux/LinuxCRT.h linux/Battery.h
 endif

 if HTOP_FREEBSD
@ -105,9 +103,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"

--- a/Meter.c
+++ b/Meter.c
@ -152,7 +152,7 @@ int Meter_humanUnit(char* buffer, unsigned long int value, int size) {
      if (value / 1024 < powi)
         break;

-      if (prefix[1] == 0)
+      if (prefix[1] == '\0')
         break;

      powi *= 1024;
--- a/Panel.c
+++ b/Panel.c
@ -57,7 +57,6 @@ typedef struct PanelClass_ {
 struct Panel_ {
   Object super;
   int x, y, w, h;
-   int cursorX, cursorY;
   WINDOW* window;
   Vector* items;
   int selected;
@ -67,7 +66,6 @@ struct Panel_ {
   int scrollV;
   short scrollH;
   bool needsRedraw;
-   bool cursorOn;
   FunctionBar* currentBar;
   FunctionBar* defaultBar;
   RichString header;
@ -87,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),
@ -119,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;
@ -376,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) {
@ -507,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();
-}
-
--- a/Panel.h
+++ b/Panel.h
@ -46,7 +46,6 @@ typedef struct PanelClass_ {
 struct Panel_ {
   Object super;
   int x, y, w, h;
-   int cursorX, cursorY;
   WINDOW* window;
   Vector* items;
   int selected;
@ -56,7 +55,6 @@ struct Panel_ {
   int scrollV;
   short scrollH;
   bool needsRedraw;
-   bool cursorOn;
   FunctionBar* currentBar;
   FunctionBar* defaultBar;
   RichString header;
@ -75,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);
@ -127,7 +123,4 @@ bool Panel_onKey(Panel* this, int key);

 HandlerResult Panel_selectByTyping(Panel* this, int ch);

-int Panel_getCh(Panel* this);
-
-
 #endif
--- a/Process.c
+++ b/Process.c
@ -28,7 +28,6 @@ in the source distribution for its full text.
 #include <time.h>
 #include <assert.h>
 #include <math.h>
-#include <inttypes.h>

 #ifdef __ANDROID__
 #define SYS_ioprio_get __NR_ioprio_get
@ -151,7 +150,7 @@ typedef struct ProcessFieldData_ {
   const char* name;
   const char* title;
   const char* description;
-   uint64_t flags;
+   int flags;
 } ProcessFieldData;

 // Implemented in platform-specific code:
@ -175,6 +174,8 @@ typedef struct ProcessClass_ {

 #define Process_isChildOf(process_, pid_) (process_->tgid == pid_ || (process_->tgid == process_->pid && process_->ppid == pid_))

+#define Process_sortState(state) ((state) == 'I' ? 0x100 : (state))
+
 }*/

 static int Process_getuid = -1;
@ -361,21 +362,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];
@ -384,15 +370,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 {
@ -413,7 +414,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);
@ -484,7 +485,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]);
@ -554,15 +555,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:
@ -600,7 +600,7 @@ long Process_compare(const void* v1, const void* v2) {
         return (p1->starttime_ctime - p2->starttime_ctime);
   }
   case STATE:
-      return (p1->state - p2->state);
+      return (Process_sortState(p1->state) - Process_sortState(p2->state));
   case ST_UID:
      return (p1->st_uid - p2->st_uid);
   case TIME:
--- a/Process.h
+++ b/Process.h
@ -129,7 +129,7 @@ typedef struct ProcessFieldData_ {
   const char* name;
   const char* title;
   const char* description;
-   uint64_t flags;
+   int flags;
 } ProcessFieldData;

 // Implemented in platform-specific code:
@ -153,6 +153,8 @@ typedef struct ProcessClass_ {

 #define Process_isChildOf(process_, pid_) (process_->tgid == pid_ || (process_->tgid == process_->pid && process_->ppid == pid_))

+#define Process_sortState(state) ((state) == 'I' ? 0x100 : (state))
+

 #define ONE_K 1024L
 #define ONE_M (ONE_K * ONE_K)
@ -174,8 +176,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);
--- a/ProcessList.c
+++ b/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;
@ -232,6 +231,11 @@ void ProcessList_sort(ProcessList* this) {
            pid_t ppid = process->tgid == process->pid ? process->ppid : process->tgid;
            // Bisect the process vector to find parent
            int l = 0, r = size;
+            // If PID corresponds with PPID (e.g. "kernel_task" (PID:0, PPID:0)
+            // on Mac OS X 10.11.6) cancel bisecting and regard this process as
+            // root.
+            if (process->pid == ppid)
+               r = 0;
            while (l < r) {
               int c = (l + r) / 2;
               pid_t pid = ((Process*)(Vector_get(this->processes, c)))->pid;
@ -267,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;
--- a/ScreenManager.c
+++ b/ScreenManager.c
@ -71,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;
 }

@ -147,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;
      }
@ -173,8 +157,7 @@ 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;
 }
@ -183,7 +166,7 @@ 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;

@ -206,7 +189,8 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
      }

      int prevCh = ch;
-      ch = Panel_getCh(panelFocus);
+      set_escdelay(25);
+      ch = getch();

      HandlerResult result = IGNORED;
      if (ch == KEY_MOUSE) {
@ -228,7 +212,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
                           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) {
@ -304,7 +288,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
         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;
@ -319,7 +303,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
         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;
--- a/ScreenManager.h
+++ b/ScreenManager.h
@ -43,8 +43,6 @@ 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);
--- a/ScreensPanel.c
+++ b/ScreensPanel.c
@ -1,330 +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;
-   }
-}
-
-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;
-}
--- a/ScreensPanel.h
+++ b/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
--- a/Settings.c
+++ b/Settings.c
@ -29,32 +29,23 @@ typedef struct {
   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;
@ -77,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);
@ -161,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) {
@ -176,59 +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) {
-   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) {
@ -239,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++;
      }
   }
@ -250,32 +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);
-   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) {
-   Settings_newScreen(this, "Default", "PID USER PRIORITY NICE M_SIZE M_RESIDENT M_SHARE STATE PERCENT_CPU PERCENT_MEM TIME Command");
-   this->screens[0]->sortKey = toFieldIndex("PERCENT_CPU");
-   Settings_newScreen(this, "I/O", "PID USER IO_PRIORITY IO_RATE IO_READ_RATE IO_WRITE_RATE PERCENT_SWAP_DELAY PERCENT_IO_DELAY Command");
-   this->screens[1]->sortKey = toFieldIndex("IO_RATE");
-   Settings_newScreen(this, "Perf Counters", "PID USER PERCENT_CPU PROCESSOR MCYCLE MINSTR IPC PERCENT_MISS PERCENT_BMISS Command");
-   this->screens[2]->sortKey = toFieldIndex("MCYCLE");
-   Settings_newScreen(this, "L1 Data Cache", "PID USER PERCENT_CPU L1DREADS L1DRMISSES L1DWRITES L1DWMISSES Command");
-   this->screens[3]->sortKey = toFieldIndex("L1DREADS");
-}
-
 static bool Settings_read(Settings* this, const char* fileName) {
   FILE* fd;
   
@ -286,9 +173,6 @@ static bool Settings_read(Settings* this, const char* fileName) {
      return false;
   
   bool readMeters = false;
-   ProcessField* legacyFields = xCalloc(Platform_numberOfFields+1, sizeof(ProcessField));
-   int legacyFlags;
-   bool legacyFieldsRead = false;
   for (;;) {
      char* line = String_readLine(fd);
      if (!line) {
@ -302,8 +186,14 @@ 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]);
+      } 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")) {
@ -352,60 +242,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);
         readMeters = true;
-      } else if (strncmp(option[0], "screen:", 7) == 0) {
-         Settings_newScreen(this, option[0] + 7, option[1]);
-      } 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) {
-         free(this->screens[0]->fields);
-         this->screens[0]->fields = legacyFields;
-         this->screens[0]->flags = legacyFlags;
-      }
-   }
   if (!readMeters) {
      Settings_defaultMeters(this);
   }
   return true;
 }

-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");
@ -423,7 +293,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);
@ -433,6 +306,7 @@ 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, "detailed_cpu_time=%d\n", (int) this->detailedCPUTime);
   fprintf(fd, "cpu_count_from_zero=%d\n", (int) this->countCPUsFromZero);
@ -444,23 +318,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;
 }
@ -469,11 +326,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;
@ -483,8 +343,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");
@ -540,22 +407,17 @@ Settings* Settings_new(int cpuCount) {
      free(systemSettings);
      if (!ok) {
         Settings_defaultMeters(this);
-         Settings_defaultScreens(this);
         this->hideKernelThreads = true;
         this->highlightMegabytes = true;
         this->highlightThreads = true;
         this->headerMargin = true;
      }
   }
-
-   this->ssIndex = 0;
-   this->ss = this->screens[this->ssIndex];
-
   free(legacyDotfile);
   return this;
 }

-void ScreenSettings_invertSortOrder(ScreenSettings* this) {
+void Settings_invertSortOrder(Settings* this) {
   if (this->direction == 1)
      this->direction = -1;
   else
--- a/Settings.h
+++ b/Settings.h
@ -9,6 +9,7 @@ Released under the GNU GPL, see the COPYING file
 in the source distribution for its full text.
 */

+#define DEFAULT_DELAY 15

 #include "Process.h"
 #include <stdbool.h>
@ -19,32 +20,23 @@ typedef struct {
   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;
@ -66,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
--- a/TraceScreen.c
+++ b/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) {
--- a/configure.ac
+++ b/configure.ac
@ -2,7 +2,7 @@
 # Process this file with autoconf to produce a configure script.

 AC_PREREQ(2.65)
-AC_INIT([htop],[2.0.2],[hisham@gobolinux.org])
+AC_INIT([htop],[2.1.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")
@ -256,52 +256,6 @@ 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")
 if test "x$enable_delayacct" = xyes
 then
--- a/darwin/DarwinProcessList.c
+++ b/darwin/DarwinProcessList.c
@ -171,7 +171,8 @@ void ProcessList_goThroughEntries(ProcessList* super) {
       DarwinProcess_setFromKInfoProc(&proc->super, &ps[i], tv.tv_sec, preExisting);
       DarwinProcess_setFromLibprocPidinfo(proc, dpl);
       
-       DarwinProcess_scanThreads(proc);
+       // Disabled due to bug in macOS High Sierra
+       // DarwinProcess_scanThreads(proc);

       super->totalTasks += 1;

--- a/htop.1.in
+++ b/htop.1.in
@ -49,11 +49,11 @@ The following commands are supported while in htop:
 .LP 
 .TP 5
 .B Up, Alt-k
-Select (hightlight) the previous process in the process list. Scroll the list
+Select (highlight) the previous process in the process list. Scroll the list
 if necessary.
 .TP
 .B Down, Alt-j
-Select (hightlight) the next process in the process list. Scroll the list if
+Select (highlight) the next process in the process list. Scroll the list if
 necessary.
 .TP
 .B Left, Alt-h
--- a/htop.c
+++ b/htop.c
@ -203,12 +203,12 @@ int main(int argc, char** argv) {
   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));

--- a/linux/Battery.c
+++ b/linux/Battery.c
@ -72,6 +72,8 @@ static unsigned long int parseBatInfo(const char *fileName, const unsigned short

      fclose(file);

+      if (!line) break;
+
      char *foundNumStr = String_getToken(line, wordNum);
      const unsigned long int foundNum = atoi(foundNumStr);
      free(foundNumStr);
--- a/linux/LinuxProcess.c
+++ b/linux/LinuxProcess.c
@ -18,24 +18,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,
@ -99,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"
@ -163,25 +139,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
@ -198,7 +155,7 @@ ProcessFieldData Process_fields[] = {
   [0] = { .name = "", .title = NULL, .description = NULL, .flags = 0, },
   [PID] = { .name = "PID", .title = "    PID ", .description = "Process/thread ID", .flags = 0, },
   [COMM] = { .name = "Command", .title = "Command ", .description = "Command line", .flags = 0, },
-   [STATE] = { .name = "STATE", .title = "S ", .description = "Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging)", .flags = 0, },
+   [STATE] = { .name = "STATE", .title = "S ", .description = "Process state (S sleeping, R running, D disk, Z zombie, T traced, W paging, I idle)", .flags = 0, },
   [PPID] = { .name = "PPID", .title = "   PPID ", .description = "Parent process ID", .flags = 0, },
   [PGRP] = { .name = "PGRP", .title = "   PGRP ", .description = "Process group ID", .flags = 0, },
   [SESSION] = { .name = "SESSION", .title = "    SID ", .description = "Process's session ID", .flags = 0, },
@ -273,20 +230,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, },
 };
@ -327,10 +273,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);
@ -364,43 +306,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) {
@ -477,20 +390,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);
@ -499,12 +401,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 {
@ -512,7 +412,7 @@ long LinuxProcess_compare(const void* v1, const void* v2) {
      p1 = (LinuxProcess*)v2;
   }
   long long diff;
-   switch ((int)settings->ss->sortKey) {
+   switch ((int)settings->sortKey) {
   case M_DRS:
      return (p2->m_drs - p1->m_drs);
   case M_DT:
@ -556,20 +456,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);
@ -583,3 +475,4 @@ long LinuxProcess_compare(const void* v1, const void* v2) {
 bool Process_isThread(Process* this) {
   return (Process_isUserlandThread(this) || Process_isKernelThread(this));
 }
+
--- a/linux/LinuxProcess.h
+++ b/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"
@ -155,25 +131,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
@ -209,16 +166,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
--- a/linux/LinuxProcessList.c
+++ b/linux/LinuxProcessList.c
@ -647,9 +647,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;
   }
   
@ -660,77 +660,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);
@ -826,7 +755,6 @@ 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
@ -872,7 +800,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

@ -891,7 +819,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);
@ -906,13 +834,13 @@ static bool LinuxProcessList_recurseProcTree(LinuxProcessList* this, const char*
         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
@ -935,18 +863,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);
--- a/linux/LinuxProcessList.h
+++ b/linux/LinuxProcessList.h
@ -116,54 +116,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
--- a/linux/Platform.c
+++ b/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>
--- a/scripts/MakeHeader.py
+++ b/scripts/MakeHeader.py
@ -12,7 +12,6 @@ ANY=1
 COPY=2
 SKIP=3
 SKIPONE=4
-COPYDEFINE=5

 state = ANY
 static = 0
@ -50,11 +49,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:
@ -65,7 +60,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:
@ -74,11 +69,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 == "}*/":
Author	SHA1	Message	Date
Hisham Muhammad	c50440f165	Bump version to 2.1.0	2018-02-04 20:13:55 +01:00
Jan Chren (rindeal)	b0588d90ff	parseBatInfo: check `line` for NULL before passing it to String_getToken()	2018-02-04 17:04:47 +01:00
coypoop	b84ebfd4e8	Clarify we are looking for the null termination Not for a comparison to zero	2018-02-04 17:02:30 +01:00
Viktor Szépe	b86e14d3cf	Typo in man page hightlight	2018-02-04 17:01:39 +01:00
Wataru Ashihara	b34d76cd41	Fix: infinite loop in tree view on macOS Fixes #688, the bug regressed on `584a9bc`. On Mac OS X 10.11.6, all processes have their parents since there's a special process named "kernel_task", whose PID and PPID are 0. As a result, `this->processes` is never changed causing infinite `while`.	2018-02-04 16:51:06 +01:00
Vladimir Panteleev	87be623eac	Add support for Linux TASK_IDLE Linux commit 06eb61844d841d0032a9950ce7f8e783ee49c0d0 ("sched/debug: Add explicit TASK_IDLE printing") exposes kthreads idling using TASK_IDLE in procfs as "I (idle)". Until now, when sorting the STATE ("S") column, htop used the raw value of the state character for comparison, however that led to the undesirable effect of TASK_IDLE ('I') tasks being sorted above tasks that were running ('R'). Thus, explicitly recognize the idle process state, and sort it below others.	2018-02-04 16:44:21 +01:00
Hisham Muhammad	b27712181a	Darwin: disable thread reading due to bug in macOS High Sierra	2018-02-04 08:59:29 +01:00