FlexMeter: Add FlexMeter functionality

CRT.c

@@ -129,6 +129,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [FAILED_READ] = A_BOLD | ColorPair(Red, Black),
       [PAUSED] = A_BOLD | ColorPair(Yellow, Cyan),
       [UPTIME] = A_BOLD | ColorPair(Cyan, Black),
+      [FLEX] = A_BOLD | ColorPair(Cyan, Black),
       [BATTERY] = A_BOLD | ColorPair(Cyan, Black),
       [LARGE_NUMBER] = A_BOLD | ColorPair(Red, Black),
       [METER_SHADOW] = A_BOLD | ColorPairGrayBlack,
@@ -247,6 +248,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [FAILED_READ] = A_BOLD,
       [PAUSED] = A_BOLD | A_REVERSE,
       [UPTIME] = A_BOLD,
+      [FLEX] = A_BOLD,
       [BATTERY] = A_BOLD,
       [LARGE_NUMBER] = A_BOLD,
       [METER_SHADOW] = A_DIM,
@@ -365,6 +367,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [FAILED_READ] = ColorPair(Red, White),
       [PAUSED] = A_BOLD | ColorPair(Yellow, Cyan),
       [UPTIME] = ColorPair(Yellow, White),
+      [FLEX] = ColorPair(Yellow, White),
       [BATTERY] = ColorPair(Yellow, White),
       [LARGE_NUMBER] = ColorPair(Red, White),
       [METER_SHADOW] = ColorPair(Blue, White),
@@ -483,6 +486,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [FAILED_READ] = ColorPair(Red, Black),
       [PAUSED] = A_BOLD | ColorPair(Yellow, Cyan),
       [UPTIME] = ColorPair(Yellow, Black),
+      [FLEX] = ColorPair(Yellow, Black),
       [BATTERY] = ColorPair(Yellow, Black),
       [LARGE_NUMBER] = ColorPair(Red, Black),
       [METER_SHADOW] = A_BOLD | ColorPairGrayBlack,
@@ -601,6 +605,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [FAILED_READ] = A_BOLD | ColorPair(Red, Blue),
       [PAUSED] = A_BOLD | ColorPair(Yellow, Cyan),
       [UPTIME] = A_BOLD | ColorPair(Yellow, Blue),
+      [FLEX] = A_BOLD | ColorPair(Yellow, Blue),
       [BATTERY] = A_BOLD | ColorPair(Yellow, Blue),
       [LARGE_NUMBER] = A_BOLD | ColorPair(Red, Blue),
       [METER_SHADOW] = ColorPair(Cyan, Blue),
@@ -719,6 +724,7 @@ static int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
       [FAILED_READ] = A_BOLD | ColorPair(Red, Black),
       [PAUSED] = A_BOLD | ColorPair(Yellow, Green),
       [UPTIME] = ColorPair(Green, Black),
+      [FLEX] = ColorPair(Green, Black),
       [BATTERY] = ColorPair(Green, Black),
       [LARGE_NUMBER] = A_BOLD | ColorPair(Red, Black),
       [METER_SHADOW] = A_BOLD | ColorPairGrayBlack,

CRT.h

@@ -154,6 +154,7 @@ typedef enum ColorElements_ {
    DYNAMIC_MAGENTA,
    DYNAMIC_YELLOW,
    DYNAMIC_WHITE,
+   FLEX,
    LAST_COLORELEMENT
 } ColorElements;
 

FlexMeter.c

@@ -0,0 +1,217 @@
+/*
+htop - FlexMeter.c
+(C) 2024 Stoyan Bogdanov
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+
+#include <dirent.h>
+#include <pwd.h>
+#include <sys/time.h>
+#include <sys/types.h>
+#include <time.h>
+#include <unistd.h>
+
+#include "CRT.h"
+#include "config.h"
+#include "FlexMeter.h"
+#include "Object.h"
+
+
+#define FLEX_CFG_FOLDER ".config/htop/FlexMeter"
+
+typedef struct {
+   char* name;
+   char* command;
+   char* type;
+   char* caption;
+   char* uiName;
+} _flex_meter;
+
+_flex_meter meter_list[METERS_LIST_SIZE];
+
+static int meters_count = 0;
+
+static const int DateMeter_attributes[] = {
+   FLEX
+};
+
+MeterClass* FlexMeter_class = NULL;
+
+static int check_for_meters(void);
+
+static bool parse_input(_flex_meter *meter, char* line)
+{
+   switch(line[0])
+   {
+      case 'n':
+         if (String_startsWith(line, "name=")) {
+            xAsprintf(&meter->uiName, "Flex: %s", line + 5);
+         }
+         break;
+      case 'c':
+         if (String_startsWith(line, "command=")) {
+            meter->command = xStrdup(line + 8);
+         } else if (String_startsWith(line, "caption=")) {
+            meter->caption = xStrdup(line + 8);
+         }
+         break;
+      case 't':
+         if (String_startsWith(line, "type=")) {
+            meter->type = xStrdup(line + 6);
+         }
+         break;
+      default:
+         return false;
+   }
+
+   return true;
+}
+
+static bool load_config(_flex_meter *meter, char* file)
+{
+   bool ret = false;
+   FILE* fp = fopen(file, "r");
+
+   if (fp != NULL) {
+      char* buff;
+      while ((buff = String_readLine(fp)) != NULL) {
+         ret = parse_input(meter, buff);
+         if (!ret) {
+            break;
+         }
+      }
+      free(buff);
+      buff = NULL;
+   }
+
+   fclose(fp);
+   return ret;
+}
+
+static int check_for_meters(void)
+{
+   char* path;
+   struct dirent* dir;
+   struct passwd* pw = getpwuid(getuid());
+   const char* homedir = pw->pw_dir;
+   char* home = NULL;
+   bool ret;
+
+   const char* xdgConfigHome = getenv("XDG_CONFIG_HOME");
+   const char* homedirEnv = getenv("HOME");
+
+   if (xdgConfigHome) {
+      xAsprintf(&home, "%s/%s", xdgConfigHome, "htop/FlexMeter");
+   } else if (homedirEnv) {
+      xAsprintf(&home, "%s/%s", homedirEnv, FLEX_CFG_FOLDER);
+   } else {
+      xAsprintf(&home, "%s/%s", homedir, FLEX_CFG_FOLDER);
+   }
+
+   struct stat fileStat;
+
+   if (stat(home, &fileStat) < 0) {
+      return -1;
+   }
+
+   uint32_t uid = getuid();
+
+   if ((fileStat.st_uid == uid) && S_ISDIR(fileStat.st_mode) &&
+       ((fileStat.st_mode & 0777) == 0700)) {
+      DIR* d = opendir(home);
+      if (d) {
+         while ((dir = readdir(d)) != NULL) {
+            if ( dir->d_name[0] == '.') {
+               /* We are ignoring all files starting with . like ".Template"
+                * and "." ".." directories
+                */
+               continue;
+            }
+
+            meter_list[meters_count].name = xStrdup(dir->d_name);
+            xAsprintf(&path, "%s/%s", home, dir->d_name);
+
+            if (stat(path, &fileStat) < 0) {
+               return -1;
+            }
+
+            if ((fileStat.st_uid == uid) && ((fileStat.st_mode & 0777) == 0700)) {
+               ret = load_config(&meter_list[meters_count], path);
+
+               if (ret && (meters_count < MAX_METERS_COUNT)) {
+                  meters_count++;
+               }
+            }
+
+            free(path);
+            path=NULL;
+
+         }
+         closedir(d);
+      }
+   }
+
+   free(home);
+   home = NULL;
+
+   return meters_count;
+}
+
+static void FlexMeter_updateValues(Meter* this)
+{
+   for (size_t i = 0 ; i < (size_t)meters_count; i++) {
+      if (this->m_ptr == &FlexMeter_class[i] ) {
+         char* buff = NULL;
+         int ret = -1;
+         if (meter_list[i].command) {
+            FILE* fd = popen(meter_list[i].command, "r");
+            if (fd) {
+               buff = String_readLine(fd);
+               ret = pclose(fd);
+            }
+         }
+
+         if (buff && !ret) {
+            xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%s", buff);
+         } else {
+            // Once fail, free command pointer and every time print Error message
+            if (meter_list[i].command != NULL) {
+               free(meter_list[i].command);
+               meter_list[i].command = NULL;
+            }
+            xSnprintf(this->txtBuffer, sizeof(this->txtBuffer), "%s", "[ERR] Check command");
+         }
+      }
+   }
+}
+
+const MeterClass FlexMeter_class_template = {
+   .super = {
+      .extends = Class(Meter),
+      .delete = Meter_delete
+   },
+   .updateValues = FlexMeter_updateValues,
+   .defaultMode = TEXT_METERMODE,
+   .maxItems = 1,
+   .total = 100,
+   .attributes = DateMeter_attributes,
+   .name = NULL,
+   .uiName = NULL,
+   .caption = NULL,
+};
+
+int load_flex_modules(void)
+{
+   size_t meters_num = check_for_meters();
+   if (!FlexMeter_class && meters_num > 0) {
+      FlexMeter_class = (MeterClass*) xCalloc(meters_num, sizeof(MeterClass));
+      for (size_t i = 0 ; i < meters_num; i++) {
+         memcpy(&FlexMeter_class[i], &FlexMeter_class_template, sizeof(MeterClass));
+         FlexMeter_class[i].name = (const char*) xStrdup(meter_list[i].name);
+         FlexMeter_class[i].uiName = (const char*) xStrdup(meter_list[i].uiName);
+         FlexMeter_class[i].caption = (const char*) xStrdup(meter_list[i].caption);
+      }
+   }
+   return meters_num;
+}

FlexMeter.h

@@ -0,0 +1,22 @@
+#ifndef HEADER_FlexMeter
+#define HEADER_FlexMeter
+/*
+htop - FlexMeter.c
+(C) 2024 Stoyan Bogdanov
+Released under the GNU GPLv2+, see the COPYING file
+in the source distribution for its full text.
+*/
+#include <stdbool.h>
+
+#include "Meter.h"
+
+
+#define METERS_LIST_SIZE 30
+
+#define MAX_METERS_COUNT METERS_LIST_SIZE-1
+
+extern MeterClass *FlexMeter_class ;
+
+int load_flex_modules(void);
+
+#endif

Header.c

@@ -20,14 +20,14 @@ in the source distribution for its full text.
 #include "CRT.h"
 #include "CPUMeter.h"
 #include "DynamicMeter.h"
+#include "FlexMeter.h"
 #include "Macros.h"
 #include "Object.h"
 #include "Platform.h"
 #include "ProvideCurses.h"
 #include "Settings.h"
 #include "XUtils.h"
 
-
 Header* Header_new(Machine* host, HeaderLayout hLayout) {
    Header* this = xCalloc(1, sizeof(Header));
    this->columns = xMallocArray(HeaderLayout_getColumns(hLayout), sizeof(Vector*));
@@ -121,6 +121,14 @@ void Header_populateFromSettings(Header* this) {
    const Settings* settings = this->host->settings;
    Header_setLayout(this, settings->hLayout);
 
+   int num = load_flex_modules();
+   int platform_size = 0;
+
+   for (platform_size = 0; Platform_meterTypes[platform_size] != NULL; platform_size++);
+   for (int i = 0; i < num; i++) Platform_meterTypes[platform_size+i]=FlexMeter_class+i;
+
+   Platform_meterTypes[platform_size+num]=NULL;
+
    Header_forEachColumn(this, col) {
       const MeterColumnSetting* colSettings = &settings->hColumns[col];
       Vector_prune(this->columns[col]);

Makefile.am

@@ -52,6 +52,7 @@ myhtopsources = \
 	DynamicScreen.c \
 	EnvScreen.c \
 	FileDescriptorMeter.c \
+	FlexMeter.c \
 	FunctionBar.c \
 	Hashtable.c \
 	Header.c \
@@ -93,6 +94,7 @@ myhtopsources = \
 	Vector.c \
 	XUtils.c
 
+
 myhtopheaders = \
 	Action.h \
 	Affinity.h \
@@ -118,6 +120,7 @@ myhtopheaders = \
 	DynamicScreen.h \
 	EnvScreen.h \
 	FileDescriptorMeter.h \
+	FlexMeter.h \
 	FunctionBar.h \
 	Hashtable.h \
 	Header.h \
@@ -165,6 +168,7 @@ myhtopheaders = \
 	Vector.h \
 	XUtils.h
 
+
 # Linux
 # -----
 

Meter.c

@@ -377,6 +377,7 @@ Meter* Meter_new(const Machine* host, unsigned int param, const MeterClass* type
    this->values = type->maxItems ? xCalloc(type->maxItems, sizeof(double)) : NULL;
    this->total = type->total;
    this->caption = xStrdup(type->caption);
+   this->m_ptr = type;
    if (Meter_initFn(this)) {
       Meter_init(this);
    }

Meter.h

@@ -67,9 +67,9 @@ typedef struct MeterClass_ {
    const MeterModeId defaultMode;
    const double total;
    const int* const attributes;
-   const char* const name;                 /* internal name of the meter, must not contain any space */
-   const char* const uiName;               /* display name in header setup menu */
-   const char* const caption;              /* prefix in the actual header */
+   const char* name;                 /* internal name of the meter, must not contain any space */
+   const char* uiName;               /* display name in header setup menu */
+   const char* caption;              /* prefix in the actual header */
    const char* const description;          /* optional meter description in header setup menu */
    const uint8_t maxItems;
    const bool isMultiColumn;               /* whether the meter draws multiple sub-columns (defaults to false) */
@@ -102,8 +102,9 @@ typedef struct GraphData_ {
 struct Meter_ {
    Object super;
    Meter_Draw draw;
-   const Machine* host;
 
+   const Machine* host;
+   const MeterClass* m_ptr;
    char* caption;
    MeterModeId mode;
    unsigned int param;

configure.ac

@@ -25,6 +25,7 @@ AM_INIT_AUTOMAKE([-Wall std-options subdir-objects])
 
 # ----------------------------------------------------------------------
 
+AC_DEFINE([MAX_PLATFORM_METERS], [100], [Set max meters for number])
 
 # ----------------------------------------------------------------------
 # Checks for platform.