===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/server-client.c,v
retrieving revision 1.342
retrieving revision 1.343
diff -c -r1.342 -r1.343
*** src/usr.bin/tmux/server-client.c	2020/05/16 16:33:16	1.342
--- src/usr.bin/tmux/server-client.c	2020/05/16 16:35:13	1.343
***************
*** 1,4 ****
! /* $OpenBSD: server-client.c,v 1.342 2020/05/16 16:33:16 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: server-client.c,v 1.343 2020/05/16 16:35:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1042,1048 ****
  		key |= KEYC_SHIFT;
  
  	if (log_get_level() != 0)
! 		log_debug("mouse key is %s", key_string_lookup_key (key));
  	return (key);
  }
  
--- 1042,1048 ----
  		key |= KEYC_SHIFT;
  
  	if (log_get_level() != 0)
! 		log_debug("mouse key is %s", key_string_lookup_key (key, 1));
  	return (key);
  }
  
***************
*** 1174,1180 ****
  	 * The prefix always takes precedence and forces a switch to the prefix
  	 * table, unless we are already there.
  	 */
! 	key0 = (key & ~KEYC_XTERM);
  	if ((key0 == (key_code)options_get_number(s->options, "prefix") ||
  	    key0 == (key_code)options_get_number(s->options, "prefix2")) &&
  	    strcmp(table->name, "prefix") != 0) {
--- 1174,1180 ----
  	 * The prefix always takes precedence and forces a switch to the prefix
  	 * table, unless we are already there.
  	 */
! 	key0 = (key & (KEYC_MASK_KEY|KEYC_MASK_MODIFIERS));
  	if ((key0 == (key_code)options_get_number(s->options, "prefix") ||
  	    key0 == (key_code)options_get_number(s->options, "prefix2")) &&
  	    strcmp(table->name, "prefix") != 0) {