===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.377
retrieving revision 1.378
diff -c -r1.377 -r1.378
*** src/usr.bin/tmux/tty.c	2020/05/16 16:26:34	1.377
--- src/usr.bin/tmux/tty.c	2020/05/16 16:44:54	1.378
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.377 2020/05/16 16:26:34 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.378 2020/05/16 16:44:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 286,291 ****
--- 286,293 ----
  	struct client	*c = tty->client;
  
  	log_debug("%s: start timer fired", c->name);
+ 	if ((tty->flags & (TTY_HAVEDA|TTY_HAVEXDA)) == 0)
+ 		tty_update_features(tty);
  	tty->flags |= (TTY_HAVEDA|TTY_HAVEXDA);
  }
  
***************
*** 329,341 ****
  		tty_puts(tty, "\033[?1006l\033[?1005l");
  	}
  
- 	if (options_get_number(global_options, "focus-events")) {
- 		tty->flags |= TTY_FOCUS;
- 		tty_raw(tty, tty_term_string(tty->term, TTYC_ENFCS));
- 	}
- 	if (tty->term->flags & TERM_VT100LIKE)
- 		tty_puts(tty, "\033[?7727h");
- 
  	evtimer_set(&tty->start_timer, tty_start_timer_callback, tty);
  	evtimer_add(&tty->start_timer, &tv);
  
--- 331,336 ----
***************
*** 415,426 ****
  		tty_raw(tty, "\033[?1006l\033[?1005l");
  	}
  
- 	if (tty->flags & TTY_FOCUS) {
- 		tty->flags &= ~TTY_FOCUS;
- 		tty_raw(tty, tty_term_string(tty->term, TTYC_DSFCS));
- 	}
  	if (tty->term->flags & TERM_VT100LIKE)
  		tty_raw(tty, "\033[?7727l");
  
  	if (tty_use_margin(tty))
  		tty_raw(tty, tty_term_string(tty->term, TTYC_DSMG));
--- 410,419 ----
  		tty_raw(tty, "\033[?1006l\033[?1005l");
  	}
  
  	if (tty->term->flags & TERM_VT100LIKE)
  		tty_raw(tty, "\033[?7727l");
+ 	tty_raw(tty, tty_term_string(tty->term, TTYC_DSFCS));
+ 	tty_raw(tty, tty_term_string(tty->term, TTYC_DSEKS));
  
  	if (tty_use_margin(tty))
  		tty_raw(tty, tty_term_string(tty->term, TTYC_DSMG));
***************
*** 471,476 ****
--- 464,475 ----
  
  	if (tty_use_margin(tty))
  		tty_putcode(tty, TTYC_ENMG);
+ 	if (options_get_number(global_options, "extended-keys"))
+ 		tty_puts(tty, tty_term_string(tty->term, TTYC_ENEKS));
+ 	if (options_get_number(global_options, "focus-events"))
+ 		tty_raw(tty, tty_term_string(tty->term, TTYC_ENFCS));
+ 	if (tty->term->flags & TERM_VT100LIKE)
+ 		tty_puts(tty, "\033[?7727h");
  }
  
  void