===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.1023
retrieving revision 1.1024
diff -c -r1.1023 -r1.1024
*** src/usr.bin/tmux/tmux.h	2020/05/16 14:49:50	1.1023
--- src/usr.bin/tmux/tmux.h	2020/05/16 14:53:23	1.1024
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.1023 2020/05/16 14:49:50 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.1024 2020/05/16 14:53:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 928,935 ****
  
  	struct input_ctx *ictx;
  
! 	struct style	 cached_style;
! 	struct style	 cached_active_style;
  	int		*palette;
  
  	int		 pipe_fd;
--- 928,935 ----
  
  	struct input_ctx *ictx;
  
! 	struct grid_cell cached_gc;
! 	struct grid_cell cached_active_gc;
  	int		*palette;
  
  	int		 pipe_fd;
***************
*** 1825,1831 ****
--- 1825,1838 ----
  char		*format_single(struct cmdq_item *, const char *,
  		     struct client *, struct session *, struct winlink *,
  		     struct window_pane *);
+ char		*format_single_from_state(struct cmdq_item *, const char *,
+ 		    struct client *, struct cmd_find_state *);
  char		*format_single_from_target(struct cmdq_item *, const char *);
+ struct format_tree *format_create_defaults(struct cmdq_item *, struct client *,
+ 		     struct session *, struct winlink *, struct window_pane *);
+ struct format_tree *format_create_from_state(struct cmdq_item *,
+ 		     struct client *, struct cmd_find_state *);
+ struct format_tree *format_create_from_target(struct cmdq_item *);
  void		 format_defaults(struct format_tree *, struct client *,
  		     struct session *, struct winlink *, struct window_pane *);
  void		 format_defaults_window(struct format_tree *, struct window *);
***************
*** 2356,2361 ****
--- 2363,2370 ----
  extern const struct grid_cell grid_default_cell;
  void	 grid_empty_line(struct grid *, u_int, u_int);
  int	 grid_cells_equal(const struct grid_cell *, const struct grid_cell *);
+ int	 grid_cells_look_equal(const struct grid_cell *,
+ 	     const struct grid_cell *);
  struct grid *grid_create(u_int, u_int, u_int);
  void	 grid_destroy(struct grid *);
  int	 grid_compare(struct grid *, struct grid *);
***************
*** 2811,2820 ****
  const char	*style_tostring(struct style *);
  void		 style_apply(struct grid_cell *, struct options *,
  		     const char *);
- int		 style_equal(struct style *, struct style *);
  void		 style_set(struct style *, const struct grid_cell *);
  void		 style_copy(struct style *, struct style *);
- int		 style_is_default(struct style *);
  
  /* spawn.c */
  struct winlink	*spawn_window(struct spawn_context *, char **);
--- 2820,2827 ----