===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.985
retrieving revision 1.986
diff -c -r1.985 -r1.986
*** src/usr.bin/tmux/tmux.h	2020/04/13 14:04:25	1.985
--- src/usr.bin/tmux/tmux.h	2020/04/13 14:46:04	1.986
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.985 2020/04/13 14:04:25 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.986 2020/04/13 14:46:04 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 43,48 ****
--- 43,49 ----
  struct cmd_find_state;
  struct cmdq_item;
  struct cmdq_list;
+ struct cmdq_state;
  struct cmds;
  struct environ;
  struct format_job_tree;
***************
*** 1378,1398 ****
  	struct cmd_find_state	 fs;
  };
  
! /* Command queue item state. */
! struct cmdq_state {
! 	int			 references;
! 
! 	int			 flags;
  #define CMDQ_STATE_REPEAT 0x1
  #define CMDQ_STATE_CONTROL 0x2
  #define CMDQ_STATE_NOHOOKS 0x4
  
- 	struct format_tree	*formats;
- 
- 	struct key_event	 event;
- 	struct cmd_find_state	 current;
- };
- 
  /* Command queue callback. */
  typedef enum cmd_retval (*cmdq_cb) (struct cmdq_item *, void *);
  
--- 1379,1389 ----
  	struct cmd_find_state	 fs;
  };
  
! /* Command queue flags. */
  #define CMDQ_STATE_REPEAT 0x1
  #define CMDQ_STATE_CONTROL 0x2
  #define CMDQ_STATE_NOHOOKS 0x4
  
  /* Command queue callback. */
  typedef enum cmd_retval (*cmdq_cb) (struct cmdq_item *, void *);
  
***************
*** 2108,2117 ****
  struct client	 *cmdq_get_client(struct cmdq_item *);
  struct cmd_find_state *cmdq_get_target(struct cmdq_item *);
  struct cmd_find_state *cmdq_get_source(struct cmdq_item *);
! struct cmdq_state *cmdq_get_state(struct cmdq_item *);
  void		  cmdq_merge_formats(struct cmdq_item *, struct format_tree *);
  struct cmdq_item *cmdq_get_command(struct cmd_list *, struct cmd_find_state *,
! 		     struct mouse_event *, int);
  #define cmdq_get_callback(cb, data) cmdq_get_callback1(#cb, cb, data)
  struct cmdq_item *cmdq_get_callback1(const char *, cmdq_cb, void *);
  struct cmdq_item *cmdq_get_error(const char *);
--- 2099,2110 ----
  struct client	 *cmdq_get_client(struct cmdq_item *);
  struct cmd_find_state *cmdq_get_target(struct cmdq_item *);
  struct cmd_find_state *cmdq_get_source(struct cmdq_item *);
! struct key_event *cmdq_get_event(struct cmdq_item *);
! struct cmd_find_state *cmdq_get_current(struct cmdq_item *);
! int		  cmdq_get_flags(struct cmdq_item *);
  void		  cmdq_merge_formats(struct cmdq_item *, struct format_tree *);
  struct cmdq_item *cmdq_get_command(struct cmd_list *, struct cmd_find_state *,
! 		     struct key_event *, int);
  #define cmdq_get_callback(cb, data) cmdq_get_callback1(#cb, cb, data)
  struct cmdq_item *cmdq_get_callback1(const char *, cmdq_cb, void *);
  struct cmdq_item *cmdq_get_error(const char *);
***************
*** 2147,2153 ****
  void	 key_bindings_remove_table(const char *);
  void	 key_bindings_init(void);
  struct cmdq_item *key_bindings_dispatch(struct key_binding *,
! 	     struct cmdq_item *, struct client *, struct mouse_event *,
  	     struct cmd_find_state *);
  
  /* key-string.c */
--- 2140,2146 ----
  void	 key_bindings_remove_table(const char *);
  void	 key_bindings_init(void);
  struct cmdq_item *key_bindings_dispatch(struct key_binding *,
! 	     struct cmdq_item *, struct client *, struct key_event *,
  	     struct cmd_find_state *);
  
  /* key-string.c */