From 0580dbb202cca6afddd9c77b2b4c4283bc0a2319 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= Date: Mon, 30 Aug 2021 19:20:42 +0200 Subject: [PATCH] NetBSD: color process state P as running On NetBSD state 'R' means runnable not running. Improve the color identifier name accordingly. --- CRT.c | 12 ++++++------ CRT.h | 2 +- Process.c | 6 +++++- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/CRT.c b/CRT.c index 6f4b2b7a..79863abb 100644 --- a/CRT.c +++ b/CRT.c @@ -138,7 +138,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { [PROCESS_GIGABYTES] = ColorPair(Green, Black), [PROCESS_BASENAME] = A_BOLD | ColorPair(Cyan, Black), [PROCESS_TREE] = ColorPair(Cyan, Black), - [PROCESS_R_STATE] = ColorPair(Green, Black), + [PROCESS_RUN_STATE] = ColorPair(Green, Black), [PROCESS_D_STATE] = A_BOLD | ColorPair(Red, Black), [PROCESS_HIGH_PRIORITY] = ColorPair(Red, Black), [PROCESS_LOW_PRIORITY] = ColorPair(Green, Black), @@ -240,7 +240,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { [PROCESS_GIGABYTES] = A_BOLD, [PROCESS_BASENAME] = A_BOLD, [PROCESS_TREE] = A_BOLD, - [PROCESS_R_STATE] = A_BOLD, + [PROCESS_RUN_STATE] = A_BOLD, [PROCESS_D_STATE] = A_BOLD, [PROCESS_HIGH_PRIORITY] = A_BOLD, [PROCESS_LOW_PRIORITY] = A_DIM, @@ -342,7 +342,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { [PROCESS_GIGABYTES] = ColorPair(Green, White), [PROCESS_BASENAME] = ColorPair(Blue, White), [PROCESS_TREE] = ColorPair(Green, White), - [PROCESS_R_STATE] = ColorPair(Green, White), + [PROCESS_RUN_STATE] = ColorPair(Green, White), [PROCESS_D_STATE] = A_BOLD | ColorPair(Red, White), [PROCESS_HIGH_PRIORITY] = ColorPair(Red, White), [PROCESS_LOW_PRIORITY] = ColorPair(Green, White), @@ -444,7 +444,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { [PROCESS_GIGABYTES] = ColorPair(Green, Black), [PROCESS_BASENAME] = ColorPair(Green, Black), [PROCESS_TREE] = ColorPair(Blue, Black), - [PROCESS_R_STATE] = ColorPair(Green, Black), + [PROCESS_RUN_STATE] = ColorPair(Green, Black), [PROCESS_D_STATE] = A_BOLD | ColorPair(Red, Black), [PROCESS_HIGH_PRIORITY] = ColorPair(Red, Black), [PROCESS_LOW_PRIORITY] = ColorPair(Green, Black), @@ -546,7 +546,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { [PROCESS_GIGABYTES] = ColorPair(Green, Blue), [PROCESS_BASENAME] = A_BOLD | ColorPair(Cyan, Blue), [PROCESS_TREE] = ColorPair(Cyan, Blue), - [PROCESS_R_STATE] = ColorPair(Green, Blue), + [PROCESS_RUN_STATE] = ColorPair(Green, Blue), [PROCESS_D_STATE] = A_BOLD | ColorPair(Red, Blue), [PROCESS_HIGH_PRIORITY] = ColorPair(Red, Blue), [PROCESS_LOW_PRIORITY] = ColorPair(Green, Blue), @@ -652,7 +652,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = { [PROCESS_THREAD_BASENAME] = A_BOLD | ColorPair(Blue, Black), [PROCESS_COMM] = ColorPair(Magenta, Black), [PROCESS_THREAD_COMM] = ColorPair(Yellow, Black), - [PROCESS_R_STATE] = ColorPair(Green, Black), + [PROCESS_RUN_STATE] = ColorPair(Green, Black), [PROCESS_D_STATE] = A_BOLD | ColorPair(Red, Black), [PROCESS_HIGH_PRIORITY] = ColorPair(Red, Black), [PROCESS_LOW_PRIORITY] = ColorPair(Green, Black), diff --git a/CRT.h b/CRT.h index 4e6ff672..f2c2c22e 100644 --- a/CRT.h +++ b/CRT.h @@ -74,7 +74,7 @@ typedef enum ColorElements_ { PROCESS_MEGABYTES, PROCESS_GIGABYTES, PROCESS_TREE, - PROCESS_R_STATE, + PROCESS_RUN_STATE, PROCESS_D_STATE, PROCESS_BASENAME, PROCESS_HIGH_PRIORITY, diff --git a/Process.c b/Process.c index b28f8c1d..924580d0 100644 --- a/Process.c +++ b/Process.c @@ -864,8 +864,12 @@ void Process_writeField(const Process* this, RichString* str, ProcessField field case STATE: xSnprintf(buffer, n, "%c ", this->state); switch (this->state) { +#ifdef HTOP_NETBSD + case 'P': +#else case 'R': - attr = CRT_colors[PROCESS_R_STATE]; +#endif + attr = CRT_colors[PROCESS_RUN_STATE]; break; case 'D': attr = CRT_colors[PROCESS_D_STATE];