mirror of https://github.com/xzeldon/htop.git
Merge branch 'hishamhm-pull-857'
This commit is contained in:
commit
e7d2f9383a
19
Action.c
19
Action.c
|
@ -62,7 +62,7 @@ typedef struct State_ {
|
||||||
|
|
||||||
}*/
|
}*/
|
||||||
|
|
||||||
Object* Action_pickFromVector(State* st, Panel* list, int x) {
|
Object* Action_pickFromVector(State* st, Panel* list, int x, bool followProcess) {
|
||||||
Panel* panel = st->panel;
|
Panel* panel = st->panel;
|
||||||
Header* header = st->header;
|
Header* header = st->header;
|
||||||
Settings* settings = st->settings;
|
Settings* settings = st->settings;
|
||||||
|
@ -75,8 +75,8 @@ Object* Action_pickFromVector(State* st, Panel* list, int x) {
|
||||||
Panel* panelFocus;
|
Panel* panelFocus;
|
||||||
int ch;
|
int ch;
|
||||||
bool unfollow = false;
|
bool unfollow = false;
|
||||||
int pid = MainPanel_selectedPid((MainPanel*)panel);
|
int pid = followProcess ? MainPanel_selectedPid((MainPanel*)panel) : -1;
|
||||||
if (header->pl->following == -1) {
|
if (followProcess && header->pl->following == -1) {
|
||||||
header->pl->following = pid;
|
header->pl->following = pid;
|
||||||
unfollow = true;
|
unfollow = true;
|
||||||
}
|
}
|
||||||
|
@ -88,11 +88,16 @@ Object* Action_pickFromVector(State* st, Panel* list, int x) {
|
||||||
Panel_move(panel, 0, y);
|
Panel_move(panel, 0, y);
|
||||||
Panel_resize(panel, COLS, LINES-y-1);
|
Panel_resize(panel, COLS, LINES-y-1);
|
||||||
if (panelFocus == list && ch == 13) {
|
if (panelFocus == list && ch == 13) {
|
||||||
|
if (followProcess) {
|
||||||
Process* selected = (Process*)Panel_getSelected(panel);
|
Process* selected = (Process*)Panel_getSelected(panel);
|
||||||
if (selected && selected->pid == pid)
|
if (selected && selected->pid == pid)
|
||||||
return Panel_getSelected(list);
|
return Panel_getSelected(list);
|
||||||
else
|
else
|
||||||
beep();
|
beep();
|
||||||
|
} else {
|
||||||
|
return Panel_getSelected(list);
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
@ -189,7 +194,7 @@ static Htop_Reaction sortBy(State* st) {
|
||||||
Panel_setSelected(sortPanel, i);
|
Panel_setSelected(sortPanel, i);
|
||||||
free(name);
|
free(name);
|
||||||
}
|
}
|
||||||
ListItem* field = (ListItem*) Action_pickFromVector(st, sortPanel, 15);
|
ListItem* field = (ListItem*) Action_pickFromVector(st, sortPanel, 15, false);
|
||||||
if (field) {
|
if (field) {
|
||||||
reaction |= Action_setSortKey(st->settings, field->key);
|
reaction |= Action_setSortKey(st->settings, field->key);
|
||||||
}
|
}
|
||||||
|
@ -316,7 +321,7 @@ static Htop_Reaction actionSetAffinity(State* st) {
|
||||||
Panel* affinityPanel = AffinityPanel_new(st->pl, affinity);
|
Panel* affinityPanel = AffinityPanel_new(st->pl, affinity);
|
||||||
Affinity_delete(affinity);
|
Affinity_delete(affinity);
|
||||||
|
|
||||||
void* set = Action_pickFromVector(st, affinityPanel, 15);
|
void* set = Action_pickFromVector(st, affinityPanel, 15, true);
|
||||||
if (set) {
|
if (set) {
|
||||||
Affinity* affinity = AffinityPanel_getAffinity(affinityPanel, st->pl);
|
Affinity* affinity = AffinityPanel_getAffinity(affinityPanel, st->pl);
|
||||||
bool ok = MainPanel_foreachProcess((MainPanel*)panel, (MainPanel_ForeachProcessFn) Affinity_set, (Arg){ .v = affinity }, NULL);
|
bool ok = MainPanel_foreachProcess((MainPanel*)panel, (MainPanel_ForeachProcessFn) Affinity_set, (Arg){ .v = affinity }, NULL);
|
||||||
|
@ -330,7 +335,7 @@ static Htop_Reaction actionSetAffinity(State* st) {
|
||||||
|
|
||||||
static Htop_Reaction actionKill(State* st) {
|
static Htop_Reaction actionKill(State* st) {
|
||||||
Panel* signalsPanel = (Panel*) SignalsPanel_new();
|
Panel* signalsPanel = (Panel*) SignalsPanel_new();
|
||||||
ListItem* sgn = (ListItem*) Action_pickFromVector(st, signalsPanel, 15);
|
ListItem* sgn = (ListItem*) Action_pickFromVector(st, signalsPanel, 15, true);
|
||||||
if (sgn) {
|
if (sgn) {
|
||||||
if (sgn->key != 0) {
|
if (sgn->key != 0) {
|
||||||
Panel_setHeader(st->panel, "Sending...");
|
Panel_setHeader(st->panel, "Sending...");
|
||||||
|
@ -351,7 +356,7 @@ static Htop_Reaction actionFilterByUser(State* st) {
|
||||||
Vector_insertionSort(usersPanel->items);
|
Vector_insertionSort(usersPanel->items);
|
||||||
ListItem* allUsers = ListItem_new("All users", -1);
|
ListItem* allUsers = ListItem_new("All users", -1);
|
||||||
Panel_insert(usersPanel, 0, (Object*) allUsers);
|
Panel_insert(usersPanel, 0, (Object*) allUsers);
|
||||||
ListItem* picked = (ListItem*) Action_pickFromVector(st, usersPanel, 20);
|
ListItem* picked = (ListItem*) Action_pickFromVector(st, usersPanel, 20, false);
|
||||||
if (picked) {
|
if (picked) {
|
||||||
if (picked == allUsers) {
|
if (picked == allUsers) {
|
||||||
st->pl->userId = -1;
|
st->pl->userId = -1;
|
||||||
|
|
2
Action.h
2
Action.h
|
@ -39,7 +39,7 @@ typedef struct State_ {
|
||||||
} State;
|
} State;
|
||||||
|
|
||||||
|
|
||||||
extern Object* Action_pickFromVector(State* st, Panel* list, int x);
|
extern Object* Action_pickFromVector(State* st, Panel* list, int x, bool followProcess);
|
||||||
|
|
||||||
// ----------------------------------------
|
// ----------------------------------------
|
||||||
|
|
||||||
|
|
|
@ -93,7 +93,7 @@ static Htop_Reaction Platform_actionSetIOPriority(State* st) {
|
||||||
if (!p) return HTOP_OK;
|
if (!p) return HTOP_OK;
|
||||||
IOPriority ioprio = p->ioPriority;
|
IOPriority ioprio = p->ioPriority;
|
||||||
Panel* ioprioPanel = IOPriorityPanel_new(ioprio);
|
Panel* ioprioPanel = IOPriorityPanel_new(ioprio);
|
||||||
void* set = Action_pickFromVector(st, ioprioPanel, 21);
|
void* set = Action_pickFromVector(st, ioprioPanel, 21, true);
|
||||||
if (set) {
|
if (set) {
|
||||||
IOPriority ioprio = IOPriorityPanel_getIOPriority(ioprioPanel);
|
IOPriority ioprio = IOPriorityPanel_getIOPriority(ioprioPanel);
|
||||||
bool ok = MainPanel_foreachProcess((MainPanel*)panel, (MainPanel_ForeachProcessFn) LinuxProcess_setIOPriority, (Arg){ .i = ioprio }, NULL);
|
bool ok = MainPanel_foreachProcess((MainPanel*)panel, (MainPanel_ForeachProcessFn) LinuxProcess_setIOPriority, (Arg){ .i = ioprio }, NULL);
|
||||||
|
|
Loading…
Reference in New Issue