===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/mode-key.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -c -r1.69 -r1.70
*** src/usr.bin/tmux/Attic/mode-key.c	2016/09/12 15:40:58	1.69
--- src/usr.bin/tmux/Attic/mode-key.c	2016/10/10 21:29:23	1.70
***************
*** 1,4 ****
! /* $OpenBSD: mode-key.c,v 1.69 2016/09/12 15:40:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: mode-key.c,v 1.70 2016/10/10 21:29:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 54,60 ****
  };
  
  /* Edit keys command strings. */
! const struct mode_key_cmdstr mode_key_cmdstr_edit[] = {
  	{ MODEKEYEDIT_BACKSPACE, "backspace" },
  	{ MODEKEYEDIT_CANCEL, "cancel" },
  	{ MODEKEYEDIT_COMPLETE, "complete" },
--- 54,60 ----
  };
  
  /* Edit keys command strings. */
! static const struct mode_key_cmdstr mode_key_cmdstr_edit[] = {
  	{ MODEKEYEDIT_BACKSPACE, "backspace" },
  	{ MODEKEYEDIT_CANCEL, "cancel" },
  	{ MODEKEYEDIT_COMPLETE, "complete" },
***************
*** 89,95 ****
  };
  
  /* Choice keys command strings. */
! const struct mode_key_cmdstr mode_key_cmdstr_choice[] = {
  	{ MODEKEYCHOICE_BACKSPACE, "backspace" },
  	{ MODEKEYCHOICE_BOTTOMLINE, "bottom-line"},
  	{ MODEKEYCHOICE_CANCEL, "cancel" },
--- 89,95 ----
  };
  
  /* Choice keys command strings. */
! static const struct mode_key_cmdstr mode_key_cmdstr_choice[] = {
  	{ MODEKEYCHOICE_BACKSPACE, "backspace" },
  	{ MODEKEYCHOICE_BOTTOMLINE, "bottom-line"},
  	{ MODEKEYCHOICE_CANCEL, "cancel" },
***************
*** 114,120 ****
  };
  
  /* Copy keys command strings. */
! const struct mode_key_cmdstr mode_key_cmdstr_copy[] = {
  	{ MODEKEYCOPY_APPENDSELECTION, "append-selection" },
  	{ MODEKEYCOPY_BACKTOINDENTATION, "back-to-indentation" },
  	{ MODEKEYCOPY_BOTTOMLINE, "bottom-line" },
--- 114,120 ----
  };
  
  /* Copy keys command strings. */
! static const struct mode_key_cmdstr mode_key_cmdstr_copy[] = {
  	{ MODEKEYCOPY_APPENDSELECTION, "append-selection" },
  	{ MODEKEYCOPY_BACKTOINDENTATION, "back-to-indentation" },
  	{ MODEKEYCOPY_BOTTOMLINE, "bottom-line" },
***************
*** 170,176 ****
  };
  
  /* vi editing keys. */
! const struct mode_key_entry mode_key_vi_edit[] = {
  	{ '\003' /* C-c */,	    0, MODEKEYEDIT_CANCEL, 1 },
  	{ '\010' /* C-h */,	    0, MODEKEYEDIT_BACKSPACE, 1 },
  	{ '\011' /* Tab */,	    0, MODEKEYEDIT_COMPLETE, 1 },
--- 170,176 ----
  };
  
  /* vi editing keys. */
! static const struct mode_key_entry mode_key_vi_edit[] = {
  	{ '\003' /* C-c */,	    0, MODEKEYEDIT_CANCEL, 1 },
  	{ '\010' /* C-h */,	    0, MODEKEYEDIT_BACKSPACE, 1 },
  	{ '\011' /* Tab */,	    0, MODEKEYEDIT_COMPLETE, 1 },
***************
*** 229,235 ****
  struct mode_key_tree mode_key_tree_vi_edit;
  
  /* vi choice selection keys. */
! const struct mode_key_entry mode_key_vi_choice[] = {
  	{ '0' | KEYC_ESCAPE,	    0, MODEKEYCHOICE_STARTNUMBERPREFIX, 1 },
  	{ '1' | KEYC_ESCAPE,	    0, MODEKEYCHOICE_STARTNUMBERPREFIX, 1 },
  	{ '2' | KEYC_ESCAPE,	    0, MODEKEYCHOICE_STARTNUMBERPREFIX, 1 },
--- 229,235 ----
  struct mode_key_tree mode_key_tree_vi_edit;
  
  /* vi choice selection keys. */
! static const struct mode_key_entry mode_key_vi_choice[] = {
  	{ '0' | KEYC_ESCAPE,	    0, MODEKEYCHOICE_STARTNUMBERPREFIX, 1 },
  	{ '1' | KEYC_ESCAPE,	    0, MODEKEYCHOICE_STARTNUMBERPREFIX, 1 },
  	{ '2' | KEYC_ESCAPE,	    0, MODEKEYCHOICE_STARTNUMBERPREFIX, 1 },
***************
*** 278,284 ****
  struct mode_key_tree mode_key_tree_vi_choice;
  
  /* vi copy mode keys. */
! const struct mode_key_entry mode_key_vi_copy[] = {
  	{ ' ',			    0, MODEKEYCOPY_STARTSELECTION, 1 },
  	{ '"',			    0, MODEKEYCOPY_STARTNAMEDBUFFER, 1 },
  	{ '$',			    0, MODEKEYCOPY_ENDOFLINE, 1 },
--- 278,284 ----
  struct mode_key_tree mode_key_tree_vi_choice;
  
  /* vi copy mode keys. */
! static const struct mode_key_entry mode_key_vi_copy[] = {
  	{ ' ',			    0, MODEKEYCOPY_STARTSELECTION, 1 },
  	{ '"',			    0, MODEKEYCOPY_STARTNAMEDBUFFER, 1 },
  	{ '$',			    0, MODEKEYCOPY_ENDOFLINE, 1 },
***************
*** 359,365 ****
  struct mode_key_tree mode_key_tree_vi_copy;
  
  /* emacs editing keys. */
! const struct mode_key_entry mode_key_emacs_edit[] = {
  	{ '\001' /* C-a */,	    0, MODEKEYEDIT_STARTOFLINE, 1 },
  	{ '\002' /* C-b */,	    0, MODEKEYEDIT_CURSORLEFT, 1 },
  	{ '\003' /* C-c */,	    0, MODEKEYEDIT_CANCEL, 1 },
--- 359,365 ----
  struct mode_key_tree mode_key_tree_vi_copy;
  
  /* emacs editing keys. */
! static const struct mode_key_entry mode_key_emacs_edit[] = {
  	{ '\001' /* C-a */,	    0, MODEKEYEDIT_STARTOFLINE, 1 },
  	{ '\002' /* C-b */,	    0, MODEKEYEDIT_CURSORLEFT, 1 },
  	{ '\003' /* C-c */,	    0, MODEKEYEDIT_CANCEL, 1 },
***************
*** 395,401 ****
  struct mode_key_tree mode_key_tree_emacs_edit;
  
  /* emacs choice selection keys. */
! const struct mode_key_entry mode_key_emacs_choice[] = {
  	{ '0' | KEYC_ESCAPE,	    0, MODEKEYCHOICE_STARTNUMBERPREFIX, 1 },
  	{ '1' | KEYC_ESCAPE,	    0, MODEKEYCHOICE_STARTNUMBERPREFIX, 1 },
  	{ '2' | KEYC_ESCAPE,	    0, MODEKEYCHOICE_STARTNUMBERPREFIX, 1 },
--- 395,401 ----
  struct mode_key_tree mode_key_tree_emacs_edit;
  
  /* emacs choice selection keys. */
! static const struct mode_key_entry mode_key_emacs_choice[] = {
  	{ '0' | KEYC_ESCAPE,	    0, MODEKEYCHOICE_STARTNUMBERPREFIX, 1 },
  	{ '1' | KEYC_ESCAPE,	    0, MODEKEYCHOICE_STARTNUMBERPREFIX, 1 },
  	{ '2' | KEYC_ESCAPE,	    0, MODEKEYCHOICE_STARTNUMBERPREFIX, 1 },
***************
*** 442,448 ****
  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, 1 },
  	{ ',',			    0, MODEKEYCOPY_JUMPREVERSE, 1 },
  	{ ';',			    0, MODEKEYCOPY_JUMPAGAIN, 1 },
--- 442,448 ----
  struct mode_key_tree mode_key_tree_emacs_choice;
  
  /* emacs copy mode keys. */
! static const struct mode_key_entry mode_key_emacs_copy[] = {
  	{ ' ',			    0, MODEKEYCOPY_NEXTPAGE, 1 },
  	{ ',',			    0, MODEKEYCOPY_JUMPREVERSE, 1 },
  	{ ';',			    0, MODEKEYCOPY_JUMPAGAIN, 1 },