===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/grid.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -c -r1.55 -r1.56
*** src/usr.bin/tmux/grid.c	2016/09/02 20:57:20	1.55
--- src/usr.bin/tmux/grid.c	2016/10/10 21:29:23	1.56
***************
*** 1,4 ****
! /* $OpenBSD: grid.c,v 1.55 2016/09/02 20:57:20 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: grid.c,v 1.56 2016/10/10 21:29:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 43,58 ****
  	0, { .data = { 0, 8, 8, ' ' } }
  };
  
! void	grid_reflow_copy(struct grid_line *, u_int, struct grid_line *l,
! 	    u_int, u_int);
! void	grid_reflow_join(struct grid *, u_int *, struct grid_line *, u_int);
! void	grid_reflow_split(struct grid *, u_int *, struct grid_line *, u_int,
! 	    u_int);
! void	grid_reflow_move(struct grid *, u_int *, struct grid_line *);
! size_t	grid_string_cells_fg(const struct grid_cell *, int *);
! size_t	grid_string_cells_bg(const struct grid_cell *, int *);
! void	grid_string_cells_code(const struct grid_cell *,
! 	    const struct grid_cell *, char *, size_t, int);
  
  /* Copy default into a cell. */
  static void
--- 43,59 ----
  	0, { .data = { 0, 8, 8, ' ' } }
  };
  
! static void	grid_reflow_copy(struct grid_line *, u_int, struct grid_line *,
! 		    u_int, u_int);
! static void	grid_reflow_join(struct grid *, u_int *, struct grid_line *,
! 		    u_int);
! static void	grid_reflow_split(struct grid *, u_int *, struct grid_line *,
! 		    u_int, u_int);
! static void	grid_reflow_move(struct grid *, u_int *, struct grid_line *);
! static size_t	grid_string_cells_fg(const struct grid_cell *, int *);
! static size_t	grid_string_cells_bg(const struct grid_cell *, int *);
! static void	grid_string_cells_code(const struct grid_cell *,
! 		    const struct grid_cell *, char *, size_t, int);
  
  /* Copy default into a cell. */
  static void
***************
*** 473,479 ****
  }
  
  /* Get ANSI foreground sequence. */
! size_t
  grid_string_cells_fg(const struct grid_cell *gc, int *values)
  {
  	size_t	n;
--- 474,480 ----
  }
  
  /* Get ANSI foreground sequence. */
! static size_t
  grid_string_cells_fg(const struct grid_cell *gc, int *values)
  {
  	size_t	n;
***************
*** 522,528 ****
  }
  
  /* Get ANSI background sequence. */
! size_t
  grid_string_cells_bg(const struct grid_cell *gc, int *values)
  {
  	size_t	n;
--- 523,529 ----
  }
  
  /* Get ANSI background sequence. */
! static size_t
  grid_string_cells_bg(const struct grid_cell *gc, int *values)
  {
  	size_t	n;
***************
*** 575,581 ****
   * given a current state. The output buffer must be able to hold at least 57
   * bytes.
   */
! void
  grid_string_cells_code(const struct grid_cell *lastgc,
      const struct grid_cell *gc, char *buf, size_t len, int escape_c0)
  {
--- 576,582 ----
   * given a current state. The output buffer must be able to hold at least 57
   * bytes.
   */
! static void
  grid_string_cells_code(const struct grid_cell *lastgc,
      const struct grid_cell *gc, char *buf, size_t len, int escape_c0)
  {
***************
*** 773,779 ****
  }
  
  /* Copy a section of a line. */
! void
  grid_reflow_copy(struct grid_line *dst_gl, u_int to, struct grid_line *src_gl,
      u_int from, u_int to_copy)
  {
--- 774,780 ----
  }
  
  /* Copy a section of a line. */
! static void
  grid_reflow_copy(struct grid_line *dst_gl, u_int to, struct grid_line *src_gl,
      u_int from, u_int to_copy)
  {
***************
*** 798,804 ****
  }
  
  /* Join line data. */
! void
  grid_reflow_join(struct grid *dst, u_int *py, struct grid_line *src_gl,
      u_int new_x)
  {
--- 799,805 ----
  }
  
  /* Join line data. */
! static void
  grid_reflow_join(struct grid *dst, u_int *py, struct grid_line *src_gl,
      u_int new_x)
  {
***************
*** 833,839 ****
  }
  
  /* Split line data. */
! void
  grid_reflow_split(struct grid *dst, u_int *py, struct grid_line *src_gl,
      u_int new_x, u_int offset)
  {
--- 834,840 ----
  }
  
  /* Split line data. */
! static void
  grid_reflow_split(struct grid *dst, u_int *py, struct grid_line *src_gl,
      u_int new_x, u_int offset)
  {
***************
*** 873,879 ****
  }
  
  /* Move line data. */
! void
  grid_reflow_move(struct grid *dst, u_int *py, struct grid_line *src_gl)
  {
  	struct grid_line	*dst_gl;
--- 874,880 ----
  }
  
  /* Move line data. */
! static void
  grid_reflow_move(struct grid *dst, u_int *py, struct grid_line *src_gl)
  {
  	struct grid_line	*dst_gl;