aboutsummaryrefslogtreecommitdiff
path: root/key-bindings.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-08-25 13:53:39 +0000
committerTiago Cunha <tcunha@gmx.com>2009-08-25 13:53:39 +0000
commit8fd77cbb5b9e81a14d52f9ddcf765d3ce557ed86 (patch)
treef15f24cd859da56f60f2fcac20b2b3dd565e0ae3 /key-bindings.c
parentc1653ff65452c01f0c2c41dbcb3c6d0eb241348b (diff)
downloadrtmux-8fd77cbb5b9e81a14d52f9ddcf765d3ce557ed86.tar.gz
rtmux-8fd77cbb5b9e81a14d52f9ddcf765d3ce557ed86.tar.bz2
rtmux-8fd77cbb5b9e81a14d52f9ddcf765d3ce557ed86.zip
Sync OpenBSD patchset 294:
Add a choose-client command and extend choose-{session,window} to accept a template. After a choice is made, %% (or %1) in the template is replaced by the name of the session, window or client suitable for -t and the result executed as a command. So, for example, "choose-window "killw -t '%%'"" will kill the selected window. The defaults if no template is given are (as now) select-window for choose-window, switch-client for choose-session, and detach-client for choose-client (now bound to D).
Diffstat (limited to 'key-bindings.c')
-rw-r--r--key-bindings.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/key-bindings.c b/key-bindings.c
index 56b0fb71..0c711aa1 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -1,4 +1,4 @@
-/* $Id: key-bindings.c,v 1.80 2009-08-24 16:24:18 tcunha Exp $ */
+/* $Id: key-bindings.c,v 1.81 2009-08-25 13:53:39 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -130,6 +130,7 @@ key_bindings_init(void)
{ ']', 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 },
@@ -143,7 +144,7 @@ key_bindings_init(void)
{ 'x', 0, &cmd_confirm_before_entry },
{ '{', 0, &cmd_swap_pane_entry },
{ '}', 0, &cmd_swap_pane_entry },
- { '\002', 0, &cmd_send_prefix_entry },
+ { '\002', /* C-b */ 0, &cmd_send_prefix_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 },
@@ -162,7 +163,7 @@ key_bindings_init(void)
{ 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 },
+ { '\017', /* C-o */ 0, &cmd_rotate_window_entry },
};
u_int i;
struct cmd *cmd;