===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.111
retrieving revision 1.112
diff -c -r1.111 -r1.112
*** src/usr.bin/tmux/tmux.h	2009/09/21 14:56:03	1.111
--- src/usr.bin/tmux/tmux.h	2009/09/22 12:38:10	1.112
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.111 2009/09/21 14:56:03 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.112 2009/09/22 12:38:10 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 544,554 ****
--- 544,558 ----
  	enum {
  		OPTIONS_STRING,
  		OPTIONS_NUMBER,
+ 		OPTIONS_DATA,
  	} type;
  
  	char		*str;
  	long long	 num;
+ 	void		*data;
  
+ 	void		 (*freefn)(void *);
+ 
  	SPLAY_ENTRY(options_entry) entry;
  };
  
***************
*** 557,562 ****
--- 561,569 ----
  	struct options	*parent;
  };
  
+ /* Key list for prefix option. */
+ ARRAY_DECL(keylist, int);
+ 
  /* Screen selection. */
  struct screen_sel {
  	int		 flag;
***************
*** 1085,1091 ****
  	enum {
  		SET_OPTION_STRING,
  		SET_OPTION_NUMBER,
! 		SET_OPTION_KEY,
  		SET_OPTION_COLOUR,
  		SET_OPTION_ATTRIBUTES,
  		SET_OPTION_FLAG,
--- 1092,1098 ----
  	enum {
  		SET_OPTION_STRING,
  		SET_OPTION_NUMBER,
! 		SET_OPTION_KEYS,
  		SET_OPTION_COLOUR,
  		SET_OPTION_ATTRIBUTES,
  		SET_OPTION_FLAG,
***************
*** 1165,1170 ****
--- 1172,1180 ----
  struct options_entry *options_set_number(
      	    struct options *, const char *, long long);
  long long options_get_number(struct options *, const char *);
+ struct options_entry *options_set_data(
+     	    struct options *, const char *, void *, void (*)(void *));
+ void   *options_get_data(struct options *, const char *);
  
  /* environ.c */
  int	environ_cmp(struct environ_entry *, struct environ_entry *);
***************
*** 1245,1251 ****
  	    struct options *, const struct set_option_entry *, char *, int);
  void	set_option_number(struct cmd_ctx *,
      	    struct options *, const struct set_option_entry *, char *);
! void	set_option_key(struct cmd_ctx *,
      	    struct options *, const struct set_option_entry *, char *);
  void	set_option_colour(struct cmd_ctx *,
      	    struct options *, const struct set_option_entry *, char *);
--- 1255,1261 ----
  	    struct options *, const struct set_option_entry *, char *, int);
  void	set_option_number(struct cmd_ctx *,
      	    struct options *, const struct set_option_entry *, char *);
! void	set_option_keys(struct cmd_ctx *,
      	    struct options *, const struct set_option_entry *, char *);
  void	set_option_colour(struct cmd_ctx *,
      	    struct options *, const struct set_option_entry *, char *);