===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/Attic/cmd-server-info.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -c -r1.29 -r1.30
*** src/usr.bin/tmux/Attic/cmd-server-info.c	2012/11/22 14:41:11	1.29
--- src/usr.bin/tmux/Attic/cmd-server-info.c	2013/01/18 02:16:21	1.30
***************
*** 1,4 ****
! /* $OpenBSD: cmd-server-info.c,v 1.29 2012/11/22 14:41:11 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: cmd-server-info.c,v 1.30 2013/01/18 02:16:21 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 59,70 ****
  	struct job				*job;
  	struct grid				*gd;
  	struct grid_line			*gl;
! 	u_int		 			 i, j, k;
  	char					 out[80];
  	char					*tim;
  	time_t		 			 t;
- 	u_int					 lines, ulines;
- 	size_t					 size, usize;
  
  	tim = ctime(&start_time);
  	*strchr(tim, '\n') = '\0';
--- 59,69 ----
  	struct job				*job;
  	struct grid				*gd;
  	struct grid_line			*gl;
! 	u_int		 			 i, j, k, lines;
! 	size_t					 size;
  	char					 out[80];
  	char					*tim;
  	time_t		 			 t;
  
  	tim = ctime(&start_time);
  	*strchr(tim, '\n') = '\0';
***************
*** 97,104 ****
  	}
  	ctx->print(ctx, "%s", "");
  
! 	ctx->print(ctx, "Sessions: [%zu/%zu]",
! 	    sizeof (struct grid_cell), sizeof (struct grid_utf8));
  	RB_FOREACH(s, sessions, &sessions) {
  		t = s->creation_time.tv_sec;
  		tim = ctime(&t);
--- 96,102 ----
  	}
  	ctx->print(ctx, "%s", "");
  
! 	ctx->print(ctx, "Sessions: [%zu]", sizeof (struct grid_cell));
  	RB_FOREACH(s, sessions, &sessions) {
  		t = s->creation_time.tv_sec;
  		tim = ctime(&t);
***************
*** 115,140 ****
  			    w->lastlayout);
  			j = 0;
  			TAILQ_FOREACH(wp, &w->panes, entry) {
! 				lines = ulines = size = usize = 0;
  				gd = wp->base.grid;
  				for (k = 0; k < gd->hsize + gd->sy; k++) {
  					gl = &gd->linedata[k];
! 					if (gl->celldata != NULL) {
! 						lines++;
! 						size += gl->cellsize *
! 						    sizeof *gl->celldata;
! 					}
! 					if (gl->utf8data != NULL) {
! 						ulines++;
! 						usize += gl->utf8size *
! 						    sizeof *gl->utf8data;
! 					}
  				}
! 				ctx->print(ctx, "%6u: %s %lu %d %u/%u, %zu "
! 				    "bytes; UTF-8 %u/%u, %zu bytes", j,
  				    wp->tty, (u_long) wp->pid, wp->fd, lines,
! 				    gd->hsize + gd->sy, size, ulines,
! 				    gd->hsize + gd->sy, usize);
  				j++;
  			}
  		}
--- 113,132 ----
  			    w->lastlayout);
  			j = 0;
  			TAILQ_FOREACH(wp, &w->panes, entry) {
! 				lines = size = 0;
  				gd = wp->base.grid;
  				for (k = 0; k < gd->hsize + gd->sy; k++) {
  					gl = &gd->linedata[k];
! 					if (gl->celldata == NULL)
! 						continue;
! 					lines++;
! 					size += gl->cellsize *
! 					    sizeof *gl->celldata;
  				}
! 				ctx->print(ctx,
! 				    "%6u: %s %lu %d %u/%u, %zu bytes", j,
  				    wp->tty, (u_long) wp->pid, wp->fd, lines,
! 				    gd->hsize + gd->sy, size);
  				j++;
  			}
  		}