===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.190
retrieving revision 1.191
diff -c -r1.190 -r1.191
*** src/usr.bin/tmux/tty.c	2015/10/23 16:30:15	1.190
--- src/usr.bin/tmux/tty.c	2015/10/27 15:58:43	1.191
***************
*** 1,4 ****
! /* $OpenBSD: tty.c,v 1.190 2015/10/23 16:30:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tty.c,v 1.191 2015/10/27 15:58:43 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 229,235 ****
  		tty_puts(tty, "\033[?1000l\033[?1002l\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");
  		}
--- 229,235 ----
  		tty_puts(tty, "\033[?1000l\033[?1002l\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");
  		}
***************
*** 457,463 ****
  	const char	*s;
  
  	if (tty_term_has(tty->term, TTYC_SITM)) {
! 		s = options_get_string(&global_options, "default-terminal");
  		if (strcmp(s, "screen") != 0 && strncmp(s, "screen-", 7) != 0) {
  			tty_putcode(tty, TTYC_SITM);
  			return;
--- 457,463 ----
  	const char	*s;
  
  	if (tty_term_has(tty->term, TTYC_SITM)) {
! 		s = options_get_string(global_options, "default-terminal");
  		if (strcmp(s, "screen") != 0 && strncmp(s, "screen-", 7) != 0) {
  			tty_putcode(tty, TTYC_SITM);
  			return;
***************
*** 1686,1693 ****
  		return;
  
  	pgc = &wp->colgc;
! 	agc = options_get_style(&wp->window->options, "window-active-style");
! 	wgc = options_get_style(&wp->window->options, "window-style");
  
  	if (gc->fg == 8 && !(gc->flags & GRID_FLAG_FG256)) {
  		if (pgc->fg != 8 || (pgc->flags & GRID_FLAG_FG256)) {
--- 1686,1693 ----
  		return;
  
  	pgc = &wp->colgc;
! 	agc = options_get_style(wp->window->options, "window-active-style");
! 	wgc = options_get_style(wp->window->options, "window-style");
  
  	if (gc->fg == 8 && !(gc->flags & GRID_FLAG_FG256)) {
  		if (pgc->fg != 8 || (pgc->flags & GRID_FLAG_FG256)) {