src/usr.bin/tmux/tmux.h - diff

Return to tmux.h CVS log

Up to [local] / src / usr.bin / tmux

Diff for /src/usr.bin/tmux/tmux.h between version 1.261 and 1.262

-version 1.261, 2011/01/01 03:39:21
+version 1.262, 2011/01/01 16:51:21
 Line 1270
 Line 1270
 Line 1270
  };
  SPLAY_HEAD(key_bindings, key_binding);
- /* Set/display option data. */
+ /*
- struct set_option_entry {
+  * Option table entries. The option table is the user-visible part of the
-         const char      *name;
+  * option, as opposed to the internal options (struct option) which are just
-         enum {
+  * number or string.
-                 SET_OPTION_STRING,
+  */
-                 SET_OPTION_NUMBER,
+ enum options_table_type {
-                 SET_OPTION_KEYS,
+         OPTIONS_TABLE_STRING,
-                 SET_OPTION_COLOUR,
+         OPTIONS_TABLE_NUMBER,
-                 SET_OPTION_ATTRIBUTES,
+         OPTIONS_TABLE_KEYS,
-                 SET_OPTION_FLAG,
+         OPTIONS_TABLE_COLOUR,
-                 SET_OPTION_CHOICE
+         OPTIONS_TABLE_ATTRIBUTES,
-         } type;
+         OPTIONS_TABLE_FLAG,
+         OPTIONS_TABLE_CHOICE
+ };
-         u_int            minimum;
+ struct options_table_entry {
-         u_int            maximum;
+         const char             *name;
+         enum options_table_type type;
-         const char     **choices;
+         u_int                   minimum;
+         u_int                   maximum;
+         const char            **choices;
+         const char             *default_str;
+         long long               default_num;
  };
  /* List of configuration causes. */
-Line 1356
+Line 1364
 Line 1356
 Line 1364
              struct options *, const char *, void *, void (*)(void *));
  void   *options_get_data(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 *);
  /* job.c */
  extern struct joblist all_jobs;
  int     job_cmp(struct job *, struct job *);
-Line 1460
+Line 1477
 Line 1460
 Line 1477
  /* clock.c */
  extern const char clock_table[14][5][5];
  void             clock_draw(struct screen_write_ctx *, int, int);
- /* cmd-set-option.c */
- extern const struct set_option_entry set_option_table[];
- extern const struct set_option_entry set_session_option_table[];
- extern const struct set_option_entry set_window_option_table[];
- const char      *cmd_set_option_print(
-                     const struct set_option_entry *, struct options_entry *);
  /* cmd.c */
  int              cmd_pack_argv(int, char **, char *, size_t);