adjust AvailableColumns per screen

smalinux · smalinux · commit 586ced46efd8 · 2022-10-26T18:55:37.000+02:00
Signed-off-by: Sohaib Mohamed &lt;sohaib.amhmd@gmail.com&gt;
diff --git a/AvailableColumnsPanel.c b/AvailableColumnsPanel.c
@@ -23,11 +23,15 @@ in the source distribution for its full text.
 #include "XUtils.h"
 
 
+Panel* activeAvailableColumns;
+
 static const char* const AvailableColumnsFunctions[] = {"      ", "      ", "      ", "      ", "Add   ", "      ", "      ", "      ", "      ", "Done  ", NULL};
 
 static void AvailableColumnsPanel_delete(Object* object) {
    Panel* super = (Panel*) object;
    AvailableColumnsPanel* this = (AvailableColumnsPanel*) object;
+   if (activeAvailableColumns == super)
+      activeAvailableColumns = NULL;
    Panel_done(super);
    free(this);
 }
@@ -94,13 +98,13 @@ static void AvailableColumnsPanel_addDynamicColumn(ht_key_t key, void* value, vo
 }
 
 // Handle DynamicColumns entries in the AvailableColumnsPanel
-static void AvailableColumnsPanel_addDynamicColumns(Panel* super, Hashtable* dynamicColumns) {
+void AvailableColumnsPanel_addDynamicColumns(Panel* super, Hashtable* dynamicColumns) {
    assert(dynamicColumns);
    Hashtable_foreach(dynamicColumns, AvailableColumnsPanel_addDynamicColumn, super);
 }
 
 // Handle remaining Platform Meter entries in the AvailableColumnsPanel
-static void AvailableColumnsPanel_addPlatformColumn(Panel* super) {
+void AvailableColumnsPanel_addPlatformColumn(Panel* super) {
    for (int i = 1; i < LAST_PROCESSFIELD; i++) {
       if (i != COMM && Process_fields[i].description) {
          char description[256];
@@ -120,6 +124,11 @@ AvailableColumnsPanel* AvailableColumnsPanel_new(Panel* columns, Hashtable* dyna
    AvailableColumnsPanel_addPlatformColumn(super);
    AvailableColumnsPanel_addDynamicColumns(super, dynamicColumns);
 
+   activeAvailableColumns = super;
    this->columns = columns;
    return this;
 }
+
+Panel* AvailableColumnsPanel_get(void) {
+   return activeAvailableColumns;
+}
diff --git a/AvailableColumnsPanel.h b/AvailableColumnsPanel.h
@@ -20,4 +20,10 @@ extern const PanelClass AvailableColumnsPanel_class;
 
 AvailableColumnsPanel* AvailableColumnsPanel_new(Panel* columns, Hashtable* dynamicColumns);
 
+void AvailableColumnsPanel_addPlatformColumn(Panel* super);
+
+void AvailableColumnsPanel_addDynamicColumns(Panel* super, Hashtable* dynamicColumns);
+
+Panel* AvailableColumnsPanel_get(void);
+
 #endif
diff --git a/DynamicScreen.c b/DynamicScreen.c
@@ -56,3 +56,7 @@ const char* DynamicScreen_lookup(Hashtable* dynamics, ht_key_t key) {
    const DynamicScreen* screen = Hashtable_get(dynamics, key);
    return screen ? screen->name : NULL;
 }
+
+void DynamicScreen_availableColumns(char* currentScreen) {
+   Platform_dynamicScreenAvailableColumns(currentScreen);
+}
diff --git a/DynamicScreen.h b/DynamicScreen.h
@@ -23,4 +23,6 @@ const char* DynamicScreen_lookup(Hashtable* dynamics, unsigned int key);
 
 bool DynamicScreen_search(Hashtable* dynamics, const char* name, unsigned int* key);
 
+void DynamicScreen_availableColumns(char* currentScreen);
+
 #endif
diff --git a/ScreensPanel.c b/ScreensPanel.c
@@ -12,7 +12,9 @@ in the source distribution for its full text.
 #include <ctype.h>
 #include <string.h>
 
+#include "AvailableColumnsPanel.h"
 #include "CRT.h"
+#include "DynamicScreen.h"
 #include "FunctionBar.h"
 #include "Hashtable.h"
 #include "ProvideCurses.h"
@@ -267,6 +269,14 @@ static HandlerResult ScreensPanel_eventHandlerNormal(Panel* super, int ch) {
    ScreenListItem* newFocus = (ScreenListItem*) Panel_getSelected(super);
    if (newFocus && oldFocus != newFocus) {
       ColumnsPanel_fill(this->columns, newFocus->ss, this->settings->dynamicColumns);
+      if (newFocus->ss->generic) {
+         char* currentScreen = newFocus->ss->name;
+         DynamicScreen_availableColumns(currentScreen);
+      } else {
+         Panel* availableColumns = AvailableColumnsPanel_get();
+         AvailableColumnsPanel_addPlatformColumn(availableColumns);
+         AvailableColumnsPanel_addDynamicColumns(availableColumns, this->settings->dynamicColumns);
+      }
       result = HANDLED;
    }
    if (shouldRebuildArray)
diff --git a/darwin/Platform.h b/darwin/Platform.h
@@ -132,4 +132,6 @@ static inline Hashtable* Platform_getDynamicScreens(void) { return NULL; }
 
 static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { return; }
 
+static inline void Platform_dynamicScreenAvailableColumns(ATTR_UNUSED char* currentScreen) { }
+
 #endif
diff --git a/dragonflybsd/Platform.h b/dragonflybsd/Platform.h
@@ -125,4 +125,6 @@ static inline Hashtable* Platform_getDynamicScreens(void) { return NULL; }
 
 static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { return; }
 
+static inline void Platform_dynamicScreenAvailableColumns(ATTR_UNUSED char* currentScreen) { }
+
 #endif
diff --git a/freebsd/Platform.h b/freebsd/Platform.h
@@ -125,4 +125,6 @@ static inline Hashtable* Platform_getDynamicScreens(void) { return NULL; }
 
 static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { return; }
 
+static inline void Platform_dynamicScreenAvailableColumns(ATTR_UNUSED char* currentScreen) { }
+
 #endif
diff --git a/linux/Platform.h b/linux/Platform.h
@@ -146,4 +146,6 @@ static inline Hashtable* Platform_getDynamicScreens(void) { return NULL; }
 
 static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { return; }
 
+static inline void Platform_dynamicScreenAvailableColumns(ATTR_UNUSED char* currentScreen) { }
+
 #endif
diff --git a/netbsd/Platform.h b/netbsd/Platform.h
@@ -129,4 +129,6 @@ static inline Hashtable* Platform_getDynamicScreens(void) { return NULL; }
 
 static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { return; }
 
+static inline void Platform_dynamicScreenAvailableColumns(ATTR_UNUSED char* currentScreen) { }
+
 #endif
diff --git a/openbsd/Platform.h b/openbsd/Platform.h
@@ -123,4 +123,6 @@ static inline Hashtable* Platform_getDynamicScreens(void) { return NULL; }
 
 static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { return; }
 
+static inline void Platform_dynamicScreenAvailableColumns(ATTR_UNUSED char* currentScreen) { }
+
 #endif
diff --git a/pcp/PCPDynamicScreen.c b/pcp/PCPDynamicScreen.c
@@ -21,6 +21,7 @@ in the source distribution for its full text.
 #include "Platform.h"
 #include "Settings.h"
 #include "XUtils.h"
+#include "AvailableColumnsPanel.h"
 
 #include "pcp/PCPDynamicColumn.h"
 
@@ -333,7 +334,7 @@ void PCPDynamicScreen_appendScreens(PCPDynamicScreens* screens, Settings* settin
       xAsprintf(&sortKey, "Dynamic(%s)", ds->super.sortKey);
 
       ScreenDefaults screen = {
-         .name    = ds->super.caption,
+         .name    = ds->super.name,
          .columns = columns,
          .sortKey = sortKey,
       };
@@ -347,3 +348,29 @@ void PCPDynamicScreen_appendScreens(PCPDynamicScreens* screens, Settings* settin
       free(columns);
    }
 }
+
+void PCPDynamicScreens_availableColumns(Hashtable* screens, char* currentScreen) {
+   Panel* availableColumns = AvailableColumnsPanel_get();
+   Vector_prune(availableColumns->items);
+
+   bool success;
+   unsigned int key;
+   success = DynamicScreen_search(screens, currentScreen, &key);
+   if (!success)
+      return;
+
+   PCPDynamicScreen* screen = Hashtable_get(screens, key);
+   if (!screen)
+      return;
+
+   for (unsigned int j = 0; j < screen->totalColumns; j++) {
+      PCPDynamicColumn* column = &screen->columns[j];
+      const char* title = column->super.caption ? column->super.caption : column->super.heading;
+      if (!title)
+         title = column->super.name;  // fallback to the only mandatory field
+
+      char description[256];
+      xSnprintf(description, sizeof(description), "%s - %s", title, column->super.description);
+      Panel_add(availableColumns, (Object*) ListItem_new(description, j));
+   }
+}
diff --git a/pcp/PCPDynamicScreen.h b/pcp/PCPDynamicScreen.h
@@ -34,4 +34,6 @@ void PCPDynamicScreens_done(Hashtable* table);
 
 void PCPDynamicScreen_appendScreens(PCPDynamicScreens* screens, Settings* settings);
 
+void PCPDynamicScreens_availableColumns(Hashtable* screens, char* currentScreen);
+
 #endif
diff --git a/pcp/Platform.c b/pcp/Platform.c
@@ -863,3 +863,7 @@ Hashtable* Platform_getDynamicScreens(void) {
 void Platform_dynamicScreensDone(Hashtable* screens) {
    PCPDynamicScreens_done(screens);
 }
+
+void Platform_dynamicScreenAvailableColumns(char* currentScreen) {
+   PCPDynamicScreens_availableColumns(pcp->screens.table, currentScreen);
+}
diff --git a/pcp/Platform.h b/pcp/Platform.h
@@ -164,4 +164,6 @@ Hashtable* Platform_getDynamicScreens(void);
 
 void Platform_dynamicScreensDone(Hashtable* screens);
 
+void Platform_dynamicScreenAvailableColumns(char* currentScreen);
+
 #endif
diff --git a/solaris/Platform.h b/solaris/Platform.h
@@ -164,4 +164,6 @@ static inline Hashtable* Platform_getDynamicScreens(void) { return NULL; }
 
 static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { return; }
 
+static inline void Platform_dynamicScreenAvailableColumns(ATTR_UNUSED char* currentScreen) { }
+
 #endif
diff --git a/unsupported/Platform.h b/unsupported/Platform.h
@@ -112,4 +112,6 @@ static inline Hashtable* Platform_getDynamicScreens(void) { return NULL; }
 
 static inline void Platform_dynamicScreensDone(ATTR_UNUSED Hashtable* screens) { return; }
 
+static inline void Platform_dynamicScreenAvailableColumns(ATTR_UNUSED char* currentScreen) { }
+
 #endif

Original file line number	Diff line number	Diff line change
`@@ -56,3 +56,7 @@ const char* DynamicScreen_lookup(Hashtable* dynamics, ht_key_t key) {`
`56`	`56`	`const DynamicScreen* screen = Hashtable_get(dynamics, key);`
`57`	`57`	`return screen ? screen->name : NULL;`
`58`	`58`	`}`
	`59`	`+`
	`60`	`+void DynamicScreen_availableColumns(char* currentScreen) {`
	`61`	`+ Platform_dynamicScreenAvailableColumns(currentScreen);`
	`62`	`+}`