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

Simplify Action_pickFromVector() width parameter usage 

Pass one less instead of subtracting one inside the function.
This commit is contained in:
Christian Göttsche 2021-08-10 01:06:22 +02:00 committed by BenBE
parent 68460b25e3
commit edafa26f9e
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Action.c
View File

@ -48,7 +48,7 @@ Object* Action_pickFromVector(State* st, Panel* list, int x, bool followProcess)
int y = ((Panel*)mainPanel)->y; int y = ((Panel*)mainPanel)->y;
ScreenManager* scr = ScreenManager_new(header, st->settings, st, false); ScreenManager* scr = ScreenManager_new(header, st->settings, st, false);
scr->allowFocusChange = false; scr->allowFocusChange = false;
ScreenManager_add(scr, list, x - 1); ScreenManager_add(scr, list, x);
ScreenManager_add(scr, (Panel*)mainPanel, -1); ScreenManager_add(scr, (Panel*)mainPanel, -1);
Panel* panelFocus; Panel* panelFocus;
int ch; int ch;
@ -185,7 +185,7 @@ static Htop_Reaction actionSetSortColumn(State* st) {
free(name); free(name);
} }
const ListItem* field = (const ListItem*) Action_pickFromVector(st, sortPanel, 15, false); const ListItem* field = (const ListItem*) Action_pickFromVector(st, sortPanel, 14, false);
if (field) { if (field) {
reaction |= Action_setSortKey(st->settings, field->key); reaction |= Action_setSortKey(st->settings, field->key);
} }
@ -325,7 +325,6 @@ static Htop_Reaction actionSetAffinity(State* st) {
int width; int width;
Panel* affinityPanel = AffinityPanel_new(st->pl, affinity1, &width); Panel* affinityPanel = AffinityPanel_new(st->pl, affinity1, &width);
width += 1; /* we add a gap between the panels */
Affinity_delete(affinity1); Affinity_delete(affinity1);
const void* set = Action_pickFromVector(st, affinityPanel, width, true); const void* set = Action_pickFromVector(st, affinityPanel, width, true);
@ -349,7 +348,7 @@ static Htop_Reaction actionKill(State* st) {
return HTOP_OK; return HTOP_OK;
Panel* signalsPanel = SignalsPanel_new(); Panel* signalsPanel = SignalsPanel_new();
const ListItem* sgn = (ListItem*) Action_pickFromVector(st, signalsPanel, 15, true); const ListItem* sgn = (ListItem*) Action_pickFromVector(st, signalsPanel, 14, true);
if (sgn && sgn->key != 0) { if (sgn && sgn->key != 0) {
Panel_setHeader((Panel*)st->mainPanel, "Sending..."); Panel_setHeader((Panel*)st->mainPanel, "Sending...");
Panel_draw((Panel*)st->mainPanel, false, true, true, State_hideFunctionBar(st)); Panel_draw((Panel*)st->mainPanel, false, true, true, State_hideFunctionBar(st));
@ -368,7 +367,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);
const ListItem* picked = (ListItem*) Action_pickFromVector(st, usersPanel, 20, false); const ListItem* picked = (ListItem*) Action_pickFromVector(st, usersPanel, 19, false);
if (picked) { if (picked) {
if (picked == allUsers) { if (picked == allUsers) {
st->pl->userId = (uid_t)-1; st->pl->userId = (uid_t)-1;

2
linux/Platform.c
View File

@ -138,7 +138,7 @@ static Htop_Reaction Platform_actionSetIOPriority(State* st) {
IOPriority ioprio1 = p->ioPriority; IOPriority ioprio1 = p->ioPriority;
Panel* ioprioPanel = IOPriorityPanel_new(ioprio1); Panel* ioprioPanel = IOPriorityPanel_new(ioprio1);
const void* set = Action_pickFromVector(st, ioprioPanel, 21, true); const void* set = Action_pickFromVector(st, ioprioPanel, 20, true);
if (set) { if (set) {
IOPriority ioprio2 = IOPriorityPanel_getIOPriority(ioprioPanel); IOPriority ioprio2 = IOPriorityPanel_getIOPriority(ioprioPanel);
bool ok = MainPanel_foreachProcess(st->mainPanel, LinuxProcess_setIOPriority, (Arg) { .i = ioprio2 }, NULL); bool ok = MainPanel_foreachProcess(st->mainPanel, LinuxProcess_setIOPriority, (Arg) { .i = ioprio2 }, NULL);