Add support for multiple screens, switchable using Tab

19 files changed, 399 insertions, 201 deletions

diff --git a/Action.c b/Action.c
index a6394ac3..14c9b66d 100644
--- a/Action.c
+++ b/Action.c
@@ -156,9 +156,10 @@ static bool expandCollapse(Panel* panel) {
 }
 
 Htop_Reaction Action_setSortKey(Settings* settings, ProcessField sortKey) {
-   settings->sortKey = sortKey;
-   settings->direction = 1;
-   settings->treeView = false;
+   ScreenSettings* ss = settings->ss;
+   ss->sortKey = sortKey;
+   ss->direction = 1;
+   ss->treeView = false;
    return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_UPDATE_PANELHDR | HTOP_KEEP_FOLLOWING;
 }
 
@@ -166,11 +167,12 @@ 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");
-   ProcessField* fields = st->settings->fields;
+   ScreenSettings* ss = st->settings->ss;
+   ProcessField* fields = ss->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] == st->settings->sortKey)
+      if (fields[i] == ss->sortKey)
          Panel_setSelected(sortPanel, i);
       free(name);
    }
@@ -218,8 +220,9 @@ static Htop_Reaction actionToggleProgramPath(State* st) {
 }
 
 static Htop_Reaction actionToggleTreeView(State* st) {
-   st->settings->treeView = !st->settings->treeView;
-   if (st->settings->treeView) st->settings->direction = 1;
+   ScreenSettings* ss = st->settings->ss;
+   ss->treeView = !ss->treeView;
+   if (ss->treeView) ss->direction = 1;
    ProcessList_expandTree(st->pl);
    return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR;
 }
@@ -247,7 +250,7 @@ static Htop_Reaction actionLowerPriority(State* st) {
 }
 
 static Htop_Reaction actionInvertSortOrder(State* st) {
-   Settings_invertSortOrder(st->settings);
+   ScreenSettings_invertSortOrder(st->settings->ss);
    return HTOP_REFRESH | HTOP_SAVE_SETTINGS;
 }
 
@@ -261,13 +264,23 @@ static Htop_Reaction actionExpandOrCollapse(State* st) {
 }
 
 static Htop_Reaction actionExpandCollapseOrSortColumn(State* st) {
-   return st->settings->treeView ? actionExpandOrCollapse(st) : actionSetSortColumn(st);
+   return st->settings->ss->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;
@@ -571,5 +584,6 @@ void Action_setBindings(Htop_Action* keys) {
    keys['U'] = actionUntagAll;
    keys['c'] = actionTagAllChildren;
    keys['e'] = actionShowEnvScreen;
+   keys['\t'] = actionNextScreen;
 }
 
diff --git a/CategoriesPanel.c b/CategoriesPanel.c
index 64e9933a..9cab3e96 100644
--- a/CategoriesPanel.c
+++ b/CategoriesPanel.c
@@ -10,7 +10,6 @@ in the source distribution for its full text.
 #include "AvailableMetersPanel.h"
 #include "MetersPanel.h"
 #include "DisplayOptionsPanel.h"
-#include "ColumnsPanel.h"
 #include "ScreensPanel.h"
 #include "ColorsPanel.h"
 #include "AvailableColumnsPanel.h"
@@ -67,7 +66,7 @@ static void CategoriesPanel_makeColorsPage(CategoriesPanel* this) {
 
 static void CategoriesPanel_makeScreensPage(CategoriesPanel* this) {
    Panel* screens = (Panel*) ScreensPanel_new(this->settings);
-   Panel* columns = (Panel*) ColumnsPanel_new(this->settings);
+   Panel* columns = (Panel*) ((ScreensPanel*)screens)->columns;
    Panel* availableColumns = (Panel*) AvailableColumnsPanel_new(columns);
    ScreenManager_add(this->scr, screens, 20);
    ScreenManager_add(this->scr, columns, 20);
diff --git a/ColumnsPanel.c b/ColumnsPanel.c
index 8974ffdc..60bd56db 100644
--- a/ColumnsPanel.c
+++ b/ColumnsPanel.c
@@ -22,8 +22,9 @@ in the source distribution for its full text.
 
 typedef struct ColumnsPanel_ {
    Panel super;
+   ScreenSettings* ss;
+   bool* changed;
 
-   Settings* settings;
    bool moving;
 } ColumnsPanel;
 
@@ -123,22 +124,31 @@ PanelClass ColumnsPanel_class = {
    .eventHandler = ColumnsPanel_eventHandler
 };
 
-ColumnsPanel* ColumnsPanel_new(Settings* settings) {
+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* 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->settings = settings;
+   this->ss = ss;
+   this->changed = changed;
    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;
 }
 
@@ -154,14 +164,14 @@ int ColumnsPanel_fieldNameToIndex(const char* name) {
 void ColumnsPanel_update(Panel* super) {
    ColumnsPanel* this = (ColumnsPanel*) super;
    int size = Panel_size(super);
-   this->settings->changed = true;
-   this->settings->fields = xRealloc(this->settings->fields, sizeof(ProcessField) * (size+1));
-   this->settings->flags = 0;
+   *(this->changed) = true;
+   this->ss->fields = xRealloc(this->ss->fields, sizeof(ProcessField) * (size+1));
+   this->ss->flags = 0;
    for (int i = 0; i < size; i++) {
       int key = ((ListItem*) Panel_get(super, i))->key;
-      this->settings->fields[i] = key;
-      this->settings->flags |= Process_fields[key].flags;
+      this->ss->fields[i] = key;
+      this->ss->flags |= key < 1000 ? Process_fields[key].flags : 0;
    }
-   this->settings->fields[size] = 0;
+   this->ss->fields[size] = 0;
 }
 
diff --git a/ColumnsPanel.h b/ColumnsPanel.h
index 0da674a8..054880c1 100644
--- a/ColumnsPanel.h
+++ b/ColumnsPanel.h
@@ -14,15 +14,18 @@ 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;
 
-ColumnsPanel* ColumnsPanel_new(Settings* settings);
+void ColumnsPanel_fill(ColumnsPanel* this, ScreenSettings* ss);
+
+ColumnsPanel* ColumnsPanel_new(ScreenSettings* ss, bool* changed);
 
 int ColumnsPanel_fieldNameToIndex(const char* name);
 
diff --git a/DisplayOptionsPanel.c b/DisplayOptionsPanel.c
index 0ff54e33..c3b1e746 100644
--- a/DisplayOptionsPanel.c
+++ b/DisplayOptionsPanel.c
@@ -83,7 +83,6 @@ 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)));
diff --git a/Header.c b/Header.c
index e048ee55..2193e980 100644
--- 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->columns[col];
+      MeterColumnSettings* colSettings = &this->settings->meterColumns[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->columns[col];
+      MeterColumnSettings* colSettings = &this->settings->meterColumns[col];
       
       String_freeArray(colSettings->names);
       free(colSettings->modes);
diff --git a/ListItem.c b/ListItem.c
index 05c5c0b3..55c73433 100644
--- a/ListItem.c
+++ b/ListItem.c
@@ -27,13 +27,13 @@ typedef struct ListItem_ {
 
 }*/
 
-static void ListItem_delete(Object* cast) {
+void ListItem_delete(Object* cast) {
    ListItem* this = (ListItem*)cast;
    free(this->value);
    free(this);
 }
 
-static void ListItem_display(Object* cast, RichString* out) {
+void ListItem_display(Object* cast, RichString* out) {
    ListItem* const this = (ListItem*)cast;
    assert (this != NULL);
    /*
@@ -59,11 +59,15 @@ ObjectClass ListItem_class = {
    .compare = ListItem_compare
 };
 
-ListItem* ListItem_new(const char* value, int key) {
-   ListItem* this = AllocThis(ListItem);
+void ListItem_init(ListItem* this, const char* value, int key) {
    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;
 }
 
diff --git a/ListItem.h b/ListItem.h
index b48f0acd..ba159502 100644
--- a/ListItem.h
+++ b/ListItem.h
@@ -19,8 +19,14 @@ 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);
diff --git a/MainPanel.c b/MainPanel.c
index b5a7e305..4366792b 100644
--- a/MainPanel.c
+++ b/MainPanel.c
@@ -67,15 +67,17 @@ 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 == settings->sortKey) {
-         Settings_invertSortOrder(settings);
-         settings->treeView = false;
+      if (field == ss->sortKey) {
+         ScreenSettings_invertSortOrder(ss);
+         ss->treeView = false;
       } else {
          reaction |= Action_setSortKey(settings, field);
       }
@@ -108,8 +110,8 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) {
    }
 
    if (reaction & HTOP_REDRAW_BAR) {
-      MainPanel_updateTreeFunctions(this, this->state->settings->treeView);
-      IncSet_drawBar(this->inc);
+      MainPanel_updateTreeFunctions(this, settings->ss->treeView);
+      IncSet_drawBar(this->inc, CRT_colors[FUNCTION_BAR]);
    }
    if (reaction & HTOP_UPDATE_PANELHDR) {
       ProcessList_printHeader(this->state->pl, Panel_getHeader(super));
diff --git a/Process.c b/Process.c
index 18360802..cac890f5 100644
--- a/Process.c
+++ b/Process.c
@@ -393,7 +393,8 @@ void Process_writeField(Process* this, RichString* str, ProcessField field) {
          attr = CRT_colors[PROCESS_THREAD];
          baseattr = CRT_colors[PROCESS_THREAD_BASENAME];
       }
-      if (!this->settings->treeView || this->indent == 0) {
+      ScreenSettings* ss = this->settings->ss;
+      if (!ss->treeView || this->indent == 0) {
          Process_writeCommand(this, attr, baseattr, str);
          return;
       } else {
@@ -414,7 +415,7 @@ void Process_writeField(Process* this, RichString* str, ProcessField field) {
             buf += written;
             n -= written;
          }
-         const char* draw = CRT_treeStr[lastItem ? (this->settings->direction == 1 ? TREE_STR_BEND : TREE_STR_TEND) : TREE_STR_RTEE];
+         const char* draw = CRT_treeStr[lastItem ? (ss->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);
@@ -485,7 +486,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->fields;
+   ProcessField* fields = this->settings->ss->fields;
    RichString_prune(out);
    for (int i = 0; fields[i]; i++)
       As_Process(this)->writeField(this, out, fields[i]);
@@ -555,14 +556,15 @@ 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;
-   if (settings->direction == 1) {
+   ScreenSettings* ss = settings->ss;
+   if (ss->direction == 1) {
       p1 = (Process*)v1;
       p2 = (Process*)v2;
    } else {
       p2 = (Process*)v1;
       p1 = (Process*)v2;
    }
-   switch (settings->sortKey) {
+   switch (ss->sortKey) {
    case PERCENT_CPU:
       return (p2->percent_cpu > p1->percent_cpu ? 1 : -1);
    case PERCENT_MEM:
diff --git a/ProcessList.c b/ProcessList.c
index 48b2d955..5b6a98f3 100644
--- a/ProcessList.c
+++ b/ProcessList.c
@@ -124,14 +124,15 @@ void ProcessList_setPanel(ProcessList* this, Panel* panel) {
 
 void ProcessList_printHeader(ProcessList* this, RichString* header) {
    RichString_prune(header);
-   ProcessField* fields = this->settings->fields;
+   ProcessField* fields = this->settings->ss->fields;
    for (int i = 0; fields[i]; i++) {
-      const char* field = Process_fields[fields[i]].title;
+      unsigned int key = fields[i];
+      const char* field = Process_fields[key].title;
       if (!field) 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);
+      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);
    }
 }
 
@@ -200,19 +201,19 @@ static void ProcessList_buildTree(ProcessList* this, pid_t pid, int level, int i
 }
 
 void ProcessList_sort(ProcessList* this) {
-   if (!this->settings->treeView) {
+   if (!this->settings->ss->treeView) {
       Vector_insertionSort(this->processes);
    } else {
       // Save settings
-      int direction = this->settings->direction;
-      int sortKey = this->settings->sortKey;
+      int direction = this->settings->ss->direction;
+      int sortKey = this->settings->ss->sortKey;
       // Sort by PID
-      this->settings->sortKey = PID;
-      this->settings->direction = 1;
+      this->settings->ss->sortKey = PID;
+      this->settings->ss->direction = 1;
       Vector_quickSort(this->processes);
       // Restore settings
-      this->settings->sortKey = sortKey;
-      this->settings->direction = direction;
+      this->settings->ss->sortKey = sortKey;
+      this->settings->ss->direction = direction;
       int vsize = Vector_size(this->processes);
       // Find all processes whose parent is not visible
       int size;
@@ -271,7 +272,7 @@ void ProcessList_sort(ProcessList* this) {
 
 ProcessField ProcessList_keyAt(ProcessList* this, int at) {
    int x = 0;
-   ProcessField* fields = this->settings->fields;
+   ProcessField* fields = this->settings->ss->fields;
    ProcessField field;
    for (int i = 0; (field = fields[i]); i++) {
       const char* title = Process_fields[field].title;
diff --git a/ScreenManager.c b/ScreenManager.c
index 1a93ae00..081d887a 100644
--- a/ScreenManager.c
+++ b/ScreenManager.c
@@ -71,30 +71,46 @@ 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 (this->panelCount > 0) {
-         Panel* last = (Panel*) Vector_get(this->panels, this->panelCount - 1);
+      if (idx > 0) {
+         Panel* last = (Panel*) Vector_get(this->panels, idx - 1);
          lastX = last->x + last->w + 1;
       }
       int height = LINES - this->y1 + this->y2;
-      if (size > 0) {
-         Panel_resize(item, size, height);
-      } else {
-         Panel_resize(item, COLS-this->x1+this->x2-lastX, height);
+      if (size <= 0) {
+         size = COLS-this->x1+this->x2-lastX;
       }
+      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_add(this->panels, item);
+   Vector_insert(this->panels, idx, 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;
 }
 
@@ -131,7 +147,7 @@ static void checkRecalculation(ScreenManager* this, double* oldTime, int* sortTi
    if (*rescan) {
       *oldTime = newTime;
       ProcessList_scan(pl);
-      if (*sortTimeout == 0 || this->settings->treeView) {
+      if (*sortTimeout == 0 || this->settings->ss->treeView) {
          ProcessList_sort(pl);
          *sortTimeout = 1;
       }
diff --git a/ScreenManager.h b/ScreenManager.h
index 3d02a883..ebaf0bf6 100644
--- a/ScreenManager.h
+++ b/ScreenManager.h
@@ -43,6 +43,8 @@ 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);
diff --git a/ScreensPanel.c b/ScreensPanel.c
index 6c88035a..19ac96bd 100644
--- a/ScreensPanel.c
+++ b/ScreensPanel.c
@@ -9,7 +9,6 @@ in the source distribution for its full text.
 #include "Platform.h"
 
 #include "StringUtils.h"
-#include "ListItem.h"
 #include "CRT.h"
 
 #include <assert.h>
@@ -19,7 +18,10 @@ 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
@@ -27,8 +29,10 @@ in the source distribution for its full text.
 
 typedef struct ScreensPanel_ {
    Panel super;
-
+   
+   ScreenManager* scr;
    Settings* settings;
+   ColumnsPanel* columns;
    char buffer[SCREEN_NAME_LEN + 1];
    char* saved;
    int cursor;
@@ -36,9 +40,27 @@ typedef struct ScreensPanel_ {
    bool renaming;
 } ScreensPanel;
 
+typedef struct ScreenListItem_ {
+   ListItem super;
+   ScreenSettings* ss;
+} ScreenListItem;
+
 }*/
 
-static const char* const ScreensFunctions[] = {"      ", "Rename", "      ", "      ", "      ", "      ", "MoveUp", "MoveDn", "Remove", "Done  ", NULL};
+ObjectClass ScreenListItem_class = {
+   .display = ListItem_display,
+   .delete = ListItem_delete,
+   .compare = ListItem_compare
+};
+
+ScreenListItem* ScreenListItem_new(const char* value, int key, ScreenSettings* ss) {
+   ScreenListItem* this = AllocThis(ScreenListItem);
+   ListItem_init((ListItem*)this, value, key);
+   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;
@@ -81,6 +103,7 @@ static HandlerResult ScreensPanel_eventHandlerRenaming(Panel* super, int ch) {
             this->renaming = false;
             super->cursorOn = false;
             Panel_setSelectionColor(super, CRT_colors[PANEL_SELECTION_FOCUS]);
+            ScreensPanel_update(super);
             break;
          }
          case 27: // Esc
@@ -94,11 +117,10 @@ static HandlerResult ScreensPanel_eventHandlerRenaming(Panel* super, int ch) {
          }
       }
    }
-   ScreensPanel_update(super);
    return HANDLED;
 }
 
-void startRenaming(Panel* super) {
+static void startRenaming(Panel* super) {
    ScreensPanel* const this = (ScreensPanel*) super;
 
    ListItem* item = (ListItem*) Panel_getSelected(super);
@@ -115,10 +137,25 @@ void startRenaming(Panel* super) {
    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 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:
@@ -133,27 +170,39 @@ static HandlerResult ScreensPanel_eventHandlerNormal(Panel* super, int ch) {
          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 0x12: /* Ctrl+R */
+      case KEY_CTRL('R'):
       {
          startRenaming(super);
          result = HANDLED;
          break;
       }
       case KEY_F(5):
-      case 0x0e: /* Ctrl+N */
+      case KEY_CTRL('N'):
       {
          ListItem* item = ListItem_new("", 0);
          int idx = Panel_getSelectedIndex(super);
          Panel_insert(super, idx + 1, (Object*) item);
          Panel_setSelected(super, idx + 1);
          startRenaming(super);
+         shouldRebuildArray = true;
          result = HANDLED;
          break;
       }
       case KEY_UP:
       {
          if (!this->moving) {
+            Panel_onKey(super, ch);
             break;
          }
          /* else fallthrough */
@@ -163,12 +212,14 @@ static HandlerResult ScreensPanel_eventHandlerNormal(Panel* super, int ch) {
       case '-':
       {
          Panel_moveSelectedUp(super);
+         shouldRebuildArray = true;
          result = HANDLED;
          break;
       }
       case KEY_DOWN:
       {
          if (!this->moving) {
+            Panel_onKey(super, ch);
             break;
          }
          /* else fallthrough */
@@ -178,13 +229,17 @@ static HandlerResult ScreensPanel_eventHandlerNormal(Panel* super, int ch) {
       case '+':
       {
          Panel_moveSelectedDown(super);
+         shouldRebuildArray = true;
          result = HANDLED;
          break;
       }
       case KEY_F(9):
       //case KEY_DC:
       {
-         Panel_remove(super, selected);
+         if (Panel_size(super) > 1) {
+            Panel_remove(super, selected);
+         }
+         shouldRebuildArray = true;
          result = HANDLED;
          break;
       }
@@ -197,6 +252,14 @@ static HandlerResult ScreensPanel_eventHandlerNormal(Panel* super, int ch) {
          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;
@@ -227,16 +290,17 @@ ScreensPanel* ScreensPanel_new(Settings* settings) {
    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");
 
-   char** screens = this->settings->screens;
-   for (; *screens; screens++) {
-      char* name = *screens;
-      Panel_add(super, (Object*) ListItem_new(name, 0));
+   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, i, ss));
    }
    return this;
 }
@@ -248,7 +312,7 @@ void ScreensPanel_update(Panel* super) {
    this->settings->screens = xRealloc(this->settings->screens, sizeof(char*) * (size+1));
    for (int i = 0; i < size; i++) {
       char* name = ((ListItem*) Panel_get(super, i))->value;
-      this->settings->screens[i] = xStrdup(name);
+      this->settings->screens[i]->name = xStrdup(name);
    }
    this->settings->screens[size] = NULL;
 }
diff --git a/ScreensPanel.h b/ScreensPanel.h
index 35842a95..f1c80647 100644
--- a/ScreensPanel.h
+++ b/ScreensPanel.h
@@ -10,7 +10,10 @@ 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
@@ -18,8 +21,10 @@ in the source distribution for its full text.
 
 typedef struct ScreensPanel_ {
    Panel super;
-
+   
+   ScreenManager* scr;
    Settings* settings;
+   ColumnsPanel* columns;
    char buffer[SCREEN_NAME_LEN + 1];
    char* saved;
    int cursor;
@@ -27,8 +32,15 @@ typedef struct ScreensPanel_ {
    bool renaming;
 } ScreensPanel;
 
+typedef struct ScreenListItem_ {
+   ListItem super;
+   ScreenSettings* ss;
+} ScreenListItem;
+
+
+extern ObjectClass ScreenListItem_class;
 
-void startRenaming(Panel* super);
+ScreenListItem* ScreenListItem_new(const char* value, int key, ScreenSettings* ss);
 
 extern PanelClass ScreensPanel_class;
 
diff --git a/Settings.c b/Settings.c
index 3de74814..c179f84d 100644
--- a/Settings.c
+++ b/Settings.c
@@ -29,26 +29,33 @@ 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 columns[2];
+   MeterColumnSettings meterColumns[2];
 
-   char** screens;
-   int nScreens;
+   ScreenSettings** screens;
+   unsigned int nScreens;
+   unsigned int ssIndex;
+   ScreenSettings* ss;
 
-   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;
@@ -80,8 +87,10 @@ static void writeList(FILE* fd, char** list, int len) {
    fprintf(fd, "\n");
 }
 
-static char** readQuotedList(char* line, int* size) {
-   *size = 0;
+/*
+
+static char** readQuotedList(char* line) {
+   int n = 0;
    char** list = xCalloc(sizeof(char*), 1);
    int start = 0;
    for (;;) {
@@ -100,50 +109,51 @@ static char** readQuotedList(char* line, int* size) {
       char* item = xMalloc(len + 1);
       strncpy(item, line + start, len);
       item[len] = '\0';
-      list[*size] = item;
-      (*size)++;
-      list = xRealloc(list, sizeof(char*) * (*size + 1));
+      list[n] = item;
+      n++;
+      list = xRealloc(list, sizeof(char*) * (n + 1));
       start = close + 1;
    }
-   list[*size] = NULL;
+   list[n] = NULL;
    return list;
 }
 
-static void writeQuotedList(FILE* fd, char** list, int len) {
+static void writeQuotedList(FILE* fd, char** list) {
    const char* sep = "";
-   for (int i =