diff options
| author | Tiago Cunha <tcunha@gmx.com> | 2009-07-22 16:24:59 +0000 |
|---|---|---|
| committer | Tiago Cunha <tcunha@gmx.com> | 2009-07-22 16:24:59 +0000 |
| commit | a734488a4b84752000ee511b57f07d91ddc28a6d (patch) | |
| tree | 091cec0e80ba02bc776c3ae1263c37dd2c9e670f /key-bindings.c | |
| parent | 94e2339842b813b608fa7726f67b985eb8592712 (diff) | |
| download | rtmux-a734488a4b84752000ee511b57f07d91ddc28a6d.tar.gz rtmux-a734488a4b84752000ee511b57f07d91ddc28a6d.tar.bz2 rtmux-a734488a4b84752000ee511b57f07d91ddc28a6d.zip | |
Sync OpenBSD patchset 151:
Tidy up keys: use an enum for the key codes, and remove the macros which just
wrap flag sets/clears/tests.
Diffstat (limited to 'key-bindings.c')
| -rw-r--r-- | key-bindings.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/key-bindings.c b/key-bindings.c index cd8cac67..1da4da1c 100644 --- a/key-bindings.c +++ b/key-bindings.c @@ -1,4 +1,4 @@ -/* $Id: key-bindings.c,v 1.77 2009-07-20 15:42:05 tcunha Exp $ */ +/* $Id: key-bindings.c,v 1.78 2009-07-22 16:24:59 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -133,24 +133,24 @@ key_bindings_init(void) { '{', 0, &cmd_swap_pane_entry }, { '}', 0, &cmd_swap_pane_entry }, { '\002', 0, &cmd_send_prefix_entry }, - { KEYC_ADDESC('1'), 0, &cmd_select_layout_entry }, - { KEYC_ADDESC('2'), 0, &cmd_select_layout_entry }, - { KEYC_ADDESC('3'), 0, &cmd_select_layout_entry }, - { KEYC_ADDESC('4'), 0, &cmd_select_layout_entry }, + { '1' | KEYC_ESCAPE, 0, &cmd_select_layout_entry }, + { '2' | KEYC_ESCAPE, 0, &cmd_select_layout_entry }, + { '3' | KEYC_ESCAPE, 0, &cmd_select_layout_entry }, + { '4' | KEYC_ESCAPE, 0, &cmd_select_layout_entry }, { KEYC_PPAGE, 0, &cmd_scroll_mode_entry }, - { KEYC_ADDESC('n'), 0, &cmd_next_window_entry }, - { KEYC_ADDESC('p'), 0, &cmd_previous_window_entry }, + { 'n' | KEYC_ESCAPE, 0, &cmd_next_window_entry }, + { 'p' | KEYC_ESCAPE, 0, &cmd_previous_window_entry }, { KEYC_UP, 0, &cmd_up_pane_entry }, { KEYC_DOWN, 0, &cmd_down_pane_entry }, - { KEYC_ADDESC(KEYC_UP), 1, &cmd_resize_pane_entry }, - { KEYC_ADDESC(KEYC_DOWN), 1, &cmd_resize_pane_entry }, - { KEYC_ADDESC(KEYC_LEFT), 1, &cmd_resize_pane_entry }, - { KEYC_ADDESC(KEYC_RIGHT),1, &cmd_resize_pane_entry }, - { KEYC_ADDCTL(KEYC_UP), 1, &cmd_resize_pane_entry }, - { KEYC_ADDCTL(KEYC_DOWN), 1, &cmd_resize_pane_entry }, - { KEYC_ADDCTL(KEYC_LEFT), 1, &cmd_resize_pane_entry }, - { KEYC_ADDCTL(KEYC_RIGHT),1, &cmd_resize_pane_entry }, - { KEYC_ADDESC('o'), 0, &cmd_rotate_window_entry }, + { KEYC_UP | KEYC_ESCAPE, 1, &cmd_resize_pane_entry }, + { KEYC_DOWN | KEYC_ESCAPE, 1, &cmd_resize_pane_entry }, + { KEYC_LEFT | KEYC_ESCAPE, 1, &cmd_resize_pane_entry }, + { KEYC_RIGHT | KEYC_ESCAPE, 1, &cmd_resize_pane_entry }, + { KEYC_UP | KEYC_CTRL, 1, &cmd_resize_pane_entry }, + { KEYC_DOWN | KEYC_CTRL, 1, &cmd_resize_pane_entry }, + { KEYC_LEFT | KEYC_CTRL, 1, &cmd_resize_pane_entry }, + { KEYC_RIGHT | KEYC_CTRL, 1, &cmd_resize_pane_entry }, + { 'o' | KEYC_ESCAPE, 0, &cmd_rotate_window_entry }, { '\017', 0, &cmd_rotate_window_entry }, }; u_int i; |