Skip to content

Commit 0077534

Browse files
thewtexthewtex
authored
Merge pull request #72 from blackheaven/master
More consistent CPU load colors and lower memory usage threshold
2 parents b6afa5c + 1ac6729 commit 0077534

File tree

2 files changed

+75
-72
lines changed

2 files changed

+75
-72
lines changed

‎common/luts.h‎

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,80 @@ static const char cpu_percentage_lut[][32] = {
55
"#[fg=brightwhite,bg=colour16]",
66
"#[fg=brightwhite,bg=colour16]",
77
"#[fg=brightwhite,bg=colour16]",
8+
"#[fg=brightwhite,bg=colour16]",
9+
"#[fg=brightwhite,bg=colour16]",
10+
"#[fg=brightwhite,bg=colour16]",
11+
"#[fg=brightwhite,bg=colour16]",
12+
"#[fg=brightwhite,bg=colour17]",
13+
"#[fg=brightwhite,bg=colour17]",
14+
"#[fg=brightwhite,bg=colour17]",
15+
"#[fg=brightwhite,bg=colour17]",
16+
"#[fg=brightwhite,bg=colour17]",
17+
"#[fg=brightwhite,bg=colour17]",
18+
"#[fg=brightwhite,bg=colour17]",
19+
"#[fg=brightwhite,bg=colour17]",
20+
"#[fg=brightwhite,bg=colour18]",
21+
"#[fg=brightwhite,bg=colour18]",
22+
"#[fg=brightwhite,bg=colour18]",
23+
"#[fg=brightwhite,bg=colour18]",
24+
"#[fg=brightwhite,bg=colour18]",
25+
"#[fg=brightwhite,bg=colour18]",
26+
"#[fg=brightwhite,bg=colour18]",
27+
"#[fg=brightwhite,bg=colour19]",
28+
"#[fg=brightwhite,bg=colour19]",
29+
"#[fg=brightwhite,bg=colour19]",
30+
"#[fg=brightwhite,bg=colour19]",
31+
"#[fg=brightwhite,bg=colour19]",
32+
"#[fg=brightwhite,bg=colour19]",
33+
"#[fg=brightwhite,bg=colour20]",
34+
"#[fg=brightwhite,bg=colour20]",
35+
"#[fg=brightwhite,bg=colour20]",
36+
"#[fg=brightwhite,bg=colour20]",
37+
"#[fg=brightwhite,bg=colour20]",
38+
"#[fg=brightwhite,bg=colour20]",
39+
"#[fg=brightwhite,bg=colour20]",
40+
"#[fg=brightwhite,bg=colour21]",
41+
"#[fg=brightwhite,bg=colour21]",
42+
"#[fg=brightwhite,bg=colour21]",
43+
"#[fg=brightwhite,bg=colour21]",
44+
"#[fg=brightwhite,bg=colour21]",
45+
"#[fg=brightwhite,bg=colour21]",
46+
"#[fg=brightwhite,bg=colour57]",
47+
"#[fg=brightwhite,bg=colour57]",
48+
"#[fg=brightwhite,bg=colour57]",
49+
"#[fg=brightwhite,bg=colour57]",
50+
"#[fg=brightwhite,bg=colour57]",
51+
"#[fg=brightwhite,bg=colour57]",
52+
"#[fg=brightwhite,bg=colour56]",
53+
"#[fg=brightwhite,bg=colour56]",
54+
"#[fg=brightwhite,bg=colour56]",
55+
"#[fg=brightwhite,bg=colour56]",
56+
"#[fg=brightwhite,bg=colour56]",
57+
"#[fg=brightwhite,bg=colour56]",
58+
"#[fg=brightwhite,bg=colour55]",
59+
"#[fg=brightwhite,bg=colour55]",
60+
"#[fg=brightwhite,bg=colour55]",
61+
"#[fg=brightwhite,bg=colour55]",
62+
"#[fg=brightwhite,bg=colour55]",
63+
"#[fg=brightwhite,bg=colour55]",
64+
"#[fg=brightwhite,bg=colour54]",
65+
"#[fg=brightwhite,bg=colour54]",
66+
"#[fg=brightwhite,bg=colour54]",
67+
"#[fg=brightwhite,bg=colour54]",
68+
"#[fg=brightwhite,bg=colour54]",
69+
"#[fg=brightwhite,bg=colour54]",
70+
"#[fg=brightwhite,bg=colour53]",
71+
"#[fg=brightwhite,bg=colour53]",
72+
"#[fg=brightwhite,bg=colour53]",
73+
"#[fg=brightwhite,bg=colour53]",
74+
"#[fg=brightwhite,bg=colour53]",
75+
"#[fg=brightwhite,bg=colour53]",
876
"#[fg=brightwhite,bg=colour52]",
977
"#[fg=brightwhite,bg=colour52]",
1078
"#[fg=brightwhite,bg=colour52]",
1179
"#[fg=brightwhite,bg=colour52]",
1280
"#[fg=brightwhite,bg=colour52]",
1381
"#[fg=brightwhite,bg=colour52]",
14-
"#[fg=brightwhite,bg=colour52]",
15-
"#[fg=brightwhite,bg=colour52]",
16-
"#[fg=brightwhite,bg=colour88]",
1782
"#[fg=brightwhite,bg=colour88]",
1883
"#[fg=brightwhite,bg=colour88]",
1984
"#[fg=brightwhite,bg=colour88]",
@@ -26,83 +91,18 @@ static const char cpu_percentage_lut[][32] = {
2691
"#[fg=brightwhite,bg=colour124]",
2792
"#[fg=brightwhite,bg=colour124]",
2893
"#[fg=brightwhite,bg=colour124]",
29-
"#[fg=brightwhite,bg=colour124]",
30-
"#[fg=brightwhite,bg=colour160]",
3194
"#[fg=brightwhite,bg=colour160]",
3295
"#[fg=brightwhite,bg=colour160]",
3396
"#[fg=brightwhite,bg=colour160]",
3497
"#[fg=brightwhite,bg=colour160]",
3598
"#[fg=brightwhite,bg=colour160]",
3699
"#[fg=brightwhite,bg=colour160]",
37-
"#[fg=brightwhite,bg=colour160]",
38-
"#[fg=brightwhite,bg=colour196]",
39-
"#[fg=brightwhite,bg=colour196]",
40-
"#[fg=brightwhite,bg=colour196]",
41100
"#[fg=brightwhite,bg=colour196]",
42101
"#[fg=brightwhite,bg=colour196]",
43102
"#[fg=brightwhite,bg=colour196]",
44103
"#[fg=brightwhite,bg=colour196]",
45104
"#[fg=brightwhite,bg=colour196]",
46-
"#[fg=brightwhite,bg=colour202]",
47-
"#[fg=brightwhite,bg=colour202]",
48-
"#[fg=brightwhite,bg=colour202]",
49-
"#[fg=brightwhite,bg=colour202]",
50-
"#[fg=brightwhite,bg=colour202]",
51-
"#[fg=brightwhite,bg=colour202]",
52-
"#[fg=brightwhite,bg=colour202]",
53-
"#[fg=brightwhite,bg=colour202]",
54-
"#[fg=brightwhite,bg=colour208]",
55-
"#[fg=black,bg=colour208]",
56-
"#[fg=black,bg=colour208]",
57-
"#[fg=black,bg=colour208]",
58-
"#[fg=black,bg=colour208]",
59-
"#[fg=black,bg=colour208]",
60-
"#[fg=black,bg=colour208]",
61-
"#[fg=black,bg=colour214]",
62-
"#[fg=black,bg=colour214]",
63-
"#[fg=black,bg=colour214]",
64-
"#[fg=black,bg=colour214]",
65-
"#[fg=black,bg=colour214]",
66-
"#[fg=black,bg=colour214]",
67-
"#[fg=black,bg=colour214]",
68-
"#[fg=black,bg=colour214]",
69-
"#[fg=black,bg=colour220]",
70-
"#[fg=black,bg=colour220]",
71-
"#[fg=black,bg=colour220]",
72-
"#[fg=black,bg=colour220]",
73-
"#[fg=black,bg=colour220]",
74-
"#[fg=black,bg=colour220]",
75-
"#[fg=black,bg=colour220]",
76-
"#[fg=black,bg=colour226]",
77-
"#[fg=black,bg=colour226]",
78-
"#[fg=black,bg=colour226]",
79-
"#[fg=black,bg=colour226]",
80-
"#[fg=black,bg=colour226]",
81-
"#[fg=black,bg=colour226]",
82-
"#[fg=black,bg=colour227]",
83-
"#[fg=black,bg=colour227]",
84-
"#[fg=black,bg=colour227]",
85-
"#[fg=black,bg=colour227]",
86-
"#[fg=black,bg=colour227]",
87-
"#[fg=black,bg=colour227]",
88-
"#[fg=black,bg=colour228]",
89-
"#[fg=black,bg=colour228]",
90-
"#[fg=black,bg=colour228]",
91-
"#[fg=black,bg=colour228]",
92-
"#[fg=black,bg=colour228]",
93-
"#[fg=black,bg=colour229]",
94-
"#[fg=black,bg=colour229]",
95-
"#[fg=black,bg=colour229]",
96-
"#[fg=black,bg=colour229]",
97-
"#[fg=black,bg=colour229]",
98-
"#[fg=black,bg=colour230]",
99-
"#[fg=black,bg=colour230]",
100-
"#[fg=black,bg=colour230]",
101-
"#[fg=black,bg=colour230]",
102-
"#[fg=black,bg=colour230]",
103-
"#[fg=black,bg=colour231]",
104-
"#[fg=black,bg=colour231]",
105-
"#[fg=black,bg=colour231]"
105+
"#[fg=brightwhite,bg=colour196]"
106106
}; // end cpu_percentage_lut
107107

108108
static const char mem_lut[][32] = {

‎common/memory.cc‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,12 @@ std::string mem_string( const MemoryStatus & mem_status,
8484
break;
8585
}
8686
default: // Default mode, just show the used/total memory in MB
87-
if(mem_status.used_mem>100000 && mem_status.total_mem>100000) oss<<static_cast<unsigned int>(mem_status.used_mem/1024)<<"/"<<static_cast<unsigned int>(mem_status.total_mem/1024)<<"GB";
88-
else if(mem_status.used_mem<100000 && mem_status.total_mem>100000) oss<<static_cast<unsigned int>(mem_status.used_mem)<<"MB/"<<static_cast<unsigned int>(mem_status.total_mem/1024)<<"GB";
89-
else oss<<static_cast<unsigned int>(mem_status.used_mem)<<"/"<<static_cast<unsigned int>(mem_status.total_mem)<<"MB";
87+
if(mem_status.used_mem>10000 && mem_status.total_mem>10000)
88+
oss<<static_cast<unsigned int>(mem_status.used_mem/1024)<<"/"<<static_cast<unsigned int>(mem_status.total_mem/1024)<<"GB";
89+
else if(mem_status.used_mem<10000 && mem_status.total_mem>10000)
90+
oss<<static_cast<unsigned int>(mem_status.used_mem)<<"MB/"<<static_cast<unsigned int>(mem_status.total_mem/1024)<<"GB";
91+
else
92+
oss<<static_cast<unsigned int>(mem_status.used_mem)<<"/"<<static_cast<unsigned int>(mem_status.total_mem)<<"MB";
9093
}
9194

9295
if( use_colors )

0 commit comments

Comments
 (0)