===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/options-table.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -c -r1.99 -r1.100
*** src/usr.bin/tmux/options-table.c	2019/03/18 20:53:33	1.99
--- src/usr.bin/tmux/options-table.c	2019/03/18 21:46:02	1.100
***************
*** 1,4 ****
! /* $OpenBSD: options-table.c,v 1.99 2019/03/18 20:53:33 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
--- 1,4 ----
! /* $OpenBSD: options-table.c,v 1.100 2019/03/18 21:46:02 nicm Exp $ */
  
  /*
   * Copyright (c) 2011 Nicholas Marriott <nicholas.marriott@gmail.com>
***************
*** 315,368 ****
  	  .default_str = "lock -np"
  	},
  
- 	{ .name = "message-attr",
- 	  .type = OPTIONS_TABLE_ATTRIBUTES,
- 	  .scope = OPTIONS_TABLE_SESSION,
- 	  .default_num = 0,
- 	  .style = "message-style"
- 	},
- 
- 	{ .name = "message-bg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_SESSION,
- 	  .default_num = 3,
- 	  .style = "message-style"
- 	},
- 
- 	{ .name = "message-command-attr",
- 	  .type = OPTIONS_TABLE_ATTRIBUTES,
- 	  .scope = OPTIONS_TABLE_SESSION,
- 	  .default_num = 0,
- 	  .style = "message-command-style"
- 	},
- 
- 	{ .name = "message-command-bg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_SESSION,
- 	  .default_num = 0,
- 	  .style = "message-command-style"
- 	},
- 
- 	{ .name = "message-command-fg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_SESSION,
- 	  .default_num = 3,
- 	  .style = "message-command-style"
- 	},
- 
  	{ .name = "message-command-style",
  	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_SESSION,
  	  .default_str = "bg=black,fg=yellow"
  	},
  
- 	{ .name = "message-fg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_SESSION,
- 	  .default_num = 0,
- 	  .style = "message-style"
- 	},
- 
  	{ .name = "message-style",
  	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_SESSION,
--- 315,326 ----
***************
*** 427,451 ****
  	  .default_num = 1
  	},
  
- 	{ .name = "status-attr",
- 	  .type = OPTIONS_TABLE_ATTRIBUTES,
- 	  .scope = OPTIONS_TABLE_SESSION,
- 	  .default_num = 0,
- 	  .style = "status-style"
- 	},
- 
  	{ .name = "status-bg",
  	  .type = OPTIONS_TABLE_COLOUR,
  	  .scope = OPTIONS_TABLE_SESSION,
  	  .default_num = 2,
- 	  .style = "status-style"
  	},
  
  	{ .name = "status-fg",
  	  .type = OPTIONS_TABLE_COLOUR,
  	  .scope = OPTIONS_TABLE_SESSION,
  	  .default_num = 0,
- 	  .style = "status-style"
  	},
  
  	{ .name = "status-format",
--- 385,400 ----
***************
*** 482,508 ****
  	  .default_str = "[#S] "
  	},
  
- 	{ .name = "status-left-attr",
- 	  .type = OPTIONS_TABLE_ATTRIBUTES,
- 	  .scope = OPTIONS_TABLE_SESSION,
- 	  .default_num = 0,
- 	  .style = "status-left-style"
- 	},
- 
- 	{ .name = "status-left-bg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_SESSION,
- 	  .default_num = 8,
- 	  .style = "status-left-style"
- 	},
- 
- 	{ .name = "status-left-fg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_SESSION,
- 	  .default_num = 8,
- 	  .style = "status-left-style"
- 	},
- 
  	{ .name = "status-left-length",
  	  .type = OPTIONS_TABLE_NUMBER,
  	  .scope = OPTIONS_TABLE_SESSION,
--- 431,436 ----
***************
*** 532,558 ****
  	                 "\"#{=21:pane_title}\" %H:%M %d-%b-%y"
  	},
  
- 	{ .name = "status-right-attr",
- 	  .type = OPTIONS_TABLE_ATTRIBUTES,
- 	  .scope = OPTIONS_TABLE_SESSION,
- 	  .default_num = 0,
- 	  .style = "status-right-style"
- 	},
- 
- 	{ .name = "status-right-bg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_SESSION,
- 	  .default_num = 8,
- 	  .style = "status-right-style"
- 	},
- 
- 	{ .name = "status-right-fg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_SESSION,
- 	  .default_num = 8,
- 	  .style = "status-right-style"
- 	},
- 
  	{ .name = "status-right-length",
  	  .type = OPTIONS_TABLE_NUMBER,
  	  .scope = OPTIONS_TABLE_SESSION,
--- 460,465 ----
***************
*** 667,693 ****
  	  .default_num = 80
  	},
  
- 	{ .name = "mode-attr",
- 	  .type = OPTIONS_TABLE_ATTRIBUTES,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 0,
- 	  .style = "mode-style"
- 	},
- 
- 	{ .name = "mode-bg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 3,
- 	  .style = "mode-style"
- 	},
- 
- 	{ .name = "mode-fg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 0,
- 	  .style = "mode-style"
- 	},
- 
  	{ .name = "mode-keys",
  	  .type = OPTIONS_TABLE_CHOICE,
  	  .scope = OPTIONS_TABLE_WINDOW,
--- 574,579 ----
***************
*** 737,756 ****
  	  .default_num = 0
  	},
  
- 	{ .name = "pane-active-border-bg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 8,
- 	  .style = "pane-active-border-style"
- 	},
- 
- 	{ .name = "pane-active-border-fg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 2,
- 	  .style = "pane-active-border-style"
- 	},
- 
  	{ .name = "pane-active-border-style",
  	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_WINDOW,
--- 623,628 ----
***************
*** 765,784 ****
  	  .default_num = 0
  	},
  
- 	{ .name = "pane-border-bg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 8,
- 	  .style = "pane-border-style"
- 	},
- 
- 	{ .name = "pane-border-fg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 8,
- 	  .style = "pane-border-style"
- 	},
- 
  	{ .name = "pane-border-format",
  	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_WINDOW,
--- 637,642 ----
***************
*** 830,924 ****
  	  .default_str = "default"
  	},
  
- 	{ .name = "window-status-activity-attr",
- 	  .type = OPTIONS_TABLE_ATTRIBUTES,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = GRID_ATTR_REVERSE,
- 	  .style = "window-status-activity-style"
- 	},
- 
- 	{ .name = "window-status-activity-bg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 8,
- 	  .style = "window-status-activity-style"
- 	},
- 
- 	{ .name = "window-status-activity-fg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 8,
- 	  .style = "window-status-activity-style"
- 	},
- 
  	{ .name = "window-status-activity-style",
  	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_WINDOW,
  	  .default_str = "reverse"
  	},
  
- 	{ .name = "window-status-attr",
- 	  .type = OPTIONS_TABLE_ATTRIBUTES,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 0,
- 	  .style = "window-status-style"
- 	},
- 
- 	{ .name = "window-status-bell-attr",
- 	  .type = OPTIONS_TABLE_ATTRIBUTES,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = GRID_ATTR_REVERSE,
- 	  .style = "window-status-bell-style"
- 	},
- 
- 	{ .name = "window-status-bell-bg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 8,
- 	  .style = "window-status-bell-style"
- 	},
- 
- 	{ .name = "window-status-bell-fg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 8,
- 	  .style = "window-status-bell-style"
- 	},
- 
  	{ .name = "window-status-bell-style",
  	  .type = OPTIONS_TABLE_STYLE,
  	  .scope = OPTIONS_TABLE_WINDOW,
  	  .default_str = "reverse"
  	},
  
- 	{ .name = "window-status-bg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 8,
- 	  .style = "window-status-style"
- 	},
- 
- 	{ .name = "window-status-current-attr",
- 	  .type = OPTIONS_TABLE_ATTRIBUTES,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 0,
- 	  .style = "window-status-current-style"
- 	},
- 
- 	{ .name = "window-status-current-bg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 8,
- 	  .style = "window-status-current-style"
- 	},
- 
- 	{ .name = "window-status-current-fg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 8,
- 	  .style = "window-status-current-style"
- 	},
- 
  	{ .name = "window-status-current-format",
  	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_WINDOW,
--- 688,705 ----
***************
*** 931,968 ****
  	  .default_str = "default"
  	},
  
- 	{ .name = "window-status-fg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 8,
- 	  .style = "window-status-style"
- 	},
- 
  	{ .name = "window-status-format",
  	  .type = OPTIONS_TABLE_STRING,
  	  .scope = OPTIONS_TABLE_WINDOW,
  	  .default_str = "#I:#W#{?window_flags,#{window_flags}, }"
- 	},
- 
- 	{ .name = "window-status-last-attr",
- 	  .type = OPTIONS_TABLE_ATTRIBUTES,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 0,
- 	  .style = "window-status-last-style"
- 	},
- 
- 	{ .name = "window-status-last-bg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 8,
- 	  .style = "window-status-last-style"
- 	},
- 
- 	{ .name = "window-status-last-fg",
- 	  .type = OPTIONS_TABLE_COLOUR,
- 	  .scope = OPTIONS_TABLE_WINDOW,
- 	  .default_num = 8,
- 	  .style = "window-status-last-style"
  	},
  
  	{ .name = "window-status-last-style",
--- 712,721 ----