===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/grid.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -c -r1.12 -r1.13
*** src/usr.bin/tmux/grid.c	2009/08/20 19:14:42	1.12
--- src/usr.bin/tmux/grid.c	2009/08/21 07:29:37	1.13
***************
*** 1,4 ****
! /* $OpenBSD: grid.c,v 1.12 2009/08/20 19:14:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: grid.c,v 1.13 2009/08/21 07:29:37 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 189,207 ****
  
  /* Expand line to fit to cell. */
  void
! grid_expand_line(struct grid *gd, u_int py, u_int sx)
  {
  	struct grid_line	*gl;
! 	u_int			 xx;
  
  	gl = &gd->linedata[py];
! 	if (sx <= gl->cellsize)
  		return;
  
  	if (gl->cellsize > gd->sx / 2)
  		sx = gd->sx;
! 	else
! 		sx = 1 + gl->cellsize * 2;
  	gl->celldata = xrealloc(gl->celldata, sx, sizeof *gl->celldata);
  	for (xx = gl->cellsize; xx < sx; xx++)
  		grid_put_cell(gd, xx, py, &grid_default_cell);
--- 189,210 ----
  
  /* Expand line to fit to cell. */
  void
! grid_expand_line(struct grid *gd, u_int py, u_int wantx)
  {
  	struct grid_line	*gl;
! 	u_int			 xx, sx;
  
  	gl = &gd->linedata[py];
! 	if (wantx <= gl->cellsize)
  		return;
  
  	if (gl->cellsize > gd->sx / 2)
  		sx = gd->sx;
! 	else {
! 		sx = gl->cellsize + 1;
! 		while (sx < wantx)
! 			sx *= 2;
! 	}
  	gl->celldata = xrealloc(gl->celldata, sx, sizeof *gl->celldata);
  	for (xx = gl->cellsize; xx < sx; xx++)
  		grid_put_cell(gd, xx, py, &grid_default_cell);