===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/status.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- src/usr.bin/tmux/status.c	2009/07/17 06:13:27	1.12
+++ src/usr.bin/tmux/status.c	2009/07/17 18:45:08	1.13
@@ -1,4 +1,4 @@
-/* $OpenBSD: status.c,v 1.12 2009/07/17 06:13:27 nicm Exp $ */
+/* $OpenBSD: status.c,v 1.13 2009/07/17 18:45:08 nicm Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -29,7 +29,6 @@
 
 #include "tmux.h"
 
-char   *status_replace(struct session *, char *, time_t);
 char   *status_replace_popen(char **);
 size_t	status_width(struct winlink *);
 char   *status_print(struct session *, struct winlink *, struct grid_cell *);
@@ -275,7 +274,7 @@
 }
 
 char *
-status_replace(struct session *s, char *fmt, time_t t)
+status_replace(struct session *s, const char *fmt, time_t t)
 {
 	struct winlink *wl = s->curw;
 	static char	out[BUFSIZ];
@@ -323,6 +322,20 @@
 					ptr = tmp;
 				}
 				/* FALLTHROUGH */
+			case 'I':
+				if (ptr == NULL) {
+					xsnprintf(tmp, sizeof tmp, "%d", wl->idx);
+					ptr = tmp;
+				}
+				/* FALLTHROUGH */
+			case 'P':
+				if (ptr == NULL) {
+					xsnprintf(tmp, sizeof tmp, "%u",
+						  window_pane_index(wl->window,
+						  wl->window->active));
+					ptr = tmp;
+				}
+				/* FALLTHOUGH */
 			case 'S':
 				if (ptr == NULL)
 					ptr = s->name;
@@ -330,6 +343,10 @@
 			case 'T':
 				if (ptr == NULL)
 					ptr = wl->window->active->base.title;
+				/* FALLTHROUGH */
+			case 'W':
+				if (ptr == NULL)
+					ptr = wl->window->name;
 				len = strlen(ptr);
 				if ((size_t) n < len)
 					len = n;