CodeMirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2024-05-29 16:50:20 +12:00
Code Issues Projects Releases Wiki Activity

Merge branch 'main' into cpu-model

Browse source
This commit is contained in:
Jakob P. Liljenberg 2023-12-12 21:47:01 +01:00 committed by GitHub
parent 8096433736 14e664e756
commit b6a86962e2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/btop_draw.cpp
View file

@ -2063,7 +2063,11 @@ namespace Draw {
box = createBox(x, y, width, height, Theme::c("cpu_box"), true, (cpu_bottom ? "" : "cpu"), (cpu_bottom ? "cpu" : ""), 1); box = createBox(x, y, width, height, Theme::c("cpu_box"), true, (cpu_bottom ? "" : "cpu"), (cpu_bottom ? "cpu" : ""), 1);
auto& custom = Config::getS("custom_cpu_name"); auto& custom = Config::getS("custom_cpu_name");
const string cpu_title = uresize((custom.empty() ? Cpu::cpuName : custom) , b_width - 14); static const bool hasCpuHz = not Cpu::get_cpuHz().empty();
const string cpu_title = uresize(
(custom.empty() ? Cpu::cpuName : custom),
b_width - (Config::getB("show_cpu_freq") and hasCpuHz ? 14 : 4)
);
box += createBox(b_x, b_y, b_width, b_height, "", false, cpu_title); box += createBox(b_x, b_y, b_width, b_height, "", false, cpu_title);
} }

2
src/btop_shared.hpp
View file

@ -210,6 +210,8 @@ namespace Cpu {
auto get_core_mapping() -> unordered_flat_map<int, int>; auto get_core_mapping() -> unordered_flat_map<int, int>;
extern unordered_flat_map<int, int> core_mapping; extern unordered_flat_map<int, int> core_mapping;
auto get_cpuHz() -> string;
//* Get battery info from /sys //* Get battery info from /sys
auto get_battery() -> tuple<int, long, string>; auto get_battery() -> tuple<int, long, string>;
} }

2
src/osx/btop_collect.cpp
View file

@ -236,7 +236,7 @@ namespace Cpu {
name += n + ' '; name += n + ' ';
} }
name.pop_back(); name.pop_back();
for (const auto& replace : {"Processor", "CPU", "(R)", "(TM)", "Intel", "AMD", "Core"}) { for (const auto& replace : {"Processor", "CPU", "(R)", "(TM)", "Intel", "AMD", "Apple", "Core"}) {
name = s_replace(name, replace, ""); name = s_replace(name, replace, "");
name = s_replace(name, " ", " "); name = s_replace(name, " ", " ");
} }