===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -c -r1.48 -r1.49
*** src/usr.bin/tmux/tmux.h	2009/07/22 18:06:58	1.48
--- src/usr.bin/tmux/tmux.h	2009/07/22 20:53:38	1.49
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.48 2009/07/22 18:06:58 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.49 2009/07/22 20:53:38 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 477,491 ****
  	u_int		 cx;		/* cursor x */
  	u_int		 cy;		/* cursor y */
  
- 	u_int		 old_cx;
- 	u_int		 old_cy;
- 
  	u_int		 rupper;	/* scroll region top */
  	u_int		 rlower;	/* scroll region bottom */
  
- 	u_int		 old_rupper;
- 	u_int		 old_rlower;
- 
  	int		 mode;
  
  	bitstr_t      	*tabs;
--- 477,485 ----
***************
*** 783,790 ****
  	const struct grid_cell *cell;
  	const struct grid_utf8 *utf8;
  
! 	u_int		    num;
! 	void		   *ptr; 
  };
  typedef void tty_cmd_func(struct tty *, struct tty_ctx *);
  
--- 777,795 ----
  	const struct grid_cell *cell;
  	const struct grid_utf8 *utf8;
  
! 	u_int		 num;
! 	void		*ptr; 
! 
! 	/* 
! 	 * Cursor and region position before the screen was updated - this is
! 	 * where the command should be applied; the values in the screen have
! 	 * already been updated.
! 	 */
! 	u_int		 ocx;
! 	u_int		 ocy;
! 
! 	u_int		 orupper;
! 	u_int		 orlower;
  };
  typedef void tty_cmd_func(struct tty *, struct tty_ctx *);
  
***************
*** 1032,1041 ****
  void	tty_set_title(struct tty *, const char *);
  void	tty_update_mode(struct tty *, int);
  void	tty_draw_line(struct tty *, struct screen *, u_int, u_int, u_int);
- void	tty_redraw_region(struct tty *, struct window_pane *);
  int	tty_open(struct tty *, char **);
  void	tty_close(struct tty *, int);
  void	tty_free(struct tty *, int);
  void	tty_cmd_alignmenttest(struct tty *, struct tty_ctx *);
  void	tty_cmd_cell(struct tty *, struct tty_ctx *);
  void	tty_cmd_clearendofline(struct tty *, struct tty_ctx *);
--- 1037,1046 ----
  void	tty_set_title(struct tty *, const char *);
  void	tty_update_mode(struct tty *, int);
  void	tty_draw_line(struct tty *, struct screen *, u_int, u_int, u_int);
  int	tty_open(struct tty *, char **);
  void	tty_close(struct tty *, int);
  void	tty_free(struct tty *, int);
+ void	tty_write(void (*)(struct tty *, struct tty_ctx *), struct tty_ctx *);
  void	tty_cmd_alignmenttest(struct tty *, struct tty_ctx *);
  void	tty_cmd_cell(struct tty *, struct tty_ctx *);
  void	tty_cmd_clearendofline(struct tty *, struct tty_ctx *);
***************
*** 1073,1081 ****
  int	tty_keys_next(struct tty *, int *, u_char *);
  
  /* tty-write.c */
- void	tty_write0(struct window_pane *, tty_cmd_func *);
- void	tty_writenum(struct window_pane *, tty_cmd_func *, u_int);
- void	tty_writeptr(struct window_pane *, tty_cmd_func *, void *);
  void	tty_write(tty_cmd_func *, struct tty_ctx *);
  
  /* options-cmd.c */
--- 1078,1083 ----