===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-list-panes.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -c -r1.16 -r1.17
*** src/usr.bin/tmux/cmd-list-panes.c	2012/12/09 23:17:35	1.16
--- src/usr.bin/tmux/cmd-list-panes.c	2013/03/24 09:54:10	1.17
***************
*** 1,4 ****
! /* $OpenBSD: cmd-list-panes.c,v 1.16 2012/12/09 23:17:35 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-list-panes.c,v 1.17 2013/03/24 09:54:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 27,39 ****
   * List panes on given window.
   */
  
! enum cmd_retval	 cmd_list_panes_exec(struct cmd *, struct cmd_ctx *);
  
! void	cmd_list_panes_server(struct cmd *, struct cmd_ctx *);
  void	cmd_list_panes_session(
! 	    struct cmd *, struct session *, struct cmd_ctx *, int);
  void	cmd_list_panes_window(struct cmd *,
! 	    struct session *, struct winlink *, struct cmd_ctx *, int);
  
  const struct cmd_entry cmd_list_panes_entry = {
  	"list-panes", "lsp",
--- 27,39 ----
   * List panes on given window.
   */
  
! enum cmd_retval	 cmd_list_panes_exec(struct cmd *, struct cmd_q *);
  
! void	cmd_list_panes_server(struct cmd *, struct cmd_q *);
  void	cmd_list_panes_session(
! 	    struct cmd *, struct session *, struct cmd_q *, int);
  void	cmd_list_panes_window(struct cmd *,
! 	    struct session *, struct winlink *, struct cmd_q *, int);
  
  const struct cmd_entry cmd_list_panes_entry = {
  	"list-panes", "lsp",
***************
*** 46,96 ****
  };
  
  enum cmd_retval
! cmd_list_panes_exec(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct args	*args = self->args;
  	struct session	*s;
  	struct winlink	*wl;
  
  	if (args_has(args, 'a'))
! 		cmd_list_panes_server(self, ctx);
  	else if (args_has(args, 's')) {
! 		s = cmd_find_session(ctx, args_get(args, 't'), 0);
  		if (s == NULL)
  			return (CMD_RETURN_ERROR);
! 		cmd_list_panes_session(self, s, ctx, 1);
  	} else {
! 		wl = cmd_find_window(ctx, args_get(args, 't'), &s);
  		if (wl == NULL)
  			return (CMD_RETURN_ERROR);
! 		cmd_list_panes_window(self, s, wl, ctx, 0);
  	}
  
  	return (CMD_RETURN_NORMAL);
  }
  
  void
! cmd_list_panes_server(struct cmd *self, struct cmd_ctx *ctx)
  {
  	struct session	*s;
  
  	RB_FOREACH(s, sessions, &sessions)
! 		cmd_list_panes_session(self, s, ctx, 2);
  }
  
  void
  cmd_list_panes_session(
!     struct cmd *self, struct session *s, struct cmd_ctx *ctx, int type)
  {
  	struct winlink	*wl;
  
  	RB_FOREACH(wl, winlinks, &s->windows)
! 		cmd_list_panes_window(self, s, wl, ctx, type);
  }
  
  void
  cmd_list_panes_window(struct cmd *self,
!     struct session *s, struct winlink *wl, struct cmd_ctx *ctx, int type)
  {
  	struct args		*args = self->args;
  	struct window_pane	*wp;
--- 46,96 ----
  };
  
  enum cmd_retval
! cmd_list_panes_exec(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct args	*args = self->args;
  	struct session	*s;
  	struct winlink	*wl;
  
  	if (args_has(args, 'a'))
! 		cmd_list_panes_server(self, cmdq);
  	else if (args_has(args, 's')) {
! 		s = cmd_find_session(cmdq, args_get(args, 't'), 0);
  		if (s == NULL)
  			return (CMD_RETURN_ERROR);
! 		cmd_list_panes_session(self, s, cmdq, 1);
  	} else {
! 		wl = cmd_find_window(cmdq, args_get(args, 't'), &s);
  		if (wl == NULL)
  			return (CMD_RETURN_ERROR);
! 		cmd_list_panes_window(self, s, wl, cmdq, 0);
  	}
  
  	return (CMD_RETURN_NORMAL);
  }
  
  void
! cmd_list_panes_server(struct cmd *self, struct cmd_q *cmdq)
  {
  	struct session	*s;
  
  	RB_FOREACH(s, sessions, &sessions)
! 		cmd_list_panes_session(self, s, cmdq, 2);
  }
  
  void
  cmd_list_panes_session(
!     struct cmd *self, struct session *s, struct cmd_q *cmdq, int type)
  {
  	struct winlink	*wl;
  
  	RB_FOREACH(wl, winlinks, &s->windows)
! 		cmd_list_panes_window(self, s, wl, cmdq, type);
  }
  
  void
  cmd_list_panes_window(struct cmd *self,
!     struct session *s, struct winlink *wl, struct cmd_q *cmdq, int type)
  {
  	struct args		*args = self->args;
  	struct window_pane	*wp;
***************
*** 135,141 ****
  		format_window_pane(ft, wp);
  
  		line = format_expand(ft, template);
! 		ctx->print(ctx, "%s", line);
  		free(line);
  
  		format_free(ft);
--- 135,141 ----
  		format_window_pane(ft, wp);
  
  		line = format_expand(ft, template);
! 		cmdq_print(cmdq, "%s", line);
  		free(line);
  
  		format_free(ft);