Restrict supported modes for text-only meters

Limit display to Text mode only for: * BlankMeter * HostnameMeter * SELinuxMeter (Linux) * SysArchMeter * SystemdMeter (Linux) Co-authored-by: Benny Baumann <[email protected]> Co-authored-by: Kang-Che Sung <[email protected]>
htop-dev · May 22, 2024 · b131dd8 · b131dd8
1 parent 1723ed7
commit b131dd8
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 6 deletions.
diff --git a/HostnameMeter.c b/HostnameMeter.c
@@ -29,8 +29,9 @@ const MeterClass HostnameMeter_class = {
    },
    .updateValues = HostnameMeter_updateValues,
    .defaultMode = TEXT_METERMODE,
+   .supportedModes = (1 << TEXT_METERMODE),
    .maxItems = 0,
-   .total = 100.0,
+   .total = 0.0,
    .attributes = HostnameMeter_attributes,
    .name = "Hostname",
    .uiName = "Hostname",

diff --git a/Meter.c b/Meter.c
@@ -535,8 +535,9 @@ const MeterClass BlankMeter_class = {
    },
    .updateValues = BlankMeter_updateValues,
    .defaultMode = TEXT_METERMODE,
+   .supportedModes = (1 << TEXT_METERMODE),
    .maxItems = 0,
-   .total = 100.0,
+   .total = 0.0,
    .attributes = BlankMeter_attributes,
    .name = "Blank",
    .uiName = "Blank",

diff --git a/SysArchMeter.c b/SysArchMeter.c
@@ -35,8 +35,9 @@ const MeterClass SysArchMeter_class = {
    },
    .updateValues = SysArchMeter_updateValues,
    .defaultMode = TEXT_METERMODE,
+   .supportedModes = (1 << TEXT_METERMODE),
    .maxItems = 0,
-   .total = 100.0,
+   .total = 0.0,
    .attributes = SysArchMeter_attributes,
    .name = "System",
    .uiName = "System",

diff --git a/linux/SELinuxMeter.c b/linux/SELinuxMeter.c
@@ -85,8 +85,9 @@ const MeterClass SELinuxMeter_class = {
    },
    .updateValues = SELinuxMeter_updateValues,
    .defaultMode = TEXT_METERMODE,
+   .supportedModes = (1 << TEXT_METERMODE),
    .maxItems = 0,
-   .total = 100.0,
+   .total = 0.0,
    .attributes = SELinuxMeter_attributes,
    .name = "SELinux",
    .uiName = "SELinux",

diff --git a/linux/SystemdMeter.c b/linux/SystemdMeter.c
@@ -408,8 +408,9 @@ const MeterClass SystemdMeter_class = {
    .updateValues = SystemdMeter_updateValues,
    .done = SystemdMeter_done,
    .defaultMode = TEXT_METERMODE,
+   .supportedModes = (1 << TEXT_METERMODE),
    .maxItems = 0,
-   .total = 100.0,
+   .total = 0.0,
    .attributes = SystemdMeter_attributes,
    .name = "Systemd",
    .uiName = "Systemd state",
@@ -426,8 +427,9 @@ const MeterClass SystemdUserMeter_class = {
    .updateValues = SystemdMeter_updateValues,
    .done = SystemdMeter_done,
    .defaultMode = TEXT_METERMODE,
+   .supportedModes = (1 << TEXT_METERMODE),
    .maxItems = 0,
-   .total = 100.0,
+   .total = 0.0,
    .attributes = SystemdMeter_attributes,
    .name = "SystemdUser",
    .uiName = "Systemd user state",