From 3c37b0927269819945c0520a8eeb79a2a67ec1c5 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Mon, 8 Feb 2010 18:13:17 +0000 Subject: Sync OpenBSD patchset 636: Rectangle copy support, from Robin Lee Powell. --- mode-key.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'mode-key.c') diff --git a/mode-key.c b/mode-key.c index 976707e6..5c15ca7e 100644 --- a/mode-key.c +++ b/mode-key.c @@ -1,4 +1,4 @@ -/* $Id: mode-key.c,v 1.42 2010-02-05 01:34:08 tcunha Exp $ */ +/* $Id: mode-key.c,v 1.43 2010-02-08 18:13:17 tcunha Exp $ */ /* * Copyright (c) 2008 Nicholas Marriott @@ -89,6 +89,7 @@ struct mode_key_cmdstr mode_key_cmdstr_copy[] = { { MODEKEYCOPY_HISTORYBOTTOM, "history-bottom" }, { MODEKEYCOPY_HISTORYTOP, "history-top" }, { MODEKEYCOPY_LEFT, "cursor-left" }, + { MODEKEYCOPY_RECTANGLETOGGLE, "rectangle-toggle" }, { MODEKEYCOPY_MIDDLELINE, "middle-line" }, { MODEKEYCOPY_NEXTPAGE, "page-down" }, { MODEKEYCOPY_NEXTSPACE, "next-space" }, @@ -207,6 +208,7 @@ const struct mode_key_entry mode_key_vi_copy[] = { { 'l', 0, MODEKEYCOPY_RIGHT }, { 'n', 0, MODEKEYCOPY_SEARCHAGAIN }, { 'q', 0, MODEKEYCOPY_CANCEL }, + { 'v', 0, MODEKEYCOPY_RECTANGLETOGGLE }, { 'w', 0, MODEKEYCOPY_NEXTWORD }, { KEYC_BSPACE, 0, MODEKEYCOPY_LEFT }, { KEYC_DOWN | KEYC_CTRL,0, MODEKEYCOPY_SCROLLDOWN }, @@ -276,9 +278,10 @@ struct mode_key_tree mode_key_tree_emacs_choice; /* emacs copy mode keys. */ const struct mode_key_entry mode_key_emacs_copy[] = { { ' ', 0, MODEKEYCOPY_NEXTPAGE }, - { '<' | KEYC_ESCAPE,0, MODEKEYCOPY_HISTORYTOP }, - { '>' | KEYC_ESCAPE, 0, MODEKEYCOPY_HISTORYBOTTOM }, + { '<' | KEYC_ESCAPE, 0, MODEKEYCOPY_HISTORYTOP }, + { '>' | KEYC_ESCAPE, 0, MODEKEYCOPY_HISTORYBOTTOM }, { 'R' | KEYC_ESCAPE, 0, MODEKEYCOPY_TOPLINE }, + { 'R', 0, MODEKEYCOPY_RECTANGLETOGGLE }, { '\000' /* C-Space */, 0, MODEKEYCOPY_STARTSELECTION }, { '\001' /* C-a */, 0, MODEKEYCOPY_STARTOFLINE }, { '\002' /* C-b */, 0, MODEKEYCOPY_LEFT }, -- cgit