===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.986
retrieving revision 1.987
diff -c -r1.986 -r1.987
*** src/usr.bin/tmux/tmux.h	2020/04/13 14:46:04	1.986
--- src/usr.bin/tmux/tmux.h	2020/04/13 15:55:51	1.987
***************
*** 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>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.987 2020/04/13 15:55:51 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 2058,2063 ****
--- 2058,2064 ----
  char		*cmd_get_alias(const char *);
  const struct cmd_entry *cmd_get_entry(struct cmd *);
  struct args	*cmd_get_args(struct cmd *);
+ u_int		 cmd_get_group(struct cmd *);
  void		 cmd_get_source(struct cmd *, const char **, u_int *);
  struct cmd	*cmd_parse(int, char **, const char *, u_int, char **);
  void		 cmd_free(struct cmd *);
***************
*** 2067,2074 ****
  void		 cmd_list_move(struct cmd_list *, struct cmd_list *);
  void		 cmd_list_free(struct cmd_list *);
  char		*cmd_list_print(struct cmd_list *, int);
! struct cmd	*cmd_list_first(struct cmd_list *, u_int *);
! struct cmd	*cmd_list_next(struct cmd *, u_int *);
  int		 cmd_list_all_have(struct cmd_list *, int);
  int		 cmd_list_any_have(struct cmd_list *, int);
  int		 cmd_mouse_at(struct window_pane *, struct mouse_event *,
--- 2068,2075 ----
  void		 cmd_list_move(struct cmd_list *, struct cmd_list *);
  void		 cmd_list_free(struct cmd_list *);
  char		*cmd_list_print(struct cmd_list *, int);
! struct cmd	*cmd_list_first(struct cmd_list *);
! struct cmd	*cmd_list_next(struct cmd *);
  int		 cmd_list_all_have(struct cmd_list *, int);
  int		 cmd_list_any_have(struct cmd_list *, int);
  int		 cmd_mouse_at(struct window_pane *, struct mouse_event *,
***************
*** 2093,2110 ****
  		     struct cmd_parse_input *);
  
  /* cmd-queue.c */
  struct cmdq_list *cmdq_new(void);
  void cmdq_free(struct cmdq_list *);
  const char	 *cmdq_get_name(struct cmdq_item *);
  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 *);
--- 2094,2118 ----
  		     struct cmd_parse_input *);
  
  /* cmd-queue.c */
+ struct cmdq_state *cmdq_new_state(struct cmd_find_state *, struct key_event *,
+ 		     int);
+ struct cmdq_state *cmdq_link_state(struct cmdq_state *);
+ struct cmdq_state *cmdq_copy_state(struct cmdq_state *);
+ void		  cmdq_free_state(struct cmdq_state *);
+ void printflike(3, 4) cmdq_add_format(struct cmdq_state *, const char *,
+ 		     const char *, ...);
+ void		  cmdq_merge_formats(struct cmdq_item *, struct format_tree *);
  struct cmdq_list *cmdq_new(void);
  void cmdq_free(struct cmdq_list *);
  const char	 *cmdq_get_name(struct cmdq_item *);
  struct client	 *cmdq_get_client(struct cmdq_item *);
+ struct cmdq_state *cmdq_get_state(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 *);
! struct cmdq_item *cmdq_get_command(struct cmd_list *, struct cmdq_state *);
  #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 *);
***************
*** 2113,2120 ****
  void		 cmdq_insert_hook(struct session *, struct cmdq_item *,
  		     struct cmd_find_state *, const char *, ...);
  void		 cmdq_continue(struct cmdq_item *);
- void printflike(3, 4) cmdq_format(struct cmdq_item *, const char *,
- 		     const char *, ...);
  u_int		 cmdq_next(struct client *);
  void		 cmdq_guard(struct cmdq_item *, const char *, int);
  void printflike(2, 3) cmdq_print(struct cmdq_item *, const char *, ...);
--- 2121,2126 ----