===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/mode-key.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/tmux/Attic/mode-key.c	2009/08/13 23:44:18	1.14
--- src/usr.bin/tmux/Attic/mode-key.c	2009/08/18 07:08:26	1.15
***************
*** 1,4 ****
! /* $OpenBSD: mode-key.c,v 1.14 2009/08/13 23:44:18 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: mode-key.c,v 1.15 2009/08/18 07:08:26 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 74,91 ****
  
  /* Copy keys command strings. */
  struct mode_key_cmdstr mode_key_cmdstr_copy[] = {
- 	{ MODEKEYCOPY_CANCEL, "cancel" },
  	{ MODEKEYCOPY_BACKTOINDENTATION, "back-to-indentation" },
  	{ MODEKEYCOPY_CLEARSELECTION, "clear-selection" },
  	{ MODEKEYCOPY_COPYSELECTION, "copy-selection" },
  	{ MODEKEYCOPY_DOWN, "cursor-down" },
  	{ MODEKEYCOPY_ENDOFLINE, "end-of-line" },
  	{ MODEKEYCOPY_LEFT, "cursor-left" },
  	{ MODEKEYCOPY_NEXTPAGE, "page-down" },
  	{ MODEKEYCOPY_NEXTWORD, "next-word" },
  	{ MODEKEYCOPY_PREVIOUSPAGE, "page-up" },
  	{ MODEKEYCOPY_PREVIOUSWORD, "previous-word" },
  	{ MODEKEYCOPY_RIGHT, "cursor-right" },
  	{ MODEKEYCOPY_STARTOFLINE, "start-of-line" },
  	{ MODEKEYCOPY_STARTSELECTION, "begin-selection" },
  	{ MODEKEYCOPY_UP, "cursor-up" },
--- 74,95 ----
  
  /* Copy keys command strings. */
  struct mode_key_cmdstr mode_key_cmdstr_copy[] = {
  	{ MODEKEYCOPY_BACKTOINDENTATION, "back-to-indentation" },
+ 	{ MODEKEYCOPY_CANCEL, "cancel" },
  	{ MODEKEYCOPY_CLEARSELECTION, "clear-selection" },
  	{ MODEKEYCOPY_COPYSELECTION, "copy-selection" },
  	{ MODEKEYCOPY_DOWN, "cursor-down" },
  	{ MODEKEYCOPY_ENDOFLINE, "end-of-line" },
+ 	{ MODEKEYCOPY_GOTOLINE, "goto-line" },
  	{ MODEKEYCOPY_LEFT, "cursor-left" },
  	{ MODEKEYCOPY_NEXTPAGE, "page-down" },
  	{ MODEKEYCOPY_NEXTWORD, "next-word" },
  	{ MODEKEYCOPY_PREVIOUSPAGE, "page-up" },
  	{ MODEKEYCOPY_PREVIOUSWORD, "previous-word" },
  	{ MODEKEYCOPY_RIGHT, "cursor-right" },
+ 	{ MODEKEYCOPY_SEARCHAGAIN, "search-again" },
+ 	{ MODEKEYCOPY_SEARCHDOWN, "search-forward" },
+ 	{ MODEKEYCOPY_SEARCHUP, "search-backward" },
  	{ MODEKEYCOPY_STARTOFLINE, "start-of-line" },
  	{ MODEKEYCOPY_STARTSELECTION, "begin-selection" },
  	{ MODEKEYCOPY_UP, "cursor-up" },
***************
*** 148,154 ****
--- 152,160 ----
  const struct mode_key_entry mode_key_vi_copy[] = {
  	{ ' ',			0, MODEKEYCOPY_STARTSELECTION },
  	{ '$',			0, MODEKEYCOPY_ENDOFLINE },
+ 	{ '/',			0, MODEKEYCOPY_SEARCHUP },
  	{ '0',			0, MODEKEYCOPY_STARTOFLINE },
+ 	{ '?',			0, MODEKEYCOPY_SEARCHDOWN },
  	{ '\002' /* C-b */,	0, MODEKEYCOPY_PREVIOUSPAGE },
  	{ '\003' /* C-c */,	0, MODEKEYCOPY_CANCEL },
  	{ '\004' /* C-d */,	0, MODEKEYCOPY_HALFPAGEDOWN },
***************
*** 159,168 ****
--- 165,176 ----
  	{ '\r',			0, MODEKEYCOPY_COPYSELECTION },
  	{ '^',			0, MODEKEYCOPY_BACKTOINDENTATION },
  	{ 'b',			0, MODEKEYCOPY_PREVIOUSWORD },
+ 	{ 'g',			0, MODEKEYCOPY_GOTOLINE },
  	{ 'h',			0, MODEKEYCOPY_LEFT },
  	{ 'j',			0, MODEKEYCOPY_DOWN },
  	{ 'k',			0, MODEKEYCOPY_UP },
  	{ 'l',			0, MODEKEYCOPY_RIGHT },
+ 	{ 'n',			0, MODEKEYCOPY_SEARCHAGAIN },
  	{ 'q',			0, MODEKEYCOPY_CANCEL },
  	{ 'w',			0, MODEKEYCOPY_NEXTWORD },
  	{ KEYC_BSPACE,		0, MODEKEYCOPY_LEFT },
***************
*** 232,243 ****
--- 240,255 ----
  	{ '\007' /* C-g */,	0, MODEKEYCOPY_CLEARSELECTION },
  	{ '\016' /* C-n */,	0, MODEKEYCOPY_DOWN },
  	{ '\020' /* C-p */,	0, MODEKEYCOPY_UP },
+ 	{ '\022' /* C-r */,	0, MODEKEYCOPY_SEARCHUP },
+ 	{ '\023' /* C-s */,	0, MODEKEYCOPY_SEARCHDOWN },
  	{ '\026' /* C-v */,	0, MODEKEYCOPY_NEXTPAGE },
  	{ '\027' /* C-w */,	0, MODEKEYCOPY_COPYSELECTION },
  	{ '\033' /* Escape */,	0, MODEKEYCOPY_CANCEL },
  	{ 'b' | KEYC_ESCAPE,	0, MODEKEYCOPY_PREVIOUSWORD },
  	{ 'f' | KEYC_ESCAPE,	0, MODEKEYCOPY_NEXTWORD },
+ 	{ 'g',			0, MODEKEYCOPY_GOTOLINE },
  	{ 'm' | KEYC_ESCAPE,	0, MODEKEYCOPY_BACKTOINDENTATION },
+ 	{ 'n',			0, MODEKEYCOPY_SEARCHAGAIN },
  	{ 'q',			0, MODEKEYCOPY_CANCEL },
  	{ 'v' | KEYC_ESCAPE,	0, MODEKEYCOPY_PREVIOUSPAGE },
  	{ 'w' | KEYC_ESCAPE,	0, MODEKEYCOPY_COPYSELECTION },