1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
|
diff --git a/Action.c b/Action.c
index 3fc2217..09670fe 100644
--- a/Action.c
+++ b/Action.c
@@ -382,7 +382,7 @@ static Htop_Reaction actionRedraw() {
}
static struct { const char* key; const char* info; } helpLeft[] = {
- { .key = " Arrows: ", .info = "scroll process list" },
+ { .key = " hjkl: ", .info = "scroll process list" },
{ .key = " Digits: ", .info = "incremental PID search" },
{ .key = " F3 /: ", .info = "incremental name search" },
{ .key = " F4 \\: ",.info = "incremental name filtering" },
@@ -403,7 +403,7 @@ static 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" },
- { .key = " F9 k: ", .info = "kill process/tagged processes" },
+ { .key = " F9 x: ", .info = "kill process/tagged processes" },
{ .key = " F7 ]: ", .info = "higher priority (root only)" },
{ .key = " F8 [: ", .info = "lower priority (+ nice)" },
#if (HAVE_LIBHWLOC || HAVE_LINUX_AFFINITY)
@@ -411,11 +411,11 @@ static struct { const char* key; const char* info; } helpRight[] = {
#endif
{ .key = " e: ", .info = "show process environment" },
{ .key = " i: ", .info = "set IO priority" },
- { .key = " l: ", .info = "list open files with lsof" },
+ { .key = " L: ", .info = "list open files with lsof" },
{ .key = " s: ", .info = "trace syscalls with strace" },
{ .key = " ", .info = "" },
{ .key = " F2 S: ", .info = "setup" },
- { .key = " F1 h: ", .info = "show this help screen" },
+ { .key = " F1 ?: ", .info = "show this help screen" },
{ .key = " F10 q: ", .info = "quit" },
{ .key = NULL, .info = NULL }
};
@@ -543,6 +543,7 @@ void Action_setBindings(Htop_Action* keys) {
keys['I'] = actionInvertSortOrder;
keys[KEY_F(6)] = actionExpandCollapseOrSortColumn;
keys[KEY_F(18)] = actionExpandCollapseOrSortColumn;
+ keys['o'] = actionExpandCollapseOrSortColumn;
keys['<'] = actionSetSortColumn;
keys[','] = actionSetSortColumn;
keys['>'] = actionSetSortColumn;
@@ -551,7 +552,7 @@ void Action_setBindings(Htop_Action* keys) {
keys['q'] = actionQuit;
keys['a'] = actionSetAffinity;
keys[KEY_F(9)] = actionKill;
- keys['k'] = actionKill;
+ keys['x'] = actionKill;
keys[KEY_RECLICK] = actionExpandOrCollapse;
keys['+'] = actionExpandOrCollapse;
keys['='] = actionExpandOrCollapse;
@@ -561,12 +562,11 @@ void Action_setBindings(Htop_Action* keys) {
keys['S'] = actionSetup;
keys['C'] = actionSetup;
keys[KEY_F(2)] = actionSetup;
- keys['l'] = actionLsof;
+ keys['L'] = actionLsof;
keys['s'] = actionStrace;
keys[' '] = actionTag;
keys['\014'] = actionRedraw; // Ctrl+L
keys[KEY_F(1)] = actionHelp;
- keys['h'] = actionHelp;
keys['?'] = actionHelp;
keys['U'] = actionUntagAll;
keys['c'] = actionTagAllChildren;
diff --git a/MainPanel.c b/MainPanel.c
index f9b45d6..630648b 100644
--- a/MainPanel.c
+++ b/MainPanel.c
@@ -104,14 +104,14 @@ static HandlerResult MainPanel_eventHandler(Panel* super, int ch) {
}
switch (ch) {
case KEY_LEFT:
- case KEY_CTRLB:
+ case 'h':
if (super->scrollH > 0) {
super->scrollH -= CRT_scrollHAmount;
super->needsRedraw = true;
}
return HANDLED;
case KEY_RIGHT:
- case KEY_CTRLF:
+ case 'l':
super->scrollH += CRT_scrollHAmount;
super->needsRedraw = true;
return HANDLED;
diff --git a/Panel.c b/Panel.c
index 1c45714..395665c 100644
--- a/Panel.c
+++ b/Panel.c
@@ -86,6 +86,8 @@ struct Panel_ {
#define KEY_CTRLP 0020 /* control-p key */
#define KEY_CTRLF 0006 /* control-f key */
#define KEY_CTRLB 0002 /* control-b key */
+#define KEY_CTRLU 0025 /* control-u key */
+#define KEY_CTRLD 0004 /* control-d key */
PanelClass Panel_class = {
.super = {
@@ -372,14 +374,16 @@ void Panel_draw(Panel* this, bool focus) {
bool Panel_onKey(Panel* this, int key) {
assert (this != NULL);
-
+
int size = Vector_size(this->items);
switch (key) {
case KEY_DOWN:
+ case 'j':
case KEY_CTRLN:
this->selected++;
break;
case KEY_UP:
+ case 'k':
case KEY_CTRLP:
this->selected--;
break;
@@ -394,23 +398,33 @@ bool Panel_onKey(Panel* this, int key) {
break;
#endif
case KEY_LEFT:
- case KEY_CTRLB:
+ case 'h':
if (this->scrollH > 0) {
this->scrollH -= CRT_scrollHAmount;
this->needsRedraw = true;
}
break;
case KEY_RIGHT:
- case KEY_CTRLF:
+ case 'l':
this->scrollH += CRT_scrollHAmount;
this->needsRedraw = true;
break;
+ case KEY_CTRLU:
+ this->selected -= (this->h - 1) / 2;
+ this->needsRedraw = true;
+ break;
+ case KEY_CTRLD:
+ this->selected += (this->h - 1) / 2;
+ this->needsRedraw = true;
+ break;
case KEY_PPAGE:
+ case KEY_CTRLB:
this->selected -= (this->h - 1);
this->scrollV -= (this->h - 1);
this->needsRedraw = true;
break;
case KEY_NPAGE:
+ case KEY_CTRLF:
this->selected += (this->h - 1);
this->scrollV += (this->h - 1);
this->needsRedraw = true;
@@ -431,9 +445,11 @@ bool Panel_onKey(Panel* this, int key) {
break;
}
case KEY_HOME:
+ case 'g':
this->selected = 0;
break;
case KEY_END:
+ case 'G':
this->selected = size - 1;
break;
default:
diff --git a/Panel.h b/Panel.h
index 6789770..22a0f3f 100644
--- a/Panel.h
+++ b/Panel.h
@@ -74,6 +74,8 @@ struct Panel_ {
#define KEY_CTRLP 0020 /* control-p key */
#define KEY_CTRLF 0006 /* control-f key */
#define KEY_CTRLB 0002 /* control-b key */
+#define KEY_CTRLU 0025 /* control-u key */
+#define KEY_CTRLD 0004 /* control-d key */
extern PanelClass Panel_class;
diff --git a/README b/README
index 1af7377..92a76be 100644
--- a/README
+++ b/README
@@ -17,6 +17,44 @@ but we also have code for running under FreeBSD and Mac OS X
This software has evolved considerably over the years,
and is reasonably complete, but there is always room for improvement.
+Vim keybindings
+----------------
+
+These are the keybindings added in this fork of htop:
+
+```
+ g to the top (gg in vim)
+
+ <C-b> up 1 page
+
+ <C-u> up 1/2 page
+
+ k
+
+h l one character
+
+ j
+
+ <C-d> down 1/2 page
+
+ <C-f> down 1 page
+
+ G to the end
+
+--------------------------------------------------
+
+ o Expand/collapse (like in NERDTree)
+```
+
+In order to accomodate these keybindings, the following changes
+were made to the original keybindings:
+
+* Ctrl+F and Ctrt+B can now longer be used to navigate horizontally
+* 'h' can no longer be used to access the help, leaving Ctrl+F1 & '?'
+* 'k' can no longer be used to kill processes, being replaced with 'x'
+* 'l' can no longer be used to list open files, being replaced with 'L'
+
+
Comparison between `htop` and classic `top`
-------------------------------------------
diff --git a/ScreenManager.c b/ScreenManager.c
index db3fdee..7c935bc 100644
--- a/ScreenManager.c
+++ b/ScreenManager.c
@@ -279,7 +279,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
continue;
}
case KEY_LEFT:
- case KEY_CTRLB:
+ case 'h':
if (!this->allowFocusChange)
break;
tryLeft:
@@ -290,7 +290,7 @@ void ScreenManager_run(ScreenManager* this, Panel** lastFocus, int* lastKey) {
goto tryLeft;
break;
case KEY_RIGHT:
- case KEY_CTRLF:
+ case 'l':
case 9:
if (!this->allowFocusChange)
break;
|