emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

top: map additional navigation keys

Browse Source 
There were some gaps in the alternate navigation keys
top provided.  Additionally, some inconsistencies
existed in the supporting key table.

This commit adds the following new key equivalents,
mirroring the standard vim navigation keys:
. ctrl+alt+ k = pgup, ctrl+alt+ j = pgdown
. ctrl+alt+ h = home, ctrl+alt+ l = end

Also, the supporting table entries now consistently
follow these "directions":
. up/pgup, down/pgdown, left/home, right/end

Signed-off-by: Jim Warner <james.warner@comcast.net>
This commit is contained in:
Jim Warner 2012-10-01 11:11:01 -05:00 committed by Craig Small
parent edd8aae5ba
commit bff927711b
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
top/top.c
View File

@ -891,17 +891,21 @@ static int keyin (int init) {
int key; int key;
} tinfo_tab[] = { } tinfo_tab[] = {
{ "\n", kbd_ENTER }, { NULL, kbd_UP }, { NULL, kbd_DOWN }, { "\n", kbd_ENTER }, { NULL, kbd_UP }, { NULL, kbd_DOWN },
{ NULL, kbd_RIGHT }, { NULL, kbd_LEFT }, { NULL, kbd_PGUP }, { NULL, kbd_LEFT }, { NULL, kbd_RIGHT }, { NULL, kbd_PGUP },
{ NULL, kbd_PGDN }, { NULL, kbd_END }, { NULL, kbd_HOME }, { NULL, kbd_PGDN }, { NULL, kbd_HOME }, { NULL, kbd_END },
{ NULL, kbd_BKSP }, { NULL, kbd_INS }, { NULL, kbd_DEL }, { NULL, kbd_BKSP }, { NULL, kbd_INS }, { NULL, kbd_DEL },
// next 4 destined to be meta + arrow keys... // next 4 destined to be meta + arrow keys...
{ buf12, kbd_PGUP }, { buf13, kbd_PGDN }, { buf12, kbd_PGUP }, { buf13, kbd_PGDN },
{ buf14, kbd_END }, { buf15, kbd_HOME }, { buf14, kbd_HOME }, { buf15, kbd_END },
// remainder are alternatives for above, just in case // remainder are alternatives for above, just in case...
// ( the k,j,l,h entries are meta key + vim cursor motion keys ) // ( the k,j,l,h entries are the vim cursor motion keys )
{ "\033\\",kbd_UP }, { "\033/", kbd_DOWN }, { "\033>", kbd_RIGHT }, { "\033\\", kbd_UP }, { "\033/", kbd_DOWN }, /* meta+ \,/ */
{ "\033<", kbd_LEFT }, { "\033k", kbd_UP }, { "\033j", kbd_DOWN }, { "\033<", kbd_LEFT }, { "\033>", kbd_RIGHT }, /* meta+ <,> */
{ "\033l", kbd_RIGHT }, { "\033h", kbd_LEFT } }; { "\033k", kbd_UP }, { "\033j", kbd_DOWN }, /* meta+ k,j */
{ "\033h", kbd_LEFT }, { "\033l", kbd_RIGHT }, /* meta+ h,l */
{ "\033\013", kbd_PGUP }, { "\033\012", kbd_PGDN }, /* ctrl+meta+ k,j */
{ "\033\010", kbd_HOME }, { "\033\014", kbd_END } /* ctrl+meta+ h,l */
};
char buf[SMLBUFSIZ], *pb; char buf[SMLBUFSIZ], *pb;
int i; int i;
@ -909,19 +913,19 @@ static int keyin (int init) {
#define tOk(s) s ? s : "" #define tOk(s) s ? s : ""
tinfo_tab[1].str = tOk(key_up); tinfo_tab[1].str = tOk(key_up);
tinfo_tab[2].str = tOk(key_down); tinfo_tab[2].str = tOk(key_down);
tinfo_tab[3].str = tOk(key_right); tinfo_tab[3].str = tOk(key_left);
tinfo_tab[4].str = tOk(key_left); tinfo_tab[4].str = tOk(key_right);
tinfo_tab[5].str = tOk(key_ppage); tinfo_tab[5].str = tOk(key_ppage);
tinfo_tab[6].str = tOk(key_npage); tinfo_tab[6].str = tOk(key_npage);
tinfo_tab[7].str = tOk(key_end); tinfo_tab[7].str = tOk(key_home);
tinfo_tab[8].str = tOk(key_home); tinfo_tab[8].str = tOk(key_end);
tinfo_tab[9].str = tOk(key_backspace); tinfo_tab[9].str = tOk(key_backspace);
tinfo_tab[10].str = tOk(key_ic); tinfo_tab[10].str = tOk(key_ic);
tinfo_tab[11].str = tOk(key_dc); tinfo_tab[11].str = tOk(key_dc);
STRLCPY(buf12, fmtmk("\033%s", tOk(key_up))); STRLCPY(buf12, fmtmk("\033%s", tOk(key_up)));
STRLCPY(buf13, fmtmk("\033%s", tOk(key_down))); STRLCPY(buf13, fmtmk("\033%s", tOk(key_down)));
STRLCPY(buf14, fmtmk("\033%s", tOk(key_right))); STRLCPY(buf14, fmtmk("\033%s", tOk(key_left)));
STRLCPY(buf15, fmtmk("\033%s", tOk(key_left))); STRLCPY(buf15, fmtmk("\033%s", tOk(key_right)));
// next is critical so returned results match bound terminfo keys // next is critical so returned results match bound terminfo keys
putp(tOk(keypad_xmit)); putp(tOk(keypad_xmit));
// ( see the converse keypad_local at program end, just in case ) // ( see the converse keypad_local at program end, just in case )