===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen-write.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/tmux/screen-write.c	2009/06/03 23:37:30	1.6
--- src/usr.bin/tmux/screen-write.c	2009/06/05 03:13:16	1.7
***************
*** 1,4 ****
! /* $OpenBSD: screen-write.c,v 1.6 2009/06/03 23:37:30 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: screen-write.c,v 1.7 2009/06/05 03:13:16 ray Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 89,95 ****
  			size++;
  			ptr++;
  		}
! 	}	
  
  	return (size);
  }
--- 89,95 ----
  			size++;
  			ptr++;
  		}
! 	}
  
  	return (size);
  }
***************
*** 148,154 ****
  				*utf8buf = *ptr;
  				ptr++;
  			}
! 			
  			width = utf8_width(utf8buf);
  			if (maxlen > 0 && size + width > (size_t) maxlen) {
  				while (size < (size_t) maxlen) {
--- 148,154 ----
  				*utf8buf = *ptr;
  				ptr++;
  			}
! 
  			width = utf8_width(utf8buf);
  			if (maxlen > 0 && size + width > (size_t) maxlen) {
  				while (size < (size_t) maxlen) {
***************
*** 301,312 ****
  
  	memcpy(&gc, &grid_default_cell, sizeof gc);
  	gc.data = 'E';
! 	
  	for (yy = 0; yy < screen_size_y(s); yy++) {
  		for (xx = 0; xx < screen_size_x(s); xx++)
  			grid_view_set_cell(s->grid, xx, yy, &gc);
  	}
! 	
  	s->cx = 0;
  	s->cy = 0;
  
--- 301,312 ----
  
  	memcpy(&gc, &grid_default_cell, sizeof gc);
  	gc.data = 'E';
! 
  	for (yy = 0; yy < screen_size_y(s); yy++) {
  		for (xx = 0; xx < screen_size_x(s); xx++)
  			grid_view_set_cell(s->grid, xx, yy, &gc);
  	}
! 
  	s->cx = 0;
  	s->cy = 0;