From b10821aae9ac208dce0613e6869984d4f2fa1674 Mon Sep 17 00:00:00 2001
From: Hisham Muhammad <hisham@gobolinux.org>
Date: Fri, 4 Aug 2006 20:54:37 +0000
Subject: --sort-key flag in the command-line, overriding the saved setting in
 .htoprc for the session. (thanks to Rodolfo Borges)

---
 ColumnsPanel.c | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

(limited to 'ColumnsPanel.c')

diff --git a/ColumnsPanel.c b/ColumnsPanel.c
index 8d3dd458..7a5a298b 100644
--- a/ColumnsPanel.c
+++ b/ColumnsPanel.c
@@ -44,6 +44,15 @@ void ColumnsPanel_delete(Object* object) {
    free(this);
 }
 
+int ColumnsPanel_fieldNameToIndex(const char* name) {
+   for (int j = 1; j <= LAST_PROCESSFIELD; j++) {
+      if (String_eq(name, Process_fieldNames[j])) {
+         return j;
+      }
+   }
+   return 0;
+}
+
 void ColumnsPanel_update(Panel* super) {
    ColumnsPanel* this = (ColumnsPanel*) super;
    int size = Panel_getSize(super);
@@ -53,12 +62,9 @@ void ColumnsPanel_update(Panel* super) {
    this->settings->pl->fields = (ProcessField*) malloc(sizeof(ProcessField) * (size+1));
    for (int i = 0; i < size; i++) {
       char* text = ((ListItem*) Panel_get(super, i))->value;
-      for (int j = 1; j <= LAST_PROCESSFIELD; j++) {
-         if (String_eq(text, Process_fieldNames[j])) {
-            this->settings->pl->fields[i] = j;
-            break;
-         }
-      }
+          int j = ColumnsPanel_fieldNameToIndex(text);
+          if (j > 0)
+             this->settings->pl->fields[i] = j;
    }
    this->settings->pl->fields[size] = 0;
 }
@@ -83,7 +89,7 @@ HandlerResult ColumnsPanel_eventHandler(Panel* super, int ch) {
       case ']':
       case '+':
       {
-	 if (selected < size - 2) 
+         if (selected < size - 2) 
             Panel_moveSelectedDown(super);
          result = HANDLED;
          break;
-- 
cgit v1.2.3