diff options
author | Graham Inggs <ginggs@debian.org> | 2018-02-05 14:48:53 +0200 |
---|---|---|
committer | Graham Inggs <ginggs@debian.org> | 2018-02-05 14:48:53 +0200 |
commit | 0bffedf65c053726a3a09be93c5eabfc113550fc (patch) | |
tree | 8c14970f1890c710df6f72aaa85781d62cee11e5 /Action.c | |
parent | ba3d665468e9752a81a50bb2df7639950e0a3c77 (diff) | |
parent | 2ee50d030178cede83eb9d0005fbc19f819d30fe (diff) | |
download | debian_htop-0bffedf65c053726a3a09be93c5eabfc113550fc.tar.gz debian_htop-0bffedf65c053726a3a09be93c5eabfc113550fc.tar.bz2 debian_htop-0bffedf65c053726a3a09be93c5eabfc113550fc.zip |
Merge tag 'upstream/2.1.0'
Upstream version 2.1.0
Diffstat (limited to 'Action.c')
-rw-r--r-- | Action.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -142,7 +142,7 @@ static void tagAllChildren(Panel* panel, Process* parent) { pid_t ppid = parent->pid; for (int i = 0; i < Panel_size(panel); i++) { Process* p = (Process*) Panel_get(panel, i); - if (!p->tag && p->ppid == ppid) { + if (!p->tag && Process_isChildOf(p, ppid)) { tagAllChildren(panel, p); } } @@ -381,7 +381,7 @@ static Htop_Reaction actionRedraw() { return HTOP_REFRESH | HTOP_REDRAW_BAR; } -static struct { const char* key; const char* info; } helpLeft[] = { +static const struct { const char* key; const char* info; } helpLeft[] = { { .key = " Arrows: ", .info = "scroll process list" }, { .key = " Digits: ", .info = "incremental PID search" }, { .key = " F3 /: ", .info = "incremental name search" }, @@ -395,11 +395,11 @@ static struct { const char* key; const char* info; } helpLeft[] = { { .key = " F6 + -: ", .info = "expand/collapse tree" }, { .key = " P M T: ", .info = "sort by CPU%, MEM% or TIME" }, { .key = " I: ", .info = "invert sort order" }, - { .key = " F6 >: ", .info = "select sort column" }, + { .key = " F6 > .: ", .info = "select sort column" }, { .key = NULL, .info = NULL } }; -static struct { const char* key; const char* info; } helpRight[] = { +static const struct { const char* key; const char* info; } helpRight[] = { { .key = " Space: ", .info = "tag process" }, { .key = " c: ", .info = "tag process and its children" }, { .key = " U: ", .info = "untag all processes" }, @@ -414,7 +414,7 @@ static struct { const char* key; const char* info; } helpRight[] = { { .key = " l: ", .info = "list open files with lsof" }, { .key = " s: ", .info = "trace syscalls with strace" }, { .key = " ", .info = "" }, - { .key = " F2 S: ", .info = "setup" }, + { .key = " F2 C S: ", .info = "setup" }, { .key = " F1 h: ", .info = "show this help screen" }, { .key = " F10 q: ", .info = "quit" }, { .key = NULL, .info = NULL } |