diff options
author | Daniel Lange <DLange@git.local> | 2023-02-05 04:25:56 +0100 |
---|---|---|
committer | Daniel Lange <DLange@git.local> | 2023-02-05 04:25:56 +0100 |
commit | f288666edc9180a2e81e6655951878124f321df6 (patch) | |
tree | da70bf44b2423f6f8e9a070c063fed79d190b489 /Action.c | |
parent | 937052b231259a47d881d539ad5748245ef55b99 (diff) | |
download | debian_htop-f288666edc9180a2e81e6655951878124f321df6.tar.gz debian_htop-f288666edc9180a2e81e6655951878124f321df6.tar.bz2 debian_htop-f288666edc9180a2e81e6655951878124f321df6.zip |
New upstream version 3.2.2upstream/3.2.2
Diffstat (limited to 'Action.c')
-rw-r--r-- | Action.c | 38 |
1 files changed, 32 insertions, 6 deletions
@@ -213,22 +213,37 @@ static Htop_Reaction actionSortByTime(State* st) { static Htop_Reaction actionToggleKernelThreads(State* st) { st->settings->hideKernelThreads = !st->settings->hideKernelThreads; + st->settings->lastUpdate++; + return HTOP_RECALCULATE | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING; } static Htop_Reaction actionToggleUserlandThreads(State* st) { st->settings->hideUserlandThreads = !st->settings->hideUserlandThreads; + st->settings->lastUpdate++; + + return HTOP_RECALCULATE | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING; +} + +static Htop_Reaction actionToggleRunningInContainer(State* st) { + st->settings->hideRunningInContainer = !st->settings->hideRunningInContainer; + st->settings->lastUpdate++; + return HTOP_RECALCULATE | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING; } static Htop_Reaction actionToggleProgramPath(State* st) { st->settings->showProgramPath = !st->settings->showProgramPath; - return HTOP_REFRESH | HTOP_SAVE_SETTINGS; + st->settings->lastUpdate++; + + return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING; } static Htop_Reaction actionToggleMergedCommand(State* st) { st->settings->showMergedCommand = !st->settings->showMergedCommand; - return HTOP_REFRESH | HTOP_SAVE_SETTINGS; + st->settings->lastUpdate++; + + return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING | HTOP_UPDATE_PANELHDR; } static Htop_Reaction actionToggleTreeView(State* st) { @@ -240,6 +255,11 @@ static Htop_Reaction actionToggleTreeView(State* st) { return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING | HTOP_REDRAW_BAR | HTOP_UPDATE_PANELHDR; } +static Htop_Reaction actionToggleHideMeters(State* st) { + st->hideMeters = !st->hideMeters; + return HTOP_RESIZE | HTOP_KEEP_FOLLOWING; +} + static Htop_Reaction actionExpandOrCollapseAllBranches(State* st) { ScreenSettings* ss = st->settings->ss; if (!ss->treeView) { @@ -285,10 +305,13 @@ static Htop_Reaction actionLowerPriority(State* st) { static Htop_Reaction actionInvertSortOrder(State* st) { ScreenSettings_invertSortOrder(st->settings->ss); st->pl->needsSort = true; - return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING; + return HTOP_REFRESH | HTOP_SAVE_SETTINGS | HTOP_KEEP_FOLLOWING | HTOP_UPDATE_PANELHDR; } static Htop_Reaction actionExpandOrCollapse(State* st) { + if (!st->settings->ss->treeView) + return HTOP_OK; + bool changed = expandCollapse((Panel*)st->mainPanel); return changed ? HTOP_RECALCULATE : HTOP_OK; } @@ -312,7 +335,7 @@ static Htop_Reaction actionNextScreen(State* st) { settings->ssIndex = 0; } settings->ss = settings->screens[settings->ssIndex]; - return HTOP_REFRESH; + return HTOP_UPDATE_PANELHDR | HTOP_REFRESH; } static Htop_Reaction actionPrevScreen(State* st) { @@ -323,7 +346,7 @@ static Htop_Reaction actionPrevScreen(State* st) { settings->ssIndex--; } settings->ss = settings->screens[settings->ssIndex]; - return HTOP_REFRESH; + return HTOP_UPDATE_PANELHDR | HTOP_REFRESH; } Htop_Reaction Action_setScreenTab(Settings* settings, int x) { @@ -337,7 +360,7 @@ Htop_Reaction Action_setScreenTab(Settings* settings, int x) { if (x <= s + len + 1) { settings->ssIndex = i; settings->ss = settings->screens[i]; - return HTOP_REFRESH; + return HTOP_UPDATE_PANELHDR | HTOP_REFRESH; } s += len + 3; } @@ -506,6 +529,7 @@ static const struct { bool roInactive; const char* info; } helpLeft[] = { + { .key = " #: ", .roInactive = false, .info = "hide/show header meters" }, { .key = " Tab: ", .roInactive = false, .info = "switch to next screen tab" }, { .key = " Arrows: ", .roInactive = false, .info = "scroll process list" }, { .key = " Digits: ", .roInactive = false, .info = "incremental PID search" }, @@ -732,6 +756,7 @@ static Htop_Reaction actionShowCommandScreen(State* st) { void Action_setBindings(Htop_Action* keys) { keys[' '] = actionTag; + keys['#'] = actionToggleHideMeters; keys['*'] = actionExpandOrCollapseAllBranches; keys['+'] = actionExpandOrCollapse; keys[','] = actionSetSortColumn; @@ -749,6 +774,7 @@ void Action_setBindings(Htop_Action* keys) { keys['K'] = actionToggleKernelThreads; keys['M'] = actionSortByMemory; keys['N'] = actionSortByPID; + keys['O'] = actionToggleRunningInContainer; keys['P'] = actionSortByCPU; keys['S'] = actionSetup; keys['T'] = actionSortByTime; |