aboutsummaryrefslogtreecommitdiff
path: root/key-bindings.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-11-19 22:20:04 +0000
committerTiago Cunha <tcunha@gmx.com>2009-11-19 22:20:04 +0000
commitacc331c787f4d85c0909563139f7cc81c54edc55 (patch)
treea60e276b1f7ffffe8f5dec00fac1c721ae4121d2 /key-bindings.c
parent8777a809dc06282c74fad56d2b76c9c2770c89d4 (diff)
downloadrtmux-acc331c787f4d85c0909563139f7cc81c54edc55.tar.gz
rtmux-acc331c787f4d85c0909563139f7cc81c54edc55.tar.bz2
rtmux-acc331c787f4d85c0909563139f7cc81c54edc55.zip
Sync OpenBSD patchset 546:
Add a per-client log of status line messages displayed while that client exists. A new message-limit session option sets the maximum number of entries and a command, show-messages, shows the log (bound to ~ by default). This (and prompt history) might be better as a single global log but until there are global options it is easier for them to be per client.
Diffstat (limited to 'key-bindings.c')
-rw-r--r--key-bindings.c13
1 files changed, 7 insertions, 6 deletions
diff --git a/key-bindings.c b/key-bindings.c
index bdf67233..eb36f5b4 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -1,4 +1,4 @@
-/* $Id: key-bindings.c,v 1.84 2009-11-13 16:58:24 tcunha Exp $ */
+/* $Id: key-bindings.c,v 1.85 2009-11-19 22:20:04 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -105,8 +105,8 @@ key_bindings_init(void)
{ ' ', 0, &cmd_next_layout_entry },
{ '!', 0, &cmd_break_pane_entry },
{ '"', 0, &cmd_split_window_entry },
- { '%', 0, &cmd_split_window_entry },
{ '#', 0, &cmd_list_buffers_entry },
+ { '%', 0, &cmd_split_window_entry },
{ '&', 0, &cmd_confirm_before_entry },
{ ',', 0, &cmd_command_prompt_entry },
{ '-', 0, &cmd_delete_buffer_entry },
@@ -123,13 +123,15 @@ key_bindings_init(void)
{ '9', 0, &cmd_select_window_entry },
{ ':', 0, &cmd_command_prompt_entry },
{ '?', 0, &cmd_list_keys_entry },
+ { 'D', 0, &cmd_choose_client_entry },
{ '[', 0, &cmd_copy_mode_entry },
{ '\'', 0, &cmd_select_prompt_entry },
+ { '\002', /* C-b */ 0, &cmd_send_prefix_entry },
+ { '\017', /* C-o */ 0, &cmd_rotate_window_entry },
{ '\032', /* C-z */ 0, &cmd_suspend_client_entry },
{ ']', 0, &cmd_paste_buffer_entry },
{ 'c', 0, &cmd_new_window_entry },
{ 'd', 0, &cmd_detach_client_entry },
- { 'D', 0, &cmd_choose_client_entry },
{ 'f', 0, &cmd_command_prompt_entry },
{ 'i', 0, &cmd_display_message_entry },
{ 'l', 0, &cmd_last_window_entry },
@@ -144,13 +146,14 @@ key_bindings_init(void)
{ 'x', 0, &cmd_confirm_before_entry },
{ '{', 0, &cmd_swap_pane_entry },
{ '}', 0, &cmd_swap_pane_entry },
- { '\002', /* C-b */ 0, &cmd_send_prefix_entry },
+ { '~', 0, &cmd_show_messages_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_copy_mode_entry },
{ 'n' | KEYC_ESCAPE, 0, &cmd_next_window_entry },
+ { 'o' | KEYC_ESCAPE, 0, &cmd_rotate_window_entry },
{ 'p' | KEYC_ESCAPE, 0, &cmd_previous_window_entry },
{ KEYC_UP, 0, &cmd_up_pane_entry },
{ KEYC_DOWN, 0, &cmd_down_pane_entry },
@@ -162,8 +165,6 @@ key_bindings_init(void)
{ 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', /* C-o */ 0, &cmd_rotate_window_entry },
};
u_int i;
struct cmd *cmd;