===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen-write.c,v
retrieving revision 1.40
retrieving revision 1.41
diff -c -r1.40 -r1.41
*** src/usr.bin/tmux/screen-write.c	2009/11/26 21:37:13	1.40
--- src/usr.bin/tmux/screen-write.c	2009/12/03 22:50:10	1.41
***************
*** 1,4 ****
! /* $OpenBSD: screen-write.c,v 1.40 2009/11/26 21:37:13 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: screen-write.c,v 1.41 2009/12/03 22:50:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 183,189 ****
  				break;
  			}
  			size += utf8data.width;
! 			
  			gc->flags |= GRID_FLAG_UTF8;
  			screen_write_cell(ctx, gc, &utf8data);
  			gc->flags &= ~GRID_FLAG_UTF8;
--- 183,189 ----
  				break;
  			}
  			size += utf8data.width;
! 
  			gc->flags |= GRID_FLAG_UTF8;
  			screen_write_cell(ctx, gc, &utf8data);
  			gc->flags &= ~GRID_FLAG_UTF8;
***************
*** 376,382 ****
  				bx = gl->cellsize;
  			else
  				bx = px + nx;
! 			
  			for (xx = ax; xx < bx; xx++) {
  				if (xx >= gl->cellsize)
  					gc = &grid_default_cell;
--- 376,382 ----
  				bx = gl->cellsize;
  			else
  				bx = px + nx;
! 
  			for (xx = ax; xx < bx; xx++) {
  				if (xx >= gl->cellsize)
  					gc = &grid_default_cell;
***************
*** 646,652 ****
  		ny = s->rlower + 1 - s->cy;
  	if (ny == 0)
  		return;
! 	
  	screen_write_initctx(ctx, &ttyctx, 0);
  
  	if (s->cy < s->rupper || s->cy > s->rlower)
--- 646,652 ----
  		ny = s->rlower + 1 - s->cy;
  	if (ny == 0)
  		return;
! 
  	screen_write_initctx(ctx, &ttyctx, 0);
  
  	if (s->cy < s->rupper || s->cy > s->rlower)
***************
*** 682,688 ****
  		tty_write(tty_cmd_deleteline, &ttyctx);
  		return;
  	}
! 	
  	if (ny > s->rlower + 1 - s->cy)
  		ny = s->rlower + 1 - s->cy;
  	if (ny == 0)
--- 682,688 ----
  		tty_write(tty_cmd_deleteline, &ttyctx);
  		return;
  	}
! 
  	if (ny > s->rlower + 1 - s->cy)
  		ny = s->rlower + 1 - s->cy;
  	if (ny == 0)
***************
*** 728,734 ****
  	if (s->cx <= sx - 1)
  		grid_view_clear(s->grid, s->cx, s->cy, sx - s->cx, 1);
  
!  	tty_write(tty_cmd_clearendofline, &ttyctx);
  }
  
  /* Clear to start of line from cursor. */
--- 728,734 ----
  	if (s->cx <= sx - 1)
  		grid_view_clear(s->grid, s->cx, s->cy, sx - s->cx, 1);
  
! 	tty_write(tty_cmd_clearendofline, &ttyctx);
  }
  
  /* Clear to start of line from cursor. */
***************
*** 863,869 ****
  		s->cy++;
  
  	ttyctx.num = wrapped;
!  	tty_write(tty_cmd_linefeed, &ttyctx);
  }
  
  /* Carriage return (cursor to start of line). */
--- 863,869 ----
  		s->cy++;
  
  	ttyctx.num = wrapped;
! 	tty_write(tty_cmd_linefeed, &ttyctx);
  }
  
  /* Carriage return (cursor to start of line). */
***************
*** 988,994 ****
  
  	/*
  	 * If the width is zero, combine onto the previous character, if
! 	 * there is space. 
  	 */
  	if (width == 0) {
  		if (screen_write_combine(ctx, utf8data) == 0) {
--- 988,994 ----
  
  	/*
  	 * If the width is zero, combine onto the previous character, if
! 	 * there is space.
  	 */
  	if (width == 0) {
  		if (screen_write_combine(ctx, utf8data) == 0) {