Add support to change numeric options in settings screen

CRT.c

@@ -72,7 +72,7 @@ bool CRT_utf8 = false;
 
 const char* const* CRT_treeStr = CRT_treeStrAscii;
 
-int CRT_delay;
+static const int* CRT_delay;
 
 const char* CRT_degreeSign;
 
@@ -654,10 +654,10 @@ static struct sigaction old_sig_handler[32];
 
 // TODO: pass an instance of Settings instead.
 
-void CRT_init(int delay, int colorScheme, bool allowUnicode) {
+void CRT_init(const int* delay, int colorScheme, bool allowUnicode) {
    initscr();
    noecho();
-   CRT_delay = CLAMP(delay, 1, 255);
+   CRT_delay = delay;
    CRT_colors = CRT_colorSchemes[colorScheme];
    CRT_colorScheme = colorScheme;
 
@@ -666,7 +666,7 @@ void CRT_init(int delay, int colorScheme, bool allowUnicode) {
       CRT_colorSchemes[COLORSCHEME_BROKENGRAY][i] = color == (A_BOLD | ColorPairGrayBlack) ? ColorPair(White, Black) : color;
    }
 
-   halfdelay(CRT_delay);
+   halfdelay(*CRT_delay);
    nonl();
    intrflush(stdscr, false);
    keypad(stdscr, true);
@@ -774,7 +774,7 @@ int CRT_readKey() {
    cbreak();
    nodelay(stdscr, FALSE);
    int ret = getch();
-   halfdelay(CRT_delay);
+   halfdelay(*CRT_delay);
    return ret;
 }
 
@@ -785,7 +785,7 @@ void CRT_disableDelay() {
 }
 
 void CRT_enableDelay() {
-   halfdelay(CRT_delay);
+   halfdelay(*CRT_delay);
 }
 
 void CRT_setColors(int colorScheme) {

CRT.h

@@ -142,8 +142,6 @@ extern bool CRT_utf8;
 
 extern const char* const* CRT_treeStr;
 
-extern int CRT_delay;
-
 extern const int* CRT_colors;
 
 extern int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT];
@@ -175,7 +173,7 @@ static inline void CRT_restorePrivileges(void) { }
 
 #endif /* HAVE_SETUID_ENABLED */
 
-void CRT_init(int delay, int colorScheme, bool allowUnicode);
+void CRT_init(const int* delay, int colorScheme, bool allowUnicode);
 
 void CRT_done(void);
 

ColorsPanel.c

@@ -10,11 +10,11 @@ in the source distribution for its full text.
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include "CheckItem.h"
 #include "CRT.h"
 #include "FunctionBar.h"
 #include "Header.h"
 #include "Object.h"
+#include "OptionItem.h"
 #include "ProvideCurses.h"
 #include "RichString.h"
 #include "Vector.h"
@@ -103,7 +103,7 @@ ColorsPanel* ColorsPanel_new(Settings* settings, ScreenManager* scr) {
 
    Panel_setHeader(super, "Colors");
    for (int i = 0; ColorSchemeNames[i] != NULL; i++) {
-      Panel_add(super, (Object*) CheckItem_newByVal(xStrdup(ColorSchemeNames[i]), false));
+      Panel_add(super, (Object*) CheckItem_newByVal(ColorSchemeNames[i], false));
    }
    CheckItem_set((CheckItem*)Panel_get(super, settings->colorScheme), true);
    return this;

DisplayOptionsPanel.c

@@ -12,11 +12,11 @@ in the source distribution for its full text.
 #include <stdbool.h>
 #include <stdlib.h>
 
-#include "CheckItem.h"
 #include "CRT.h"
 #include "FunctionBar.h"
 #include "Header.h"
 #include "Object.h"
+#include "OptionItem.h"
 #include "ProvideCurses.h"
 #include "XUtils.h"
 
@@ -34,17 +34,38 @@ static HandlerResult DisplayOptionsPanel_eventHandler(Panel* super, int ch) {
    DisplayOptionsPanel* this = (DisplayOptionsPanel*) super;
 
    HandlerResult result = IGNORED;
-   CheckItem* selected = (CheckItem*) Panel_getSelected(super);
+   OptionItem* selected = (OptionItem*) Panel_getSelected(super);
 
-   switch(ch) {
-   case 0x0a:
-   case 0x0d:
+   switch (ch) {
+   case '\n':
+   case '\r':
    case KEY_ENTER:
    case KEY_MOUSE:
    case KEY_RECLICK:
    case ' ':
-      CheckItem_set(selected, !CheckItem_get(selected));
-      result = HANDLED;
+      switch (OptionItem_kind(selected)) {
+      case OPTION_ITEM_CHECK:
+         CheckItem_toggle((CheckItem*)selected);
+         result = HANDLED;
+         break;
+      case OPTION_ITEM_NUMBER:
+         NumberItem_toggle((NumberItem*)selected);
+         result = HANDLED;
+         break;
+      }
+      break;
+   case '-':
+      if (OptionItem_kind(selected) == OPTION_ITEM_NUMBER) {
+         NumberItem_decrease((NumberItem*)selected);
+         result = HANDLED;
+      }
+      break;
+   case '+':
+      if (OptionItem_kind(selected) == OPTION_ITEM_NUMBER) {
+         NumberItem_increase((NumberItem*)selected);
+         result = HANDLED;
+      }
+      break;
    }
 
    if (result == HANDLED) {
@@ -70,39 +91,41 @@ DisplayOptionsPanel* DisplayOptionsPanel_new(Settings* settings, ScreenManager*
    DisplayOptionsPanel* this = AllocThis(DisplayOptionsPanel);
    Panel* super = (Panel*) this;
    FunctionBar* fuBar = FunctionBar_new(DisplayOptionsFunctions, NULL, NULL);
-   Panel_init(super, 1, 1, 1, 1, Class(CheckItem), true, fuBar);
+   Panel_init(super, 1, 1, 1, 1, Class(OptionItem), true, fuBar);
 
    this->settings = settings;
    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)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Display threads in a different color"), &(settings->highlightThreads)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Show custom thread names"), &(settings->showThreadNames)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Show program path"), &(settings->showProgramPath)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Highlight program \"basename\""), &(settings->highlightBaseName)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Merge exe, comm and cmdline in Command"), &(settings->showMergedCommand)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("- Try to find comm in cmdline (when Command is merged)"), &(settings->findCommInCmdline)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("- Try to strip exe from cmdline (when Command is merged)"), &(settings->stripExeFromCmdline)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Highlight large numbers in memory counters"), &(settings->highlightMegabytes)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Leave a margin around header"), &(settings->headerMargin)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Detailed CPU time (System/IO-Wait/Hard-IRQ/Soft-IRQ/Steal/Guest)"), &(settings->detailedCPUTime)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Count CPUs from 1 instead of 0"), &(settings->countCPUsFromOne)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Update process names on every refresh"), &(settings->updateProcessNames)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Add guest time in CPU meter percentage"), &(settings->accountGuestInCPUMeter)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Also show CPU percentage numerically"), &(settings->showCPUUsage)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Also show CPU frequency"), &(settings->showCPUFrequency)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Tree view", &(settings->treeView)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Shadow other users' processes", &(settings->shadowOtherUsers)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Hide kernel threads", &(settings->hideKernelThreads)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Hide userland process threads", &(settings->hideUserlandThreads)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Display threads in a different color", &(settings->highlightThreads)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Show custom thread names", &(settings->showThreadNames)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Show program path", &(settings->showProgramPath)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Highlight program \"basename\"", &(settings->highlightBaseName)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Merge exe, comm and cmdline in Command", &(settings->showMergedCommand)));
+   Panel_add(super, (Object*) CheckItem_newByRef("- Try to find comm in cmdline (when Command is merged)", &(settings->findCommInCmdline)));
+   Panel_add(super, (Object*) CheckItem_newByRef("- Try to strip exe from cmdline (when Command is merged)", &(settings->stripExeFromCmdline)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Highlight large numbers in memory counters", &(settings->highlightMegabytes)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Leave a margin around header", &(settings->headerMargin)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Detailed CPU time (System/IO-Wait/Hard-IRQ/Soft-IRQ/Steal/Guest)", &(settings->detailedCPUTime)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Count CPUs from 1 instead of 0", &(settings->countCPUsFromOne)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Update process names on every refresh", &(settings->updateProcessNames)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Add guest time in CPU meter percentage", &(settings->accountGuestInCPUMeter)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Also show CPU percentage numerically", &(settings->showCPUUsage)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Also show CPU frequency", &(settings->showCPUFrequency)));
    #ifdef HAVE_LIBSENSORS
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Also show CPU temperature"), &(settings->showCPUTemperature)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("- Show temperature in degree Fahrenheit instead of Celsius"), &(settings->degreeFahrenheit)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Also show CPU temperature", &(settings->showCPUTemperature)));
+   Panel_add(super, (Object*) CheckItem_newByRef("- Show temperature in degree Fahrenheit instead of Celsius", &(settings->degreeFahrenheit)));
    #endif
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Enable the mouse"), &(settings->enableMouse)));
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Highlight new and old processes"), &(settings->highlightChanges)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Enable the mouse", &(settings->enableMouse)));
+   Panel_add(super, (Object*) NumberItem_newByRef("Update interval (in seconds)", &(settings->delay), -1, 1, 255));
+   Panel_add(super, (Object*) CheckItem_newByRef("Highlight new and old processes", &(settings->highlightChanges)));
+   Panel_add(super, (Object*) NumberItem_newByRef("- Highlight time (in seconds)", &(settings->highlightDelaySecs), 0, 1, 24*60*60));
    #ifdef HAVE_LIBHWLOC
-   Panel_add(super, (Object*) CheckItem_newByRef(xStrdup("Show topology when selecting affinity by default"), &(settings->topologyAffinity)));
+   Panel_add(super, (Object*) CheckItem_newByRef("Show topology when selecting affinity by default", &(settings->topologyAffinity)));
    #endif
    return this;
 }

Makefile.am

@@ -21,7 +21,6 @@ myhtopsources = \
 	AvailableMetersPanel.c \
 	BatteryMeter.c \
 	CategoriesPanel.c \
-	CheckItem.c \
 	ClockMeter.c \
 	ColorsPanel.c \
 	ColumnsPanel.c \
@@ -50,6 +49,7 @@ myhtopsources = \
 	NetworkIOMeter.c \
 	Object.c \
 	OpenFilesScreen.c \
+	OptionItem.c \
 	Panel.c \
 	Process.c \
 	ProcessList.c \
@@ -76,7 +76,6 @@ myhtopheaders = \
 	CPUMeter.h \
 	CRT.h \
 	CategoriesPanel.h \
-	CheckItem.h \
 	ClockMeter.h \
 	ColorsPanel.h \
 	ColumnsPanel.h \
@@ -103,6 +102,7 @@ myhtopheaders = \
 	NetworkIOMeter.h \
 	Object.h \
 	OpenFilesScreen.h \
+	OptionItem.h \
 	Panel.h \
 	Process.h \
 	ProcessList.h \

Meter.c

@@ -296,7 +296,8 @@ static void GraphMeterMode_draw(Meter* this, int x, int y, int w) {
    struct timeval now;
    gettimeofday(&now, NULL);
    if (!timercmp(&now, &(data->time), <)) {
-      struct timeval delay = { .tv_sec = CRT_delay / 10, .tv_usec = (CRT_delay - ((CRT_delay / 10) * 10)) * 100000 };
+      int globalDelay = this->pl->settings->delay;
+      struct timeval delay = { .tv_sec = globalDelay / 10, .tv_usec = (globalDelay - ((globalDelay / 10) * 10)) * 100000 };
       timeradd(&now, &delay, &(data->time));
 
       for (int i = 0; i < nValues - 1; i++)