zeldon
/
htop
mirror of https://github.com/xzeldon/htop.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Reduce visual noise to when comm and cmdline actually disagree on the program basename

This commit is contained in:
Benny Baumann 2020-11-20 08:04:51 +01:00 committed by BenBE
parent dde2af1fdb
commit f0a232568f
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
linux/LinuxProcess.c
View File

@ -467,7 +467,7 @@ void LinuxProcess_makeCommandStr(Process* this) {
return; return;
} }
static void LinuxProcess_writeCommand(const Process* this, int attr, int baseattr, RichString* str) { static void LinuxProcess_writeCommand(const Process* this, int attr, int baseAttr, RichString* str) {
const LinuxProcess *lp = (const LinuxProcess *)this; const LinuxProcess *lp = (const LinuxProcess *)this;
int strStart = RichString_size(str); int strStart = RichString_size(str);
int baseStart = strStart + lp->mergedCommand.baseStart; int baseStart = strStart + lp->mergedCommand.baseStart;
@ -489,12 +489,17 @@ static void LinuxProcess_writeCommand(const Process* this, int attr, int baseatt
/* If it was matched with procExe's basename, make it bold if needed */ /* If it was matched with procExe's basename, make it bold if needed */
if (commStart == baseStart && highlightBaseName) { if (commStart == baseStart && highlightBaseName) {
if (commEnd > baseEnd) { if (commEnd > baseEnd) {
RichString_setAttrn(str, A_BOLD | commAttr, commStart, baseEnd - 1); RichString_setAttrn(str, A_BOLD | baseAttr, commStart, baseEnd - 1);
baseStart = baseEnd; baseStart = baseEnd;
RichString_setAttrn(str, commAttr, baseStart, commEnd - 1); RichString_setAttrn(str, commAttr, baseStart, commEnd - 1);
} else { } else if (commEnd < baseEnd) {
RichString_setAttrn(str, A_BOLD | commAttr, commStart, commEnd - 1); RichString_setAttrn(str, A_BOLD | commAttr, commStart, commEnd - 1);
baseStart = commEnd; baseStart = commEnd;
// Remainder marked baseAttr at end of function
} else {
// Actually should be highlighted commAttr, but marked baseAttr to reduce visual noise
RichString_setAttrn(str, A_BOLD | baseAttr, commStart, commEnd - 1);
baseStart = commEnd;
} }
} else { } else {
RichString_setAttrn(str, commAttr, commStart, commEnd - 1); RichString_setAttrn(str, commAttr, commStart, commEnd - 1);
@ -505,7 +510,7 @@ static void LinuxProcess_writeCommand(const Process* this, int attr, int baseatt
} }
} }
if (baseStart < baseEnd && highlightBaseName) { if (baseStart < baseEnd && highlightBaseName) {
RichString_setAttrn(str, baseattr, baseStart, baseEnd - 1); RichString_setAttrn(str, baseAttr, baseStart, baseEnd - 1);
} }
} }