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

Improve handling when selected last process entry 

If the last process entry is selected and the process dies, stay at the
end of the list and do not jump to the start.

Also if the last entry is selected keep, after rebuilding the process
list due to a new scan, the last entry selected.
This commit is contained in:
Christian Göttsche 2021-01-30 23:45:00 +01:00 committed by cgzones
parent 51e79ddc07
commit 06b1674aa6
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Panel.c
View File

@ -246,8 +246,8 @@ void Panel_draw(Panel* this, bool force_redraw, bool focus, bool highlightSelect
if (this->scrollV < 0) { if (this->scrollV < 0) {
this->scrollV = 0; this->scrollV = 0;
this->needsRedraw = true; this->needsRedraw = true;
} else if (this->scrollV >= size) { } else if (this->scrollV > size - h) {
this->scrollV = MAXIMUM(size - 1, 0); this->scrollV = MAXIMUM(size - h, 0);
this->needsRedraw = true; this->needsRedraw = true;
} }
// ensure selection is on screen // ensure selection is on screen

15
ProcessList.c
View File

@ -499,10 +499,12 @@ void ProcessList_rebuildPanel(ProcessList* this) {
int currPos = Panel_getSelectedIndex(this->panel); int currPos = Panel_getSelectedIndex(this->panel);
int currScrollV = this->panel->scrollV; int currScrollV = this->panel->scrollV;
int currSize = Panel_size(this->panel);
Panel_prune(this->panel); Panel_prune(this->panel);
int size = ProcessList_size(this); int size = ProcessList_size(this);
int idx = 0; int idx = 0;
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);
@ -513,12 +515,23 @@ void ProcessList_rebuildPanel(ProcessList* this) {
continue; continue;
Panel_set(this->panel, idx, (Object*)p); Panel_set(this->panel, idx, (Object*)p);
if ((this->following == -1 && idx == currPos) || (this->following != -1 && p->pid == this->following)) {
if (this->following != -1 && p->pid == this->following) {
Panel_setSelected(this->panel, idx); Panel_setSelected(this->panel, idx);
this->panel->scrollV = currScrollV; this->panel->scrollV = currScrollV;
} }
idx++; idx++;
} }
if (this->following == -1) {
/* If the last item was selected, keep the new last item selected */
if (currPos == currSize - 1)
Panel_setSelected(this->panel, Panel_size(this->panel) - 1);
else
Panel_setSelected(this->panel, currPos);
this->panel->scrollV = currScrollV;
}
} }
Process* ProcessList_getProcess(ProcessList* this, pid_t pid, bool* preExisting, Process_New constructor) { Process* ProcessList_getProcess(ProcessList* this, pid_t pid, bool* preExisting, Process_New constructor) {