From d5de1bc23d693df76444f1454a783e80cda89a88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20G=C3=B6ttsche?= <cgzones@googlemail.com>
Date: Wed, 27 Jan 2021 15:11:44 +0100
Subject: [PATCH] Overhaul sorting of state process column

Do not sort by ascii value of the state identifier, sort by relevance
---
 Process.c | 40 +++++++++++++++++++++++++++++++++++++++-
 Process.h |  3 ---
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/Process.c b/Process.c
index f164e5f5..38572da2 100644
--- a/Process.c
+++ b/Process.c
@@ -518,6 +518,44 @@ int Process_compare(const void* v1, const void* v2) {
    return result;
 }
 
+static uint8_t stateCompareValue(char state) {
+   switch (state) {
+
+   case 'S':
+      return 10;
+
+   case 'I':
+      return 9;
+
+   case 'X':
+      return 8;
+
+   case 'Z':
+      return 7;
+
+   case 't':
+      return 6;
+
+   case 'T':
+      return 5;
+
+   case 'L':
+      return 4;
+
+   case 'D':
+      return 3;
+
+   case 'R':
+      return 2;
+
+   case '?':
+      return 1;
+
+   default:
+      return 0;
+   }
+}
+
 int Process_compareByKey_Base(const Process* p1, const Process* p2, ProcessField key) {
    int r;
 
@@ -557,7 +595,7 @@ int Process_compareByKey_Base(const Process* p1, const Process* p2, ProcessField
       r = SPACESHIP_NUMBER(p1->starttime_ctime, p2->starttime_ctime);
       return r != 0 ? r : SPACESHIP_NUMBER(p1->pid, p2->pid);
    case STATE:
-      return SPACESHIP_NUMBER(Process_sortState(p1->state), Process_sortState(p2->state));
+      return SPACESHIP_NUMBER(stateCompareValue(p1->state), stateCompareValue(p2->state));
    case ST_UID:
       return SPACESHIP_NUMBER(p1->st_uid, p2->st_uid);
    case TIME:
diff --git a/Process.h b/Process.h
index d6d323ce..77f29d03 100644
--- a/Process.h
+++ b/Process.h
@@ -241,9 +241,6 @@ static inline bool Process_isChildOf(const Process* this, pid_t pid) {
    return pid == Process_getParentPid(this);
 }
 
-#define Process_sortState(state) ((state) == 'I' ? 0x100 : (state))
-
-
 #define ONE_K 1024UL
 #define ONE_M (ONE_K * ONE_K)
 #define ONE_G (ONE_M * ONE_K)