===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty-keys.c,v
retrieving revision 1.143
retrieving revision 1.144
diff -c -r1.143 -r1.144
*** src/usr.bin/tmux/tty-keys.c	2021/04/07 07:30:02	1.143
--- src/usr.bin/tmux/tty-keys.c	2021/04/07 15:46:12	1.144
***************
*** 1,4 ****
! /* $OpenBSD: tty-keys.c,v 1.143 2021/04/07 07:30:02 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty-keys.c,v 1.144 2021/04/07 15:46:12 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 871,876 ****
--- 871,877 ----
  	char		 tmp[64];
  	cc_t		 bspace;
  	key_code	 nkey;
+ 	key_code	 onlykey;
  
  	*size = 0;
  
***************
*** 948,966 ****
  		break;
  	}
  
!     /* Don't allow both KEYC_CTRL and implied. */
! 	if ((nkey & KEYC_CTRL) && (nkey & KEYC_MASK_KEY) < 32)
! 		nkey &= ~KEYC_CTRL;
! 	if ((nkey & KEYC_MASK_MODIFIERS) == KEYC_CTRL) {
! 		nkey &= KEYC_MASK_KEY;
! 		if (nkey >= 97 && nkey <= 122)
! 			nkey -= 96;
! 		else if (nkey == 32)
! 			nkey = 0;
! 		else if (nkey == 63)
! 			nkey = 127;
! 		else
! 			nkey |= KEYC_CTRL;
  	}
  
  	if (log_get_level() != 0) {
--- 949,974 ----
  		break;
  	}
  
! 	/*
! 	 * Don't allow both KEYC_CTRL and as an implied modifier. Also convert
! 	 * C-X into C-x and so on.
! 	 */
! 	if (nkey & KEYC_CTRL){
! 		onlykey = (nkey & KEYC_MASK_KEY);
! 		if (onlykey < 32)
! 			onlykey = (nkey & ~KEYC_CTRL);
! 		else {
! 			if (onlykey >= 97 && onlykey <= 122)
! 				onlykey -= 96;
! 			else if (onlykey >= 64 && onlykey <= 95)
! 				onlykey -= 64;
! 			else if (onlykey == 32)
! 				onlykey = 0;
! 			else if (onlykey == 63)
! 				onlykey = 127;
! 			onlykey |= ((nkey & KEYC_MASK_MODIFIERS) & ~KEYC_CTRL);
! 		}
! 		nkey = onlykey;
  	}
  
  	if (log_get_level() != 0) {