===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/tmux.h,v
retrieving revision 1.583
retrieving revision 1.584
diff -c -r1.583 -r1.584
*** src/usr.bin/tmux/tmux.h	2015/11/19 22:46:46	1.583
--- src/usr.bin/tmux/tmux.h	2015/11/20 12:01:19	1.584
***************
*** 1,4 ****
! /* $OpenBSD: tmux.h,v 1.583 2015/11/19 22:46:46 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: tmux.h,v 1.584 2015/11/20 12:01:19 nicm Exp $ */
  
  /*
   * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 1393,1411 ****
  	OPTIONS_TABLE_CHOICE,
  	OPTIONS_TABLE_STYLE
  };
  
  struct options_table_entry {
! 	const char	       *name;
! 	enum options_table_type	type;
  
! 	u_int			minimum;
! 	u_int			maximum;
! 	const char	      **choices;
  
! 	const char	       *default_str;
! 	long long		default_num;
  
! 	const char	       *style;
  };
  
  /* Common command usages. */
--- 1393,1417 ----
  	OPTIONS_TABLE_CHOICE,
  	OPTIONS_TABLE_STYLE
  };
+ enum options_table_scope {
+ 	OPTIONS_TABLE_SERVER,
+ 	OPTIONS_TABLE_SESSION,
+ 	OPTIONS_TABLE_WINDOW,
+ };
  
  struct options_table_entry {
! 	const char		 *name;
! 	enum options_table_type	  type;
! 	enum options_table_scope  scope;
  
! 	u_int			  minimum;
! 	u_int			  maximum;
! 	const char		**choices;
  
! 	const char		 *default_str;
! 	long long		  default_num;
  
! 	const char		 *style;
  };
  
  /* Common command usages. */
***************
*** 1543,1557 ****
  struct grid_cell *options_get_style(struct options *, const char *);
  
  /* options-table.c */
! extern const struct options_table_entry server_options_table[];
! extern const struct options_table_entry session_options_table[];
! extern const struct options_table_entry window_options_table[];
! void	options_table_populate_tree(const struct options_table_entry *,
! 	    struct options *);
  const char *options_table_print_entry(const struct options_table_entry *,
  	    struct options_entry *, int);
! int	options_table_find(const char *, const struct options_table_entry **,
! 	    const struct options_table_entry **);
  
  /* job.c */
  extern struct joblist all_jobs;
--- 1549,1559 ----
  struct grid_cell *options_get_style(struct options *, const char *);
  
  /* options-table.c */
! extern const struct options_table_entry options_table[];
! void	options_table_populate_tree(enum options_table_scope, struct options *);
  const char *options_table_print_entry(const struct options_table_entry *,
  	    struct options_entry *, int);
! int	options_table_find(const char *, const struct options_table_entry **);
  
  /* job.c */
  extern struct joblist all_jobs;