zeldon/htop
1
0
Fork 0
mirror of https://github.com/xzeldon/htop.git synced 2025-07-10 03:04:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

Keep panel structure up-to-date as process list changes when headers are updated during the screen manager. Hopefully closes #3444533.

Browse Source
This commit is contained in:
Hisham Muhammad
2011-12-01 12:31:57 +00:00
parent dfad0afb36
commit bfd86a60cc
6 changed files with 136 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
ProcessList.c
View File

@ -16,6 +16,7 @@ in the source distribution for its full text.
#include "UsersTable.h"
#include "Hashtable.h"
#include "String.h"
#include "Panel.h"
#include <sys/types.h>
#include <sys/stat.h>
@ -109,6 +110,13 @@ typedef struct ProcessList_ {
Hashtable* processTable;
UsersTable* usersTable;
Panel* panel;
bool follow;
bool userOnly;
uid_t userId;
bool filtering;
const char* incFilter;
int cpuCount;
int totalTasks;
int userlandThreads;
@ -243,6 +251,10 @@ void ProcessList_delete(ProcessList* this) {
free(this);
}
void ProcessList_setPanel(ProcessList* this, Panel* panel) {
this->panel = panel;
}
void ProcessList_invertSortOrder(ProcessList* this) {
if (this->direction == 1)
this->direction = -1;
@ -888,3 +900,47 @@ void ProcessList_expandTree(ProcessList* this) {
process->showChildren = true;
}
}
void ProcessList_rebuildPanel(ProcessList* this, bool flags, bool follow, bool userOnly, uid_t userId, bool filtering, const char* incFilter) {
if (!flags) {
follow = this->follow;
userOnly = this->userOnly;
userId = this->userId;
filtering = this->filtering;
incFilter = this->incFilter;
} else {
this->follow = follow;
this->userOnly = userOnly;
this->userId = userId;
this->filtering = filtering;
this->incFilter = incFilter;
}
int currPos = Panel_getSelectedIndex(this->panel);
pid_t currPid = 0;
int currScrollV = this->panel->scrollV;
if (follow)
currPid = ProcessList_get(this, currPos)->pid;
Panel_prune(this->panel);
int size = ProcessList_size(this);
int idx = 0;
for (int i = 0; i < size; i++) {
bool hidden = false;
Process* p = ProcessList_get(this, i);
if ( (!p->show)
|| (userOnly && (p->st_uid != userId))
|| (filtering && !(String_contains_i(p->comm, incFilter))) )
hidden = true;
if (!hidden) {
Panel_set(this->panel, idx, (Object*)p);
if ((!follow && idx == currPos) || (follow && p->pid == currPid)) {
Panel_setSelected(this->panel, idx);
this->panel->scrollV = currScrollV;
}
idx++;
}
}
}