===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/xterm-keys.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/tmux/Attic/xterm-keys.c	2009/11/30 16:44:03	1.4
--- src/usr.bin/tmux/Attic/xterm-keys.c	2009/12/03 22:50:10	1.5
***************
*** 1,4 ****
! /* $OpenBSD: xterm-keys.c,v 1.4 2009/11/30 16:44:03 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: xterm-keys.c,v 1.5 2009/12/03 22:50:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 27,37 ****
   * character:
   *
   * 2 Shift
!  * 3 Alt 
!  * 4 Shift + Alt 
!  * 5 Ctrl 
!  * 6 Shift + Ctrl 
!  * 7 Alt + Ctrl 
   * 8 Shift + Alt + Ctrl
   *
   * Rather than parsing them, just match against a table.
--- 27,37 ----
   * character:
   *
   * 2 Shift
!  * 3 Alt
!  * 4 Shift + Alt
!  * 5 Ctrl
!  * 6 Shift + Ctrl
!  * 7 Alt + Ctrl
   * 8 Shift + Alt + Ctrl
   *
   * Rather than parsing them, just match against a table.
***************
*** 85,91 ****
  	{ KEYC_DC,	"\033[3;_~" },
  };
  
! /* 
   * Match key against buffer, treating _ as a wildcard. Return -1 for no match,
   * 0 for match, 1 if the end of the buffer is reached (need more data).
   */
--- 85,91 ----
  	{ KEYC_DC,	"\033[3;_~" },
  };
  
! /*
   * Match key against buffer, treating _ as a wildcard. Return -1 for no match,
   * 0 for match, 1 if the end of the buffer is reached (need more data).
   */
***************
*** 132,138 ****
  	case '7':
  		return (KEYC_ESCAPE|KEYC_CTRL);
  	case '8':
!  		return (KEYC_SHIFT|KEYC_ESCAPE|KEYC_CTRL);
  	}
  	return (0);
  }
--- 132,138 ----
  	case '7':
  		return (KEYC_ESCAPE|KEYC_CTRL);
  	case '8':
! 		return (KEYC_SHIFT|KEYC_ESCAPE|KEYC_CTRL);
  	}
  	return (0);
  }
***************
*** 206,212 ****
  	}
  	if (i == nitems(xterm_keys_table))
  		return (NULL);
! 	
  	/* Copy the template and replace the modifier. */
  	out = xstrdup(entry->template);
  	out[strcspn(out, "_")] = '0' + modifiers;
--- 206,212 ----
  	}
  	if (i == nitems(xterm_keys_table))
  		return (NULL);
! 
  	/* Copy the template and replace the modifier. */
  	out = xstrdup(entry->template);
  	out[strcspn(out, "_")] = '0' + modifiers;