===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/grid.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -c -r1.17 -r1.18
*** src/usr.bin/tmux/grid.c	2009/12/03 22:50:10	1.17
--- src/usr.bin/tmux/grid.c	2010/04/06 21:35:44	1.18
***************
*** 1,4 ****
! /* $OpenBSD: grid.c,v 1.17 2009/12/03 22:50:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: grid.c,v 1.18 2010/04/06 21:35:44 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 46,64 ****
  	    gc, sizeof gd->linedata[py].utf8data[px]);		\
  } while (0)
  
- int	grid_check_x(struct grid *, u_int);
  int	grid_check_y(struct grid *, u_int);
  
  #ifdef DEBUG
  int
- grid_check_x(struct grid *gd, u_int px)
- {
- 	if ((px) >= (gd)->sx)
- 		log_fatalx("x out of range: %u", px);
- 	return (0);
- }
- 
- int
  grid_check_y(struct grid *gd, u_int py)
  {
  	if ((py) >= (gd)->hsize + (gd)->sy)
--- 46,55 ----
***************
*** 67,82 ****
  }
  #else
  int
- grid_check_x(struct grid *gd, u_int px)
- {
- 	if ((px) >= (gd)->sx) {
- 		log_debug("x out of range: %u", px);
- 		return (-1);
- 	}
- 	return (0);
- }
- 
- int
  grid_check_y(struct grid *gd, u_int py)
  {
  	if ((py) >= (gd)->hsize + (gd)->sy) {
--- 58,63 ----
***************
*** 270,277 ****
  const struct grid_cell *
  grid_peek_cell(struct grid *gd, u_int px, u_int py)
  {
- 	if (grid_check_x(gd, px) != 0)
- 		return (&grid_default_cell);
  	if (grid_check_y(gd, py) != 0)
  		return (&grid_default_cell);
  
--- 251,256 ----
***************
*** 284,291 ****
  struct grid_cell *
  grid_get_cell(struct grid *gd, u_int px, u_int py)
  {
- 	if (grid_check_x(gd, px) != 0)
- 		return (NULL);
  	if (grid_check_y(gd, py) != 0)
  		return (NULL);
  
--- 263,268 ----
***************
*** 298,305 ****
  grid_set_cell(
      struct grid *gd, u_int px, u_int py, const struct grid_cell *gc)
  {
- 	if (grid_check_x(gd, px) != 0)
- 		return;
  	if (grid_check_y(gd, py) != 0)
  		return;
  
--- 275,280 ----
***************
*** 311,318 ****
  const struct grid_utf8 *
  grid_peek_utf8(struct grid *gd, u_int px, u_int py)
  {
- 	if (grid_check_x(gd, px) != 0)
- 		return (NULL);
  	if (grid_check_y(gd, py) != 0)
  		return (NULL);
  
--- 286,291 ----
***************
*** 325,332 ****
  struct grid_utf8 *
  grid_get_utf8(struct grid *gd, u_int px, u_int py)
  {
- 	if (grid_check_x(gd, px) != 0)
- 		return (NULL);
  	if (grid_check_y(gd, py) != 0)
  		return (NULL);
  
--- 298,303 ----
***************
*** 339,346 ****
  grid_set_utf8(
      struct grid *gd, u_int px, u_int py, const struct grid_utf8 *gc)
  {
- 	if (grid_check_x(gd, px) != 0)
- 		return;
  	if (grid_check_y(gd, py) != 0)
  		return;
  
--- 310,315 ----
***************
*** 364,373 ****
  		return;
  	}
  
- 	if (grid_check_x(gd, px) != 0)
- 		return;
- 	if (grid_check_x(gd, px + nx - 1) != 0)
- 		return;
  	if (grid_check_y(gd, py) != 0)
  		return;
  	if (grid_check_y(gd, py + ny - 1) != 0)
--- 333,338 ----
***************
*** 465,476 ****
  	if (nx == 0 || px == dx)
  		return;
  
- 	if (grid_check_x(gd, px) != 0)
- 		return;
- 	if (grid_check_x(gd, px + nx - 1) != 0)
- 		return;
- 	if (grid_check_x(gd, dx + nx - 1) != 0)
- 		return;
  	if (grid_check_y(gd, py) != 0)
  		return;
  	gl = &gd->linedata[py];
--- 430,435 ----