===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/utf8.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -c -r1.59 -r1.60
*** src/usr.bin/tmux/utf8.c	2022/12/16 08:19:58	1.59
--- src/usr.bin/tmux/utf8.c	2023/01/08 22:15:30	1.60
***************
*** 1,4 ****
! /* $OpenBSD: utf8.c,v 1.59 2022/12/16 08:19:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: utf8.c,v 1.60 2023/01/08 22:15:30 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 226,234 ****
  	case 0:
  		return (UTF8_ERROR);
  	}
  	*width = wcwidth(wc);
! 	log_debug("UTF-8 %.*s %#x, wcwidth() %d", (int)ud->size, ud->data,
! 	    (u_int)wc, *width);
  	if (*width >= 0 && *width <= 0xff)
  		return (UTF8_DONE);
  	return (UTF8_ERROR);
--- 226,241 ----
  	case 0:
  		return (UTF8_ERROR);
  	}
+ 	log_debug("UTF-8 %.*s is %08X", (int)ud->size, ud->data, (u_int)wc);
  	*width = wcwidth(wc);
! 	log_debug("wcwidth(%08X) returned %d", (u_int)wc, *width);
! 	if (*width < 0) {
! 		/*
! 		 * C1 control characters are nonprintable, so they are always
! 		 * zero width.
! 		 */
! 		*width = (wc >= 0x80 && wc <= 0x9f) ? 0 : 1;
! 	}
  	if (*width >= 0 && *width <= 0xff)
  		return (UTF8_DONE);
  	return (UTF8_ERROR);