===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/cmd-list-windows.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/tmux/cmd-list-windows.c	2009/08/08 16:05:01	1.6
--- src/usr.bin/tmux/cmd-list-windows.c	2009/10/10 17:19:38	1.7
***************
*** 1,4 ****
! /* $OpenBSD: cmd-list-windows.c,v 1.6 2009/08/08 16:05:01 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-list-windows.c,v 1.7 2009/10/10 17:19:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 45,86 ****
  	struct cmd_target_data	*data = self->data;
  	struct session		*s;
  	struct winlink		*wl;
- 	struct window		*w;
- 	struct window_pane	*wp;
- 	struct grid		*gd;
- 	struct grid_line	*gl;
- 	u_int			 i;
- 	unsigned long long	 size;
- 	const char		*name;
  
  	if ((s = cmd_find_session(ctx, data->target)) == NULL)
  		return (-1);
  
  	RB_FOREACH(wl, winlinks, &s->windows) {
! 		w = wl->window;
! 		ctx->print(ctx,
! 		    "%3d: %s [%ux%u]", wl->idx, w->name, w->sx, w->sy);
! 
! 		TAILQ_FOREACH(wp, &w->panes, entry) {
! 			gd = wp->base.grid;
! 
! 			size = 0;
! 			for (i = 0; i < gd->hsize; i++) {
! 				gl = &gd->linedata[i];
! 				size += gl->cellsize * sizeof *gl->celldata;
! 				size += gl->utf8size * sizeof *gl->utf8data;
! 			}
! 			size += gd->hsize * sizeof *gd->linedata;
! 
! 			name = NULL;
! 			if (wp->fd != -1)
! 				name = ttyname(wp->fd);
! 			if (name == NULL)
! 				name = "unknown";
! 			ctx->print(ctx,
! 			    "     %s [%ux%u] [history %u/%u, %llu bytes]",
! 			    name, wp->sx, wp->sy, gd->hsize, gd->hlimit, size);
! 		}
  	}
  
  	return (0);
--- 45,57 ----
  	struct cmd_target_data	*data = self->data;
  	struct session		*s;
  	struct winlink		*wl;
  
  	if ((s = cmd_find_session(ctx, data->target)) == NULL)
  		return (-1);
  
  	RB_FOREACH(wl, winlinks, &s->windows) {
! 		ctx->print(ctx, "%d: %s [%ux%u]",
! 		    wl->idx, wl->window->name, wl->window->sx, wl->window->sy);
  	}
  
  	return (0);