===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty-keys.c,v
retrieving revision 1.127
retrieving revision 1.128
diff -c -r1.127 -r1.128
*** src/usr.bin/tmux/tty-keys.c	2020/04/20 14:59:31	1.127
--- src/usr.bin/tmux/tty-keys.c	2020/05/16 14:16:25	1.128
***************
*** 1,4 ****
! /* $OpenBSD: tty-keys.c,v 1.127 2020/04/20 14:59:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty-keys.c,v 1.128 2020/05/16 14:16:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 52,58 ****
  		    size_t *);
  static int	tty_keys_device_attributes(struct tty *, const char *, size_t,
  		    size_t *);
! static int	tty_keys_device_status_report(struct tty *, const char *,
  		    size_t, size_t *);
  
  /* Default raw keys. */
--- 52,58 ----
  		    size_t *);
  static int	tty_keys_device_attributes(struct tty *, const char *, size_t,
  		    size_t *);
! static int	tty_keys_extended_device_attributes(struct tty *, const char *,
  		    size_t, size_t *);
  
  /* Default raw keys. */
***************
*** 612,619 ****
  		goto partial_key;
  	}
  
! 	/* Is this a device status report response? */
! 	switch (tty_keys_device_status_report(tty, buf, len, &size)) {
  	case 0:		/* yes */
  		key = KEYC_UNKNOWN;
  		goto complete_key;
--- 612,619 ----
  		goto partial_key;
  	}
  
! 	/* Is this an extended device attributes response? */
! 	switch (tty_keys_extended_device_attributes(tty, buf, len, &size)) {
  	case 0:		/* yes */
  		key = KEYC_UNKNOWN;
  		goto complete_key;
***************
*** 936,942 ****
  
  	*size = 0;
  
! 	/* First three bytes are always \033]52;. */
  	if (buf[0] != '\033')
  		return (-1);
  	if (len == 1)
--- 936,942 ----
  
  	*size = 0;
  
! 	/* First five bytes are always \033]52;. */
  	if (buf[0] != '\033')
  		return (-1);
  	if (len == 1)
***************
*** 1040,1048 ****
  		return (1);
  
  	/* Copy the rest up to a 'c'. */
! 	for (i = 0; i < (sizeof tmp) - 1 && buf[3 + i] != 'c'; i++) {
  		if (3 + i == len)
  			return (1);
  		tmp[i] = buf[3 + i];
  	}
  	if (i == (sizeof tmp) - 1)
--- 1040,1050 ----
  		return (1);
  
  	/* Copy the rest up to a 'c'. */
! 	for (i = 0; i < (sizeof tmp) - 1; i++) {
  		if (3 + i == len)
  			return (1);
+ 		if (buf[3 + i] == 'c')
+ 			break;
  		tmp[i] = buf[3 + i];
  	}
  	if (i == (sizeof tmp) - 1)
***************
*** 1101,1148 ****
  }
  
  /*
!  * Handle device status report input. Returns 0 for success, -1 for failure, 1
!  * for partial.
   */
  static int
! tty_keys_device_status_report(struct tty *tty, const char *buf, size_t len,
!     size_t *size)
  {
  	struct client	*c = tty->client;
  	u_int		 i;
  	char		 tmp[64];
  
  	*size = 0;
! 	if (tty->flags & TTY_HAVEDSR)
  		return (-1);
  
! 	/* First three bytes are always \033[. */
  	if (buf[0] != '\033')
  		return (-1);
  	if (len == 1)
  		return (1);
! 	if (buf[1] != '[')
  		return (-1);
  	if (len == 2)
  		return (1);
! 	if (buf[2] != 'I' && buf[2] != 'T')
  		return (-1);
  	if (len == 3)
  		return (1);
  
! 	/* Copy the rest up to a 'n'. */
! 	for (i = 0; i < (sizeof tmp) - 1 && buf[2 + i] != 'n'; i++) {
! 		if (2 + i == len)
  			return (1);
! 		tmp[i] = buf[2 + i];
  	}
  	if (i == (sizeof tmp) - 1)
  		return (-1);
! 	tmp[i] = '\0';
! 	*size = 3 + i;
  
  	/* Add terminal features. */
! 	if (strncmp(tmp, "ITERM2 ", 7) == 0) {
  		tty_add_features(&c->term_features,
  		    "256,"
  		    "RGB,"
--- 1103,1156 ----
  }
  
  /*
!  * Handle extended device attributes input. Returns 0 for success, -1 for
!  * failure, 1 for partial.
   */
  static int
! tty_keys_extended_device_attributes(struct tty *tty, const char *buf,
!     size_t len, size_t *size)
  {
  	struct client	*c = tty->client;
  	u_int		 i;
  	char		 tmp[64];
  
  	*size = 0;
! 	if (tty->flags & TTY_HAVEXDA)
  		return (-1);
  
! 	/* First four bytes are always \033P>|. */
  	if (buf[0] != '\033')
  		return (-1);
  	if (len == 1)
  		return (1);
! 	if (buf[1] != 'P')
  		return (-1);
  	if (len == 2)
  		return (1);
! 	if (buf[2] != '>')
  		return (-1);
  	if (len == 3)
  		return (1);
+ 	if (buf[3] != '|')
+ 		return (-1);
+ 	if (len == 4)
+ 		return (1);
  
! 	/* Copy the rest up to a '\033\\'. */
! 	for (i = 0; i < (sizeof tmp) - 1; i++) {
! 		if (4 + i == len)
  			return (1);
! 		if (buf[4 + i - 1] == '\033' && buf[4 + i] == '\\')
! 			break;
! 		tmp[i] = buf[4 + i];
  	}
  	if (i == (sizeof tmp) - 1)
  		return (-1);
! 	tmp[i - 1] = '\0';
! 	*size = 5 + i;
  
  	/* Add terminal features. */
! 	if (strncmp(tmp, "ITerm2 ", 7) == 0) {
  		tty_add_features(&c->term_features,
  		    "256,"
  		    "RGB,"
***************
*** 1152,1158 ****
  		    "sync,"
  		    "title",
  		    ",");
! 	} else if (strncmp(tmp, "TMUX ", 5) == 0) {
  		tty_add_features(&c->term_features,
  		    "256,"
  		    "RGB,"
--- 1160,1166 ----
  		    "sync,"
  		    "title",
  		    ",");
! 	} else if (strncmp(tmp, "tmux ", 5) == 0) {
  		tty_add_features(&c->term_features,
  		    "256,"
  		    "RGB,"
***************
*** 1163,1172 ****
  		    "usstyle",
  		    ",");
  	}
! 	log_debug("%s: received DSR %.*s", c->name, (int)*size, buf);
  
  	tty_update_features(tty);
! 	tty->flags |= TTY_HAVEDSR;
  
  	return (0);
  }
--- 1171,1180 ----
  		    "usstyle",
  		    ",");
  	}
! 	log_debug("%s: received extended DA %.*s", c->name, (int)*size, buf);
  
  	tty_update_features(tty);
! 	tty->flags |= TTY_HAVEXDA;
  
  	return (0);
  }