===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-list-windows.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -c -r1.13 -r1.14
*** src/usr.bin/tmux/cmd-list-windows.c	2011/04/05 19:37:01	1.13
--- src/usr.bin/tmux/cmd-list-windows.c	2011/07/04 14:04:40	1.14
***************
*** 1,4 ****
! /* $OpenBSD: cmd-list-windows.c,v 1.13 2011/04/05 19:37:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-list-windows.c,v 1.14 2011/07/04 14:04:40 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 29,35 ****
  int	cmd_list_windows_exec(struct cmd *, struct cmd_ctx *);
  
  void	cmd_list_windows_server(struct cmd_ctx *);
! void	cmd_list_windows_session(struct session *, struct cmd_ctx *);
  
  const struct cmd_entry cmd_list_windows_entry = {
  	"list-windows", "lsw",
--- 29,35 ----
  int	cmd_list_windows_exec(struct cmd *, struct cmd_ctx *);
  
  void	cmd_list_windows_server(struct cmd_ctx *);
! void	cmd_list_windows_session(struct session *, struct cmd_ctx *, int);
  
  const struct cmd_entry cmd_list_windows_entry = {
  	"list-windows", "lsw",
***************
*** 53,59 ****
  		s = cmd_find_session(ctx, args_get(args, 't'), 0);
  		if (s == NULL)
  			return (-1);
! 		cmd_list_windows_session(s, ctx);
  	}
  
  	return (0);
--- 53,59 ----
  		s = cmd_find_session(ctx, args_get(args, 't'), 0);
  		if (s == NULL)
  			return (-1);
! 		cmd_list_windows_session(s, ctx, 0);
  	}
  
  	return (0);
***************
*** 65,84 ****
  	struct session	*s;
  
  	RB_FOREACH(s, sessions, &sessions)
! 		cmd_list_windows_session(s, ctx);
  }
  
  void
! cmd_list_windows_session(struct session *s, struct cmd_ctx *ctx)
  {
  	struct winlink	*wl;
  	char		*layout;
  
  	RB_FOREACH(wl, winlinks, &s->windows) {
  		layout = layout_dump(wl->window);
! 		ctx->print(ctx, "%d: %s [%ux%u] [layout %s]%s",
! 		    wl->idx, wl->window->name, wl->window->sx, wl->window->sy,
! 		    layout, wl == s->curw ? " (active)" : "");
  		xfree(layout);
  	}
  }
--- 65,92 ----
  	struct session	*s;
  
  	RB_FOREACH(s, sessions, &sessions)
! 		cmd_list_windows_session(s, ctx, 1);
  }
  
  void
! cmd_list_windows_session(struct session *s, struct cmd_ctx *ctx, int type)
  {
  	struct winlink	*wl;
  	char		*layout;
  
  	RB_FOREACH(wl, winlinks, &s->windows) {
  		layout = layout_dump(wl->window);
! 		if (type) {
! 			ctx->print(ctx, "%s:%d: %s [%ux%u] [layout %s]%s",
! 			    s->name, wl->idx, wl->window->name, wl->window->sx,
! 			    wl->window->sy, layout,
! 			    wl == s->curw ? " (active)" : "");
! 		} else {
! 			ctx->print(ctx, "%d: %s [%ux%u] [layout %s]%s",
! 			    wl->idx, wl->window->name, wl->window->sx,
! 			    wl->window->sy, layout,
! 			    wl == s->curw ? " (active)" : "");
! 		}
  		xfree(layout);
  	}
  }