summarylogtreecommitdiffstats
path: root/htop-temperature.patch
diff options
context:
space:
mode:
authorDX372020-08-31 14:19:32 +0700
committerDX372020-08-31 14:19:32 +0700
commit3af40809f95524c24bd7b8cab61473d2213bfdfc (patch)
tree2f8aa52738828840fcd7da0aeac2086e51210627 /htop-temperature.patch
parent524b31097164b6e32623cd661fb879fb54f80ab1 (diff)
downloadaur-3af40809f95524c24bd7b8cab61473d2213bfdfc.tar.gz
3.0.0
Diffstat (limited to 'htop-temperature.patch')
-rw-r--r--htop-temperature.patch79
1 files changed, 39 insertions, 40 deletions
diff --git a/htop-temperature.patch b/htop-temperature.patch
index e57f326c7ce..a96f90fb6a4 100644
--- a/htop-temperature.patch
+++ b/htop-temperature.patch
@@ -1,8 +1,8 @@
diff --git a/CRT.c b/CRT.c
-index 0d51698..4eab74d 100644
+index 869573e..e6b8a75 100644
--- a/CRT.c
+++ b/CRT.c
-@@ -78,6 +78,9 @@ typedef enum ColorElements_ {
+@@ -101,6 +101,9 @@ typedef enum ColorElements_ {
UPTIME,
BATTERY,
TASKS_RUNNING,
@@ -12,7 +12,7 @@ index 0d51698..4eab74d 100644
SWAP,
PROCESS,
PROCESS_SHADOW,
-@@ -182,6 +185,9 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -240,6 +243,9 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
[METER_VALUE] = A_BOLD | ColorPair(Cyan,Black),
[LED_COLOR] = ColorPair(Green,Black),
[TASKS_RUNNING] = A_BOLD | ColorPair(Green,Black),
@@ -20,9 +20,9 @@ index 0d51698..4eab74d 100644
+ [TEMPERATURE_MEDIUM] = A_NORMAL | ColorPair(Yellow,Black),
+ [TEMPERATURE_HOT] = A_BOLD | ColorPair(Red,Black),
[PROCESS] = A_NORMAL,
- [PROCESS_SHADOW] = A_BOLD | ColorPair(Black,Black),
+ [PROCESS_SHADOW] = A_BOLD | ColorPairGrayBlack,
[PROCESS_TAG] = A_BOLD | ColorPair(Yellow,Black),
-@@ -241,6 +247,9 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -308,6 +314,9 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
[METER_VALUE] = A_BOLD,
[LED_COLOR] = A_NORMAL,
[TASKS_RUNNING] = A_BOLD,
@@ -32,7 +32,7 @@ index 0d51698..4eab74d 100644
[PROCESS] = A_NORMAL,
[PROCESS_SHADOW] = A_DIM,
[PROCESS_TAG] = A_BOLD,
-@@ -300,6 +309,9 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -376,6 +385,9 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
[METER_VALUE] = ColorPair(Black,White),
[LED_COLOR] = ColorPair(Green,White),
[TASKS_RUNNING] = ColorPair(Green,White),
@@ -42,7 +42,7 @@ index 0d51698..4eab74d 100644
[PROCESS] = ColorPair(Black,White),
[PROCESS_SHADOW] = A_BOLD | ColorPair(Black,White),
[PROCESS_TAG] = ColorPair(White,Blue),
-@@ -359,6 +371,9 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -444,6 +456,9 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
[METER_VALUE] = ColorPair(Black,Black),
[LED_COLOR] = ColorPair(Green,Black),
[TASKS_RUNNING] = ColorPair(Green,Black),
@@ -50,9 +50,9 @@ index 0d51698..4eab74d 100644
+ [TEMPERATURE_MEDIUM] = ColorPair(Yellow,Black),
+ [TEMPERATURE_HOT] = ColorPair(Red,Black),
[PROCESS] = ColorPair(Black,Black),
- [PROCESS_SHADOW] = A_BOLD | ColorPair(Black,Black),
+ [PROCESS_SHADOW] = A_BOLD | ColorPairGrayBlack,
[PROCESS_TAG] = ColorPair(White,Blue),
-@@ -418,6 +433,9 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -512,6 +527,9 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
[METER_VALUE] = A_BOLD | ColorPair(Cyan,Blue),
[LED_COLOR] = ColorPair(Green,Blue),
[TASKS_RUNNING] = A_BOLD | ColorPair(Green,Blue),
@@ -62,7 +62,7 @@ index 0d51698..4eab74d 100644
[PROCESS] = ColorPair(White,Blue),
[PROCESS_SHADOW] = A_BOLD | ColorPair(Black,Blue),
[PROCESS_TAG] = A_BOLD | ColorPair(Yellow,Blue),
-@@ -477,6 +495,9 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
+@@ -580,6 +598,9 @@ int CRT_colorSchemes[LAST_COLORSCHEME][LAST_COLORELEMENT] = {
[METER_VALUE] = ColorPair(Green,Black),
[LED_COLOR] = ColorPair(Green,Black),
[TASKS_RUNNING] = A_BOLD | ColorPair(Green,Black),
@@ -70,13 +70,13 @@ index 0d51698..4eab74d 100644
+ [TEMPERATURE_MEDIUM] = A_NORMAL | ColorPair(Yellow,Black),
+ [TEMPERATURE_HOT] = A_BOLD | ColorPair(Red,Black),
[PROCESS] = ColorPair(Cyan,Black),
- [PROCESS_SHADOW] = A_BOLD | ColorPair(Black,Black),
+ [PROCESS_SHADOW] = A_BOLD | ColorPairGrayBlack,
[PROCESS_TAG] = A_BOLD | ColorPair(Yellow,Black),
diff --git a/CRT.h b/CRT.h
-index fb82413..bda5318 100644
+index 5fb2f09..fc40b2a 100644
--- a/CRT.h
+++ b/CRT.h
-@@ -68,6 +68,9 @@ typedef enum ColorElements_ {
+@@ -89,6 +89,9 @@ typedef enum ColorElements_ {
UPTIME,
BATTERY,
TASKS_RUNNING,
@@ -217,19 +217,40 @@ index 0000000..b86ddd8
+extern MeterClass TemperatureMeter_class;
+
+#endif
+diff --git a/Makefile.am b/Makefile.am
+index d455b4d..2f6dd75 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -49,6 +49,7 @@ linux_platform_headers = \
+ linux/LinuxProcessList.h \
+ linux/LinuxCRT.h \
+ linux/Battery.h \
++ TemperatureMeter.h \
+ linux/PressureStallMeter.h \
+ zfs/ZfsArcMeter.h \
+ zfs/ZfsCompressedArcMeter.h \
+@@ -59,7 +60,7 @@ all_platform_headers += $(linux_platform_headers)
+ if HTOP_LINUX
+ AM_LDFLAGS += -rdynamic
+ myhtopplatsources = linux/Platform.c linux/IOPriorityPanel.c linux/IOPriority.c \
+-linux/LinuxProcess.c linux/LinuxProcessList.c linux/LinuxCRT.c linux/Battery.c \
++linux/LinuxProcess.c linux/LinuxProcessList.c linux/LinuxCRT.c linux/Battery.c TemperatureMeter.c \
+ linux/PressureStallMeter.c \
+ zfs/ZfsArcMeter.c zfs/ZfsCompressedArcMeter.c zfs/ZfsArcStats.c
+
diff --git a/linux/Platform.c b/linux/Platform.c
-index de7bb84..a8e8a6f 100644
+index 0f59fed..49038b2 100644
--- a/linux/Platform.c
+++ b/linux/Platform.c
-@@ -22,6 +22,7 @@ in the source distribution for its full text.
- #include "ClockMeter.h"
- #include "HostnameMeter.h"
+@@ -25,6 +25,7 @@ in the source distribution for its full text.
+ #include "zfs/ZfsArcMeter.h"
+ #include "zfs/ZfsCompressedArcMeter.h"
#include "LinuxProcess.h"
+#include "TemperatureMeter.h"
#include <math.h>
#include <assert.h>
-@@ -116,6 +117,7 @@ MeterClass* Platform_meterTypes[] = {
+@@ -119,6 +120,7 @@ MeterClass* Platform_meterTypes[] = {
&MemoryMeter_class,
&SwapMeter_class,
&TasksMeter_class,
@@ -237,25 +258,3 @@ index de7bb84..a8e8a6f 100644
&UptimeMeter_class,
&BatteryMeter_class,
&HostnameMeter_class,
-diff --git a/Makefile.am b/Makefile.am
-index cd5209c..c700e34 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -48,14 +48,15 @@ linux_platform_headers = \
- linux/LinuxProcess.h \
- linux/LinuxProcessList.h \
- linux/LinuxCRT.h \
-- linux/Battery.h
-+ linux/Battery.h \
-+ TemperatureMeter.h
-
- all_platform_headers += $(linux_platform_headers)
-
- if HTOP_LINUX
- AM_CFLAGS += -rdynamic
- myhtopplatsources = linux/Platform.c linux/IOPriorityPanel.c linux/IOPriority.c \
--linux/LinuxProcess.c linux/LinuxProcessList.c linux/LinuxCRT.c linux/Battery.c
-+linux/LinuxProcess.c linux/LinuxProcessList.c linux/LinuxCRT.c linux/Battery.c TemperatureMeter.c
-
- myhtopplatheaders = $(linux_platform_headers)
- endif