===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-list-windows.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -c -r1.25 -r1.26
*** src/usr.bin/tmux/cmd-list-windows.c	2012/10/25 11:26:47	1.25
--- src/usr.bin/tmux/cmd-list-windows.c	2013/03/24 09:54:10	1.26
***************
*** 1,4 ****
! /* $OpenBSD: cmd-list-windows.c,v 1.25 2012/10/25 11:26:47 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-list-windows.c,v 1.26 2013/03/24 09:54:10 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_ctx *);
  
! void	cmd_list_windows_server(struct cmd *, struct cmd_ctx *);
  void	cmd_list_windows_session(
! 	    struct cmd *, struct session *, struct cmd_ctx *, int);
  
  const struct cmd_entry cmd_list_windows_entry = {
  	"list-windows", "lsw",
--- 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",
***************
*** 44,78 ****
  };
  
  enum cmd_retval
! cmd_list_windows_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args	*args = self->args;
  	struct session	*s;
  
  	if (args_has(args, 'a'))
! 		cmd_list_windows_server(self, ctx);
  	else {
! 		s = cmd_find_session(ctx, args_get(args, 't'), 0);
  		if (s == NULL)
  			return (CMD_RETURN_ERROR);
! 		cmd_list_windows_session(self, s, ctx, 0);
  	}
  
  	return (CMD_RETURN_NORMAL);
  }
  
  void
! cmd_list_windows_server(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct session	*s;
  
  	RB_FOREACH(s, sessions, &sessions)
! 		cmd_list_windows_session(self, s, ctx, 1);
  }
  
  void
  cmd_list_windows_session(
!     struct cmd *self, struct session *s, struct cmd_ctx *ctx, int type)
  {
  	struct args		*args = self->args;
  	struct winlink		*wl;
--- 44,78 ----
  };
  
  enum cmd_retval
! cmd_list_windows_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args	*args = self->args;
  	struct session	*s;
  
  	if (args_has(args, 'a'))
! 		cmd_list_windows_server(self, cmdq);
  	else {
! 		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
  		if (s == NULL)
  			return (CMD_RETURN_ERROR);
! 		cmd_list_windows_session(self, s, cmdq, 0);
  	}
  
  	return (CMD_RETURN_NORMAL);
  }
  
  void
! cmd_list_windows_server(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct session	*s;
  
  	RB_FOREACH(s, sessions, &sessions)
! 		cmd_list_windows_session(self, s, cmdq, 1);
  }
  
  void
  cmd_list_windows_session(
!     struct cmd *self, struct session *s, struct cmd_q *cmdq, int type)
  {
  	struct args		*args = self->args;
  	struct winlink		*wl;
***************
*** 102,108 ****
  		format_window_pane(ft, wl->window->active);
  
  		line = format_expand(ft, template);
! 		ctx->print(ctx, "%s", line);
  		free(line);
  
  		format_free(ft);
--- 102,108 ----
  		format_window_pane(ft, wl->window->active);
  
  		line = format_expand(ft, template);
! 		cmdq_print(cmdq, "%s", line);
  		free(line);
  
  		format_free(ft);