===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tty.c,v
retrieving revision 1.161
retrieving revision 1.162
diff -u -r1.161 -r1.162
--- src/usr.bin/tmux/tty.c	2013/06/11 19:18:02	1.161
+++ src/usr.bin/tmux/tty.c	2013/06/23 13:10:48	1.162
@@ -1,4 +1,4 @@
-/* $OpenBSD: tty.c,v 1.161 2013/06/11 19:18:02 sthen Exp $ */
+/* $OpenBSD: tty.c,v 1.162 2013/06/23 13:10:48 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -219,8 +219,13 @@
 	if (tty_term_has(tty->term, TTYC_KMOUS))
 		tty_puts(tty, "\033[?1000l\033[?1006l\033[?1005l");
 
-	if (tty_term_has(tty->term, TTYC_XT))
+	if (tty_term_has(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[c\033[>4;1m\033[m");
+	}
 
 	tty->cx = UINT_MAX;
 	tty->cy = UINT_MAX;
@@ -282,8 +287,13 @@
 	if (tty_term_has(tty->term, TTYC_KMOUS))
 		tty_raw(tty, "\033[?1000l\033[?1006l\033[?1005l");
 
-	if (tty_term_has(tty->term, TTYC_XT))
+	if (tty_term_has(tty->term, TTYC_XT)) {
+		if (tty->flags & TTY_FOCUS) {
+			tty->flags &= ~TTY_FOCUS;
+			tty_puts(tty, "\033[?1004l");
+		}
 		tty_raw(tty, "\033[>4m\033[m");
+	}
 
 	tty_raw(tty, tty_term_string(tty->term, TTYC_RMCUP));