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

Merge branch 'follow' of cgzones/htop 

Closes #557
This commit is contained in:
Daniel Lange 2021-03-04 07:41:14 +01:00
parent 8c421d527b 59a150e8d7
commit c5770c26af
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Action.c
View File

@ -206,12 +206,12 @@ static Htop_Reaction actionSortByTime(State* st) {
static Htop_Reaction actionToggleKernelThreads(State* st) { static Htop_Reaction actionToggleKernelThreads(State* st) {
st->settings->hideKernelThreads = !st->settings->hideKernelThreads; st->settings->hideKernelThreads = !st->settings->hideKernelThreads;
return HTOP_RECALCULATE | HTOP_SAVE_SETTINGS; return HTOP_RECALCULATE | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING;
} }
static Htop_Reaction actionToggleUserlandThreads(State* st) { static Htop_Reaction actionToggleUserlandThreads(State* st) {
st->settings->hideUserlandThreads = !st->settings->hideUserlandThreads; st->settings->hideUserlandThreads = !st->settings->hideUserlandThreads;
return HTOP_RECALCULATE | HTOP_SAVE_SETTINGS; return HTOP_RECALCULATE | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING;
} }
static Htop_Reaction actionToggleProgramPath(State* st) { static Htop_Reaction actionToggleProgramPath(State* st) {

8
ProcessList.c
View File

@ -514,6 +514,7 @@ void ProcessList_rebuildPanel(ProcessList* this) {
Panel_prune(this->panel); Panel_prune(this->panel);
int size = ProcessList_size(this); int size = ProcessList_size(this);
int idx = 0; int idx = 0;
bool foundFollowed = false;
for (int i = 0; i < size; i++) { for (int i = 0; i < size; i++) {
Process* p = ProcessList_get(this, i); Process* p = ProcessList_get(this, i);
@ -527,12 +528,19 @@ void ProcessList_rebuildPanel(ProcessList* this) {
Panel_set(this->panel, idx, (Object*)p); Panel_set(this->panel, idx, (Object*)p);
if (this->following != -1 && p->pid == this->following) { if (this->following != -1 && p->pid == this->following) {
foundFollowed = true;
Panel_setSelected(this->panel, idx); Panel_setSelected(this->panel, idx);
this->panel->scrollV = currScrollV; this->panel->scrollV = currScrollV;
} }
idx++; idx++;
} }
if (this->following != -1 && !foundFollowed) {
/* Reset if current followed pid not found */
this->following = -1;
Panel_setSelectionColor(this->panel, PANEL_SELECTION_FOCUS);
}
if (this->following == -1) { if (this->following == -1) {
/* If the last item was selected, keep the new last item selected */ /* If the last item was selected, keep the new last item selected */
if (currPos > 0 && currPos == currSize - 1) if (currPos > 0 && currPos == currSize - 1)