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

Merge branch 'remove-n-keybind' of jakem72360/htop

This commit is contained in:
Daniel Lange 2020-12-23 18:22:17 +01:00
parent b9336af76f f46ddd3230
commit 71ddc6a6a1
3 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Action.c
View File

@ -250,16 +250,6 @@ static Htop_Reaction actionIncSearch(State* st) {
return HTOP_REFRESH | HTOP_KEEP_FOLLOWING; return HTOP_REFRESH | HTOP_KEEP_FOLLOWING;
} }
static Htop_Reaction actionIncNext(State* st) {
IncSet_next(((MainPanel*)st->panel)->inc, INC_SEARCH, st->panel, (IncMode_GetPanelValue) MainPanel_getValue);
return HTOP_REFRESH | HTOP_KEEP_FOLLOWING;
}
static Htop_Reaction actionIncPrev(State* st) {
IncSet_prev(((MainPanel*)st->panel)->inc, INC_SEARCH, st->panel, (IncMode_GetPanelValue) MainPanel_getValue);
return HTOP_REFRESH | HTOP_KEEP_FOLLOWING;
}
static Htop_Reaction actionHigherPriority(State* st) { static Htop_Reaction actionHigherPriority(State* st) {
bool changed = changePriority((MainPanel*)st->panel, -1); bool changed = changePriority((MainPanel*)st->panel, -1);
return changed ? HTOP_REFRESH : HTOP_OK; return changed ? HTOP_REFRESH : HTOP_OK;
@ -655,7 +645,6 @@ void Action_setBindings(Htop_Action* keys) {
keys['I'] = actionInvertSortOrder; keys['I'] = actionInvertSortOrder;
keys['K'] = actionToggleKernelThreads; keys['K'] = actionToggleKernelThreads;
keys['M'] = actionSortByMemory; keys['M'] = actionSortByMemory;
keys['N'] = actionIncPrev;
keys['P'] = actionSortByCPU; keys['P'] = actionSortByCPU;
keys['S'] = actionSetup; keys['S'] = actionSetup;
keys['T'] = actionSortByTime; keys['T'] = actionSortByTime;
@ -673,7 +662,6 @@ void Action_setBindings(Htop_Action* keys) {
keys['k'] = actionKill; keys['k'] = actionKill;
keys['l'] = actionLsof; keys['l'] = actionLsof;
keys['m'] = actionToggleMergedCommand; keys['m'] = actionToggleMergedCommand;
keys['n'] = actionIncNext;
keys['p'] = actionToggleProgramPath; keys['p'] = actionToggleProgramPath;
keys['q'] = actionQuit; keys['q'] = actionQuit;
keys['s'] = actionStrace; keys['s'] = actionStrace;

8
IncSet.c
View File

@ -133,14 +133,6 @@ static bool IncMode_find(IncMode* mode, Panel* panel, IncMode_GetPanelValue getP
} }
} }
bool IncSet_next(IncSet* this, IncType type, Panel* panel, IncMode_GetPanelValue getPanelValue) {
return IncMode_find(&this->modes[type], panel, getPanelValue, 1);
}
bool IncSet_prev(IncSet* this, IncType type, Panel* panel, IncMode_GetPanelValue getPanelValue) {
return IncMode_find(&this->modes[type], panel, getPanelValue, -1);
}
bool IncSet_handleKey(IncSet* this, int ch, Panel* panel, IncMode_GetPanelValue getPanelValue, Vector* lines) { bool IncSet_handleKey(IncSet* this, int ch, Panel* panel, IncMode_GetPanelValue getPanelValue, Vector* lines) {
if (ch == ERR) if (ch == ERR)
return true; return true;

4
IncSet.h
View File

@ -48,10 +48,6 @@ IncSet* IncSet_new(FunctionBar* bar);
void IncSet_delete(IncSet* this); void IncSet_delete(IncSet* this);
bool IncSet_next(IncSet* this, IncType type, Panel* panel, IncMode_GetPanelValue getPanelValue);
bool IncSet_prev(IncSet* this, IncType type, Panel* panel, IncMode_GetPanelValue getPanelValue);
bool IncSet_handleKey(IncSet* this, int ch, Panel* panel, IncMode_GetPanelValue getPanelValue, Vector* lines); bool IncSet_handleKey(IncSet* this, int ch, Panel* panel, IncMode_GetPanelValue getPanelValue, Vector* lines);
const char* IncSet_getListItemValue(Panel* panel, int i); const char* IncSet_getListItemValue(Panel* panel, int i);