===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.366
retrieving revision 1.367
diff -c -r1.366 -r1.367
*** src/usr.bin/tmux/tty.c	2020/05/16 14:34:44	1.366
--- src/usr.bin/tmux/tty.c	2020/05/16 14:39:40	1.367
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.366 2020/05/16 14:34:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.367 2020/05/16 14:39:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 330,342 ****
  		tty_puts(tty, "\033[?1006l\033[?1005l");
  	}
  
! 	if (tty_term_flag(tty->term, TTYC_XT)) {
! 		if (options_get_number(global_options, "focus-events")) {
! 			tty->flags |= TTY_FOCUS;
! 			tty_puts(tty, "\033[?1004h");
! 		}
! 		tty_puts(tty, "\033[?7727h");
  	}
  
  	evtimer_set(&tty->start_timer, tty_start_timer_callback, tty);
  	evtimer_add(&tty->start_timer, &tv);
--- 330,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_flag(tty->term, TTYC_XT))
+ 		tty_puts(tty, "\033[?7727h");
  
  	evtimer_set(&tty->start_timer, tty_start_timer_callback, tty);
  	evtimer_add(&tty->start_timer, &tv);
***************
*** 417,429 ****
  		tty_raw(tty, "\033[?1006l\033[?1005l");
  	}
  
! 	if (tty_term_flag(tty->term, TTYC_XT)) {
! 		if (tty->flags & TTY_FOCUS) {
! 			tty->flags &= ~TTY_FOCUS;
! 			tty_raw(tty, "\033[?1004l");
! 		}
! 		tty_raw(tty, "\033[?7727l");
  	}
  
  	if (tty_use_margin(tty))
  		tty_raw(tty, tty_term_string(tty->term, TTYC_DSMG));
--- 416,427 ----
  		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_flag(tty->term, TTYC_XT))
+ 		tty_raw(tty, "\033[?7727l");
  
  	if (tty_use_margin(tty))
  		tty_raw(tty, tty_term_string(tty->term, TTYC_DSMG));