===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/screen-write.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -c -r1.14 -r1.15
*** src/usr.bin/tmux/screen-write.c	2009/07/22 15:55:32	1.14
--- src/usr.bin/tmux/screen-write.c	2009/07/22 16:45:31	1.15
***************
*** 1,4 ****
! /* $OpenBSD: screen-write.c,v 1.14 2009/07/22 15:55:32 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: screen-write.c,v 1.15 2009/07/22 16:45:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 327,333 ****
  	s->rupper = 0;
  	s->rlower = screen_size_y(s) - 1;
  
! 	tty_write_cmd(ctx->wp, TTY_ALIGNMENTTEST);
  }
  
  /* Insert nx characters. */
--- 327,333 ----
  	s->rupper = 0;
  	s->rlower = screen_size_y(s) - 1;
  
! 	tty_write0(ctx->wp, TTY_ALIGNMENTTEST);
  }
  
  /* Insert nx characters. */
***************
*** 349,355 ****
  	if (s->cx <= screen_size_x(s) - 1)
  		grid_view_insert_cells(s->grid, s->cx, s->cy, nx);
  
! 	tty_write_cmd(ctx->wp, TTY_INSERTCHARACTER, nx);
  }
  
  /* Delete nx characters. */
--- 349,355 ----
  	if (s->cx <= screen_size_x(s) - 1)
  		grid_view_insert_cells(s->grid, s->cx, s->cy, nx);
  
! 	tty_writenum(ctx->wp, TTY_INSERTCHARACTER, nx);
  }
  
  /* Delete nx characters. */
***************
*** 371,377 ****
  	if (s->cx <= screen_size_x(s) - 1)
  		grid_view_delete_cells(s->grid, s->cx, s->cy, nx);
  
! 	tty_write_cmd(ctx->wp, TTY_DELETECHARACTER, nx);
  }
  
  /* Insert ny lines. */
--- 371,377 ----
  	if (s->cx <= screen_size_x(s) - 1)
  		grid_view_delete_cells(s->grid, s->cx, s->cy, nx);
  
! 	tty_writenum(ctx->wp, TTY_DELETECHARACTER, nx);
  }
  
  /* Insert ny lines. */
***************
*** 393,399 ****
  
  		grid_view_insert_lines(s->grid, s->cy, ny);
  
! 		tty_write_cmd(ctx->wp, TTY_INSERTLINE, ny);
  		return;
  	}
  
--- 393,399 ----
  
  		grid_view_insert_lines(s->grid, s->cy, ny);
  
! 		tty_writenum(ctx->wp, TTY_INSERTLINE, ny);
  		return;
  	}
  
***************
*** 409,415 ****
  	else
  		grid_view_insert_lines_region(s->grid, s->rlower, s->cy, ny);
  
! 	tty_write_cmd(ctx->wp, TTY_INSERTLINE, ny);
  }
  
  /* Delete ny lines. */
--- 409,415 ----
  	else
  		grid_view_insert_lines_region(s->grid, s->rlower, s->cy, ny);
  
! 	tty_writenum(ctx->wp, TTY_INSERTLINE, ny);
  }
  
  /* Delete ny lines. */
***************
*** 431,437 ****
  
  		grid_view_delete_lines(s->grid, s->cy, ny);
  
! 		tty_write_cmd(ctx->wp, TTY_DELETELINE, ny);
  		return;
  	}
  	
--- 431,437 ----
  
  		grid_view_delete_lines(s->grid, s->cy, ny);
  
! 		tty_writenum(ctx->wp, TTY_DELETELINE, ny);
  		return;
  	}
  	
***************
*** 447,453 ****
  	else
  		grid_view_delete_lines_region(s->grid, s->rlower, s->cy, ny);
  
! 	tty_write_cmd(ctx->wp, TTY_DELETELINE, ny);
  }
  
  /* Clear line at cursor. */
--- 447,453 ----
  	else
  		grid_view_delete_lines_region(s->grid, s->rlower, s->cy, ny);
  
! 	tty_writenum(ctx->wp, TTY_DELETELINE, ny);
  }
  
  /* Clear line at cursor. */
***************
*** 460,466 ****
  
  	grid_view_clear(s->grid, 0, s->cy, screen_size_x(s), 1);
  
! 	tty_write_cmd(ctx->wp, TTY_CLEARLINE);
  }
  
  /* Clear to end of line from cursor. */
--- 460,466 ----
  
  	grid_view_clear(s->grid, 0, s->cy, screen_size_x(s), 1);
  
! 	tty_writenum(ctx->wp, TTY_CLEARLINE, 0);
  }
  
  /* Clear to end of line from cursor. */
***************
*** 477,483 ****
  	if (s->cx <= sx - 1)
  		grid_view_clear(s->grid, s->cx, s->cy, sx - s->cx, 1);
  
!  	tty_write_cmd(ctx->wp, TTY_CLEARENDOFLINE);
  }
  
  /* Clear to start of line from cursor. */
--- 477,483 ----
  	if (s->cx <= sx - 1)
  		grid_view_clear(s->grid, s->cx, s->cy, sx - s->cx, 1);
  
!  	tty_writenum(ctx->wp, TTY_CLEARENDOFLINE, 0);
  }
  
  /* Clear to start of line from cursor. */
***************
*** 496,502 ****
  	else
  		grid_view_clear(s->grid, 0, s->cy, s->cx + 1, 1);
  
! 	tty_write_cmd(ctx->wp, TTY_CLEARSTARTOFLINE);
  }
  
  /* Move cursor to px,py.  */
--- 496,502 ----
  	else
  		grid_view_clear(s->grid, 0, s->cy, s->cx + 1, 1);
  
! 	tty_writenum(ctx->wp, TTY_CLEARSTARTOFLINE, 0);
  }
  
  /* Move cursor to px,py.  */
***************
*** 539,545 ****
  	else if (s->cy > 0)
  		s->cy--;
  
! 	tty_write_cmd(ctx->wp, TTY_REVERSEINDEX);
  }
  
  /* Set scroll region. */
--- 539,545 ----
  	else if (s->cy > 0)
  		s->cy--;
  
! 	tty_writenum(ctx->wp, TTY_REVERSEINDEX, 0);
  }
  
  /* Set scroll region. */
***************
*** 601,607 ****
  	else if (s->cy < screen_size_y(s) - 1)
  		s->cy++;
  
!  	tty_write_cmd(ctx->wp, TTY_LINEFEED);
  }
  
  /* Carriage return (cursor to start of line). */
--- 601,607 ----
  	else if (s->cy < screen_size_y(s) - 1)
  		s->cy++;
  
!  	tty_writenum(ctx->wp, TTY_LINEFEED, 0);
  }
  
  /* Carriage return (cursor to start of line). */
***************
*** 653,659 ****
  		grid_view_clear(s->grid, s->cx, s->cy, sx - s->cx, 1);
  	grid_view_clear(s->grid, 0, s->cy + 1, sx, sy - (s->cy + 1));
  
! 	tty_write_cmd(ctx->wp, TTY_CLEARENDOFSCREEN);
  }
  
  /* Clear to start of screen. */
--- 653,659 ----
  		grid_view_clear(s->grid, s->cx, s->cy, sx - s->cx, 1);
  	grid_view_clear(s->grid, 0, s->cy + 1, sx, sy - (s->cy + 1));
  
! 	tty_writenum(ctx->wp, TTY_CLEARENDOFSCREEN, 0);
  }
  
  /* Clear to start of screen. */
***************
*** 674,680 ****
  	else
  		grid_view_clear(s->grid, 0, s->cy, s->cx + 1, 1);
  
! 	tty_write_cmd(ctx->wp, TTY_CLEARSTARTOFSCREEN);
  }
  
  /* Clear entire screen. */
--- 674,680 ----
  	else
  		grid_view_clear(s->grid, 0, s->cy, s->cx + 1, 1);
  
! 	tty_writenum(ctx->wp, TTY_CLEARSTARTOFSCREEN, 0);
  }
  
  /* Clear entire screen. */
***************
*** 687,693 ****
  
  	grid_view_clear(s->grid, 0, 0, screen_size_x(s), screen_size_y(s));
  
! 	tty_write_cmd(ctx->wp, TTY_CLEARSCREEN);
  }
  
  /* Write cell data. */
--- 687,693 ----
  
  	grid_view_clear(s->grid, 0, 0, screen_size_x(s), screen_size_y(s));
  
! 	tty_writenum(ctx->wp, TTY_CLEARSCREEN, 0);
  }
  
  /* Write cell data. */
***************
*** 697,702 ****
--- 697,703 ----
  {
  	struct screen		*s = ctx->s;
  	struct grid		*gd = s->grid;
+ 	struct tty_ctx		 ttyctx;
  	struct grid_utf8	 gu, *tmp_gu;
  	u_int		 	 width, xx, i;
  	struct grid_cell 	 tmp_gc, *tmp_gc2;
***************
*** 736,742 ****
  		memcpy(tmp_gu->data + i, udata, UTF8_SIZE - i);
  
  		/* Assume the previous character has just been input. */
! 		tty_write_cmd(ctx->wp, TTY_UTF8CHARACTER, udata);
  		return;
  	}
  
--- 737,743 ----
  		memcpy(tmp_gu->data + i, udata, UTF8_SIZE - i);
  
  		/* Assume the previous character has just been input. */
! 		tty_writeptr(ctx->wp, TTY_UTF8CHARACTER, udata);
  		return;
  	}
  
***************
*** 789,800 ****
  
  	/* Draw to the screen if necessary. */
  	if (insert)
! 		tty_write_cmd(ctx->wp, TTY_INSERTCHARACTER, width);
  	if (screen_check_selection(s, s->cx - width, s->cy)) {
  		s->sel.cell.data = gc->data;
! 		tty_write_cmd(ctx->wp, TTY_CELL, &s->sel.cell, &gu);
! 	} else
! 		tty_write_cmd(ctx->wp, TTY_CELL, gc, &gu);
  }
  
  /*
--- 790,806 ----
  
  	/* Draw to the screen if necessary. */
  	if (insert)
! 		tty_writenum(ctx->wp, TTY_INSERTCHARACTER, width);
! 	ttyctx.wp = ctx->wp;
! 	ttyctx.utf8 = &gu;
  	if (screen_check_selection(s, s->cx - width, s->cy)) {
  		s->sel.cell.data = gc->data;
! 		ttyctx.cell = &s->sel.cell;
! 		tty_write_cmd(TTY_CELL, &ttyctx);
! 	} else {
! 		ttyctx.cell = gc;
! 		tty_write_cmd(TTY_CELL, &ttyctx);
! 	}
  }
  
  /*