===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.342
retrieving revision 1.343
diff -c -r1.342 -r1.343
*** src/usr.bin/tmux/tmux.h	2012/06/18 13:16:42	1.342
--- src/usr.bin/tmux/tmux.h	2012/06/25 14:08:55	1.343
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.342 2012/06/18 13:16:42 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.343 2012/06/25 14:08:55 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 846,851 ****
--- 846,867 ----
  	void	(*timer)(struct window_pane *);
  };
  
+ /* Structures for choose mode. */
+ struct window_choose_data {
+ 	struct client		*client;
+ 	struct session		*session;
+ 	struct format_tree	*ft;
+ 	char		        *ft_template;
+ 	char			*raw_format;
+ 	char			*action;
+ 	u_int			 idx;
+ };
+ 
+ struct window_choose_mode_item {
+     struct window_choose_data   *wcd;
+     char                        *name;
+ };
+ 
  /* Child window structure. */
  struct window_pane {
  	u_int		 id;
***************
*** 2121,2130 ****
  extern const struct window_mode window_choose_mode;
  void		 window_choose_vadd(
  		     struct window_pane *, int, const char *, va_list);
! void printflike3 window_choose_add(
! 		     struct window_pane *, int, const char *, ...);
  void		 window_choose_ready(struct window_pane *,
! 		     u_int, void (*)(void *, int), void (*)(void *), void *);
  
  /* names.c */
  void		 queue_window_name(struct window *);
--- 2137,2150 ----
  extern const struct window_mode window_choose_mode;
  void		 window_choose_vadd(
  		     struct window_pane *, int, const char *, va_list);
! void		 window_choose_add(struct window_pane *,
! 			 struct window_choose_data *);
  void		 window_choose_ready(struct window_pane *,
! 		     u_int, void (*)(struct window_choose_data *),
! 		     void (*)(struct window_choose_data *));
! struct window_choose_data	*window_choose_data_create(
! 			struct cmd_ctx *);
! void		 window_choose_ctx(struct window_choose_data *);
  
  /* names.c */
  void		 queue_window_name(struct window *);