===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/options-table.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -c -r1.122 -r1.123
*** src/usr.bin/tmux/options-table.c	2020/05/16 14:46:14	1.122
--- src/usr.bin/tmux/options-table.c	2020/05/16 15:01:31	1.123
***************
*** 1,4 ****
! /* $OpenBSD: options-table.c,v 1.122 2020/05/16 14:46:14 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: options-table.c,v 1.123 2020/05/16 15:01:31 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 401,415 ****
  	},
  
  	{ .name = "message-command-style",
! 	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_str = "bg=black,fg=yellow"
  	},
  
  	{ .name = "message-style",
! 	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_str = "bg=yellow,fg=black"
  	},
  
  	{ .name = "mouse",
--- 401,419 ----
  	},
  
  	{ .name = "message-command-style",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_str = "bg=black,fg=yellow",
! 	  .flags = OPTIONS_TABLE_IS_STYLE,
! 	  .separator = ","
  	},
  
  	{ .name = "message-style",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_str = "bg=yellow,fg=black",
! 	  .flags = OPTIONS_TABLE_IS_STYLE,
! 	  .separator = ","
  	},
  
  	{ .name = "mouse",
***************
*** 473,485 ****
  	{ .name = "status-bg",
  	  .type = OPTIONS_TABLE_COLOUR,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_num = 2,
  	},
  
  	{ .name = "status-fg",
  	  .type = OPTIONS_TABLE_COLOUR,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_num = 0,
  	},
  
  	{ .name = "status-format",
--- 477,489 ----
  	{ .name = "status-bg",
  	  .type = OPTIONS_TABLE_COLOUR,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_num = 8,
  	},
  
  	{ .name = "status-fg",
  	  .type = OPTIONS_TABLE_COLOUR,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_num = 8,
  	},
  
  	{ .name = "status-format",
***************
*** 526,534 ****
  	},
  
  	{ .name = "status-left-style",
! 	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_str = "default"
  	},
  
  	{ .name = "status-position",
--- 530,540 ----
  	},
  
  	{ .name = "status-left-style",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_str = "default",
! 	  .flags = OPTIONS_TABLE_IS_STYLE,
! 	  .separator = ","
  	},
  
  	{ .name = "status-position",
***************
*** 555,569 ****
  	},
  
  	{ .name = "status-right-style",
! 	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_str = "default"
  	},
  
  	{ .name = "status-style",
! 	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_str = "bg=green,fg=black"
  	},
  
  	{ .name = "update-environment",
--- 561,579 ----
  	},
  
  	{ .name = "status-right-style",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_str = "default",
! 	  .flags = OPTIONS_TABLE_IS_STYLE,
! 	  .separator = ","
  	},
  
  	{ .name = "status-style",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_SESSION,
! 	  .default_str = "bg=green,fg=black",
! 	  .flags = OPTIONS_TABLE_IS_STYLE,
! 	  .separator = ","
  	},
  
  	{ .name = "update-environment",
***************
*** 666,674 ****
  	},
  
  	{ .name = "mode-style",
! 	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "bg=yellow,fg=black"
  	},
  
  	{ .name = "monitor-activity",
--- 676,686 ----
  	},
  
  	{ .name = "mode-style",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "bg=yellow,fg=black",
! 	  .flags = OPTIONS_TABLE_IS_STYLE,
! 	  .separator = ","
  	},
  
  	{ .name = "monitor-activity",
***************
*** 704,712 ****
  	},
  
  	{ .name = "pane-active-border-style",
! 	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "fg=green"
  	},
  
  	{ .name = "pane-base-index",
--- 716,726 ----
  	},
  
  	{ .name = "pane-active-border-style",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "#{?pane_in_mode,fg=yellow,#{?synchronize-panes,fg=red,fg=green}}",
! 	  .flags = OPTIONS_TABLE_IS_STYLE,
! 	  .separator = ","
  	},
  
  	{ .name = "pane-base-index",
***************
*** 732,740 ****
  	},
  
  	{ .name = "pane-border-style",
! 	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "default"
  	},
  
  	{ .name = "remain-on-exit",
--- 746,756 ----
  	},
  
  	{ .name = "pane-border-style",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "default",
! 	  .flags = OPTIONS_TABLE_IS_STYLE,
! 	  .separator = ","
  	},
  
  	{ .name = "remain-on-exit",
***************
*** 750,758 ****
  	},
  
  	{ .name = "window-active-style",
! 	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
! 	  .default_str = "default"
  	},
  
  	{ .name = "window-size",
--- 766,776 ----
  	},
  
  	{ .name = "window-active-style",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
! 	  .default_str = "default",
! 	  .flags = OPTIONS_TABLE_IS_STYLE,
! 	  .separator = ","
  	},
  
  	{ .name = "window-size",
***************
*** 763,783 ****
  	},
  
  	{ .name = "window-style",
! 	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
! 	  .default_str = "default"
  	},
  
  	{ .name = "window-status-activity-style",
! 	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "reverse"
  	},
  
  	{ .name = "window-status-bell-style",
! 	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "reverse"
  	},
  
  	{ .name = "window-status-current-format",
--- 781,807 ----
  	},
  
  	{ .name = "window-style",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_WINDOW|OPTIONS_TABLE_PANE,
! 	  .default_str = "default",
! 	  .flags = OPTIONS_TABLE_IS_STYLE,
! 	  .separator = ","
  	},
  
  	{ .name = "window-status-activity-style",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "reverse",
! 	  .flags = OPTIONS_TABLE_IS_STYLE,
! 	  .separator = ","
  	},
  
  	{ .name = "window-status-bell-style",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "reverse",
! 	  .flags = OPTIONS_TABLE_IS_STYLE,
! 	  .separator = ","
  	},
  
  	{ .name = "window-status-current-format",
***************
*** 787,795 ****
  	},
  
  	{ .name = "window-status-current-style",
! 	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "default"
  	},
  
  	{ .name = "window-status-format",
--- 811,821 ----
  	},
  
  	{ .name = "window-status-current-style",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "default",
! 	  .flags = OPTIONS_TABLE_IS_STYLE,
! 	  .separator = ","
  	},
  
  	{ .name = "window-status-format",
***************
*** 799,807 ****
  	},
  
  	{ .name = "window-status-last-style",
! 	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "default"
  	},
  
  	{ .name = "window-status-separator",
--- 825,835 ----
  	},
  
  	{ .name = "window-status-last-style",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "default",
! 	  .flags = OPTIONS_TABLE_IS_STYLE,
! 	  .separator = ","
  	},
  
  	{ .name = "window-status-separator",
***************
*** 811,819 ****
  	},
  
  	{ .name = "window-status-style",
! 	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "default"
  	},
  
  	{ .name = "wrap-search",
--- 839,849 ----
  	},
  
  	{ .name = "window-status-style",
! 	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_WINDOW,
! 	  .default_str = "default",
! 	  .flags = OPTIONS_TABLE_IS_STYLE,
! 	  .separator = ","
  	},
  
  	{ .name = "wrap-search",