===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.539
retrieving revision 1.540
diff -u -r1.539 -r1.540
--- src/usr.bin/tmux/tmux.h	2015/08/28 16:10:46	1.539
+++ src/usr.bin/tmux/tmux.h	2015/08/29 00:29:15	1.540
@@ -1,4 +1,4 @@
-/* $OpenBSD: tmux.h,v 1.539 2015/08/28 16:10:46 nicm Exp $ */
+/* $OpenBSD: tmux.h,v 1.540 2015/08/29 00:29:15 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -47,8 +47,8 @@
  */
 #define PANE_MINIMUM 2
 
-/* Automatic name refresh interval, in milliseconds. */
-#define NAME_INTERVAL 500
+/* Automatic name refresh interval, in microseconds. Must be < 1 second. */
+#define NAME_INTERVAL 500000
 
 /*
  * UTF-8 data size. This must be big enough to hold combined characters as well
@@ -869,8 +869,11 @@
 /* Window structure. */
 struct window {
 	u_int		 id;
+
 	char		*name;
-	struct event	 name_timer;
+	struct event	 name_event;
+	struct timeval	 name_time;
+
 	struct timeval	 silence_timer;
 	struct timeval	 activity_time;
 
@@ -2209,7 +2212,7 @@
 void	window_choose_set_current(struct window_pane *, u_int);
 
 /* names.c */
-void	 queue_window_name(struct window *);
+void	 check_window_name(struct window *);
 char	*default_window_name(struct window *);
 char	*format_window_name(struct window *);
 char	*parse_window_name(const char *);