===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-list-windows.c,v
retrieving revision 1.28
retrieving revision 1.29
diff -c -r1.28 -r1.29
*** src/usr.bin/tmux/cmd-list-windows.c	2014/10/20 22:29:25	1.28
--- src/usr.bin/tmux/cmd-list-windows.c	2014/10/20 23:35:28	1.29
***************
*** 1,4 ****
! /* $OpenBSD: cmd-list-windows.c,v 1.28 2014/10/20 22:29:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-list-windows.c,v 1.29 2014/10/20 23:35:28 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 27,37 ****
   * List windows on given session.
   */
  
  enum cmd_retval	 cmd_list_windows_exec(struct cmd *, struct cmd_q *);
  
  void	cmd_list_windows_server(struct cmd *, struct cmd_q *);
! void	cmd_list_windows_session(
! 	    struct cmd *, struct session *, struct cmd_q *, int);
  
  const struct cmd_entry cmd_list_windows_entry = {
  	"list-windows", "lsw",
--- 27,49 ----
   * List windows on given session.
   */
  
+ #define LIST_WINDOWS_TEMPLATE					\
+ 	"#{window_index}: #{window_name}#{window_flags} "	\
+ 	"(#{window_panes} panes) "				\
+ 	"[#{window_width}x#{window_height}] "			\
+ 	"[layout #{window_layout}] #{window_id}"		\
+ 	"#{?window_active, (active),}";
+ #define LIST_WINDOWS_WITH_SESSION_TEMPLATE			\
+ 	"#{session_name}:"					\
+ 	"#{window_index}: #{window_name}#{window_flags} "	\
+ 	"(#{window_panes} panes) "				\
+ 	"[#{window_width}x#{window_height}] "
+ 
  enum cmd_retval	 cmd_list_windows_exec(struct cmd *, struct cmd_q *);
  
  void	cmd_list_windows_server(struct cmd *, struct cmd_q *);
! void	cmd_list_windows_session(struct cmd *, struct session *,
! 	    struct cmd_q *, int);
  
  const struct cmd_entry cmd_list_windows_entry = {
  	"list-windows", "lsw",