===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.769
retrieving revision 1.770
diff -c -r1.769 -r1.770
*** src/usr.bin/tmux/tmux.h	2017/05/15 16:44:04	1.769
--- src/usr.bin/tmux/tmux.h	2017/05/17 15:20:23	1.770
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.769 2017/05/15 16:44:04 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.770 2017/05/17 15:20:23 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 1284,1289 ****
--- 1284,1291 ----
  };
  
  /* Client connection. */
+ typedef int (*prompt_input_cb)(struct client *, void *, const char *, int);
+ typedef void (*prompt_free_cb)(void *);
  struct client {
  	const char	*name;
  	struct tmuxpeer	*peer;
***************
*** 1353,1359 ****
  	struct key_table *keytable;
  
  	struct event	 identify_timer;
! 	void		(*identify_callback)(struct client *, struct window_pane *);
  	void		*identify_callback_data;
  
  	char		*message_string;
--- 1355,1362 ----
  	struct key_table *keytable;
  
  	struct event	 identify_timer;
! 	void		(*identify_callback)(struct client *,
! 			     struct window_pane *);
  	void		*identify_callback_data;
  
  	char		*message_string;
***************
*** 1364,1371 ****
  	char		*prompt_string;
  	struct utf8_data *prompt_buffer;
  	size_t		 prompt_index;
! 	int		 (*prompt_callbackfn)(void *, const char *, int);
! 	void		 (*prompt_freefn)(void *);
  	void		*prompt_data;
  	u_int		 prompt_hindex;
  	enum { PROMPT_ENTRY, PROMPT_COMMAND } prompt_mode;
--- 1367,1374 ----
  	char		*prompt_string;
  	struct utf8_data *prompt_buffer;
  	size_t		 prompt_index;
! 	prompt_input_cb	 prompt_inputcb;
! 	prompt_free_cb	 prompt_freecb;
  	void		*prompt_data;
  	u_int		 prompt_hindex;
  	enum { PROMPT_ENTRY, PROMPT_COMMAND } prompt_mode;
***************
*** 1889,1895 ****
  void	 status_message_clear(struct client *);
  int	 status_message_redraw(struct client *);
  void	 status_prompt_set(struct client *, const char *, const char *,
! 	     int (*)(void *, const char *, int), void (*)(void *), void *, int);
  void	 status_prompt_clear(struct client *);
  int	 status_prompt_redraw(struct client *);
  int	 status_prompt_key(struct client *, key_code);
--- 1892,1898 ----
  void	 status_message_clear(struct client *);
  int	 status_message_redraw(struct client *);
  void	 status_prompt_set(struct client *, const char *, const char *,
! 	     prompt_input_cb, prompt_free_cb, void *, int);
  void	 status_prompt_clear(struct client *);
  int	 status_prompt_redraw(struct client *);
  int	 status_prompt_key(struct client *, key_code);