summaryrefslogtreecommitdiffstats
path: root/key-bindings.c
diff options
context:
space:
mode:
authorTiago Cunha <tcunha@gmx.com>2009-07-20 15:42:05 +0000
committerTiago Cunha <tcunha@gmx.com>2009-07-20 15:42:05 +0000
commit545893df73034b2729c2f501252f50fcb8eb9f47 (patch)
tree48f8f96b61397f232666634f6657df7974d0a9cf /key-bindings.c
parent680f2098f186224aefb78df78c3cdefbf232d315 (diff)
Sync OpenBSD patchset 142:
Each window now has a tree of layout cells associated with it. In this tree, each node is either a horizontal or vertical cell containing a list of other cells running from left-to-right or top-to-bottom, or a leaf cell which is associated with a pane. The major functional changes are: - panes may now be split arbitrarily both horizontally (splitw -h, C-b %) and vertically (splitw -v, C-b "); - panes may be resized both horizontally and vertically (resizep -L/-R/-U/-D, bound to C-b left/right/up/down and C-b M-left/right/up/down); - layouts are now applied and then may be modified by resizing or splitting panes, rather than being fixed and reapplied when the window is resized or panes are added; - manual-vertical layout is no longer necessary, and active-only layout is gone (but may return in future); - the main-pane layouts now reduce the size of the main pane to fit all panes if possible. Thanks to all who tested.
Diffstat (limited to 'key-bindings.c')
-rw-r--r--key-bindings.c15
1 files changed, 10 insertions, 5 deletions
diff --git a/key-bindings.c b/key-bindings.c
index a9cea9a4..cd8cac67 100644
--- a/key-bindings.c
+++ b/key-bindings.c
@@ -1,4 +1,4 @@
-/* $Id: key-bindings.c,v 1.76 2009-07-18 11:05:45 nicm Exp $ */
+/* $Id: key-bindings.c,v 1.77 2009-07-20 15:42:05 tcunha Exp $ */
/*
* Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -93,7 +93,8 @@ key_bindings_init(void)
} table[] = {
{ ' ', 0, &cmd_next_layout_entry },
{ '!', 0, &cmd_break_pane_entry },
- { '"', 0, &cmd_split_window_entry },
+ { '"', 0, &cmd_split_window_entry },
+ { '%', 0, &cmd_split_window_entry },
{ '#', 0, &cmd_list_buffers_entry },
{ '&', 0, &cmd_confirm_before_entry },
{ ',', 0, &cmd_command_prompt_entry },
@@ -132,10 +133,10 @@ key_bindings_init(void)
{ '{', 0, &cmd_swap_pane_entry },
{ '}', 0, &cmd_swap_pane_entry },
{ '\002', 0, &cmd_send_prefix_entry },
- { KEYC_ADDESC('0'), 0, &cmd_select_layout_entry },
{ KEYC_ADDESC('1'), 0, &cmd_select_layout_entry },
{ KEYC_ADDESC('2'), 0, &cmd_select_layout_entry },
- { KEYC_ADDESC('9'), 0, &cmd_select_layout_entry },
+ { KEYC_ADDESC('3'), 0, &cmd_select_layout_entry },
+ { KEYC_ADDESC('4'), 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 },
@@ -143,8 +144,12 @@ key_bindings_init(void)
{ 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_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 },
{ '\017', 0, &cmd_rotate_window_entry },
};