mirror/btop
1
0
Fork 0
mirror of https://github.com/aristocratos/btop.git synced 2025-12-23 22:29:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix process arguments appearing outside proc box by replacing ASCII control codes with blankspace, issue #1080

Browse Source
This commit is contained in:
aristocratos
2025-05-01 21:59:49 +02:00
parent f46a133a0c
commit f1482fe87e
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/btop_draw.cpp
View File

@@ -1658,10 +1658,11 @@ namespace Proc {
out += Mv::to(d_y + 5 + i++, d_x + 1) + l;
out += Theme::c("main_fg") + Fx::ub;
const int cmd_size = ulen(detailed.entry.cmd, true);
const auto san_cmd = replace_ascii_control(detailed.entry.cmd);
const int cmd_size = ulen(san_cmd, true);
for (int num_lines = min(3, (int)ceil((double)cmd_size / (d_width - 5))), i = 0; i < num_lines; i++) {
out += Mv::to(d_y + 5 + (num_lines == 1 ? 1 : i), d_x + 3)
+ cjust(luresize(detailed.entry.cmd, cmd_size - (d_width - 5) * i, true), d_width - 5, true, true);
+ cjust(luresize(san_cmd, cmd_size - (d_width - 5) * i, true), d_width - 5, true, true);
}
}
@@ -1855,14 +1856,16 @@ namespace Proc {
}
}
if (not p_wide_cmd.contains(p.pid)) p_wide_cmd[p.pid] = ulen(p.cmd) != ulen(p.cmd, true);
const auto san_cmd = replace_ascii_control(p.cmd);
if (not p_wide_cmd.contains(p.pid)) p_wide_cmd[p.pid] = ulen(san_cmd) != ulen(san_cmd, true);
//? Normal view line
if (not proc_tree) {
out += Mv::to(y+2+lc, x+1)
+ g_color + rjust(to_string(p.pid), 8) + ' '
+ c_color + ljust(p.name, prog_size, true) + ' ' + end
+ (cmd_size > 0 ? g_color + ljust(p.cmd, cmd_size, true, p_wide_cmd[p.pid]) + Mv::to(y+2+lc, x+11+prog_size+cmd_size) + ' ' : "");
+ (cmd_size > 0 ? g_color + ljust(san_cmd, cmd_size, true, p_wide_cmd[p.pid]) + Mv::to(y+2+lc, x+11+prog_size+cmd_size) + ' ' : "");
}
//? Tree view line
else {
@@ -1875,7 +1878,7 @@ namespace Proc {
width_left -= (ulen(p.name) + 1);
}
if (width_left > 7) {
const string_view cmd = width_left > 40 ? rtrim(p.cmd) : p.short_cmd;
const string_view cmd = width_left > 40 ? rtrim(san_cmd) : p.short_cmd;
if (not cmd.empty() and cmd != p.name) {
out += g_color + '(' + uresize(string{cmd}, width_left - 3, p_wide_cmd[p.pid]) + ") ";
width_left -= (ulen(string{cmd}, true) + 3);

6
src/btop_tools.hpp
View File

@@ -224,6 +224,12 @@ namespace Tools {
//* Replace <from> in <str> with <to> and return new string
string s_replace(const string& str, const string& from, const string& to);
//* Replace ascii control characters with <replacement> in <str> and return new string
inline string replace_ascii_control(string str, const char replacement = ' ') {
std::ranges::for_each(str, [&replacement](char& c) { if (c < 0x20) c = replacement; });
return str;
}
//* Capitalize <str>
inline string capitalize(string str) {
str.at(0) = toupper(str.at(0));