Instead of separate tables for different types of options, give each

option a scope type (server, session, window) in one table.

1 files changed, 143 insertions, 40 deletions

diff --git a/usr.bin/tmux/options-table.c b/usr.bin/tmux/options-table.c
index 13917ad3dd7..677791f8efb 100644
--- a/usr.bin/tmux/options-table.c
+++ b/usr.bin/tmux/options-table.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: options-table.c,v 1.66 2015/11/12 11:09:11 nicm Exp $ */
+/* $OpenBSD: options-table.c,v 1.67 2015/11/20 12:01:19 nicm Exp $ */
 
 /*
  * Copyright (c) 2011 Nicholas Marriott <nicm@users.sourceforge.net>
@@ -53,9 +53,10 @@ const char *options_table_bell_action_list[] = {
 };
 
 /* Server options. */
-const struct options_table_entry server_options_table[] = {
+const struct options_table_entry options_table[] = {
 	{ .name = "buffer-limit",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_SERVER,
 	  .minimum = 1,
 	  .maximum = INT_MAX,
 	  .default_num = 20
@@ -63,11 +64,13 @@ const struct options_table_entry server_options_table[] = {
 
 	{ .name = "default-terminal",
 	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_SERVER,
 	  .default_str = "screen"
 	},
 
 	{ .name = "escape-time",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_SERVER,
 	  .minimum = 0,
 	  .maximum = INT_MAX,
 	  .default_num = 500
@@ -75,21 +78,25 @@ const struct options_table_entry server_options_table[] = {
 
 	{ .name = "exit-unattached",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SERVER,
 	  .default_num = 0
 	},
 
 	{ .name = "focus-events",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SERVER,
 	  .default_num = 0
 	},
 
 	{ .name = "history-file",
 	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_SERVER,
 	  .default_str = ""
 	},
 
 	{ .name = "message-limit",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_SERVER,
 	  .minimum = 0,
 	  .maximum = INT_MAX,
 	  .default_num = 100
@@ -97,28 +104,27 @@ const struct options_table_entry server_options_table[] = {
 
 	{ .name = "quiet",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SERVER,
 	  .default_num = 0
 	},
 
 	{ .name = "set-clipboard",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SERVER,
 	  .default_num = 1
 	},
 
 	{ .name = "terminal-overrides",
 	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_SERVER,
 	  .default_str = "xterm*:XT:Ms=\\E]52;%p1%s;%p2%s\\007"
 	                 ":Cs=\\E]12;%p1%s\\007:Cr=\\E]112\\007"
 			 ":Ss=\\E[%p1%d q:Se=\\E[2 q,screen*:XT"
 	},
 
-	{ .name = NULL }
-};
-
-/* Session options. */
-const struct options_table_entry session_options_table[] = {
 	{ .name = "assume-paste-time",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .minimum = 0,
 	  .maximum = INT_MAX,
 	  .default_num = 1,
@@ -126,6 +132,7 @@ const struct options_table_entry session_options_table[] = {
 
 	{ .name = "base-index",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .minimum = 0,
 	  .maximum = INT_MAX,
 	  .default_num = 0
@@ -133,47 +140,56 @@ const struct options_table_entry session_options_table[] = {
 
 	{ .name = "bell-action",
 	  .type = OPTIONS_TABLE_CHOICE,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .choices = options_table_bell_action_list,
 	  .default_num = BELL_ANY
 	},
 
 	{ .name = "bell-on-alert",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_num = 0
 	},
 
 	{ .name = "default-command",
 	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_str = ""
 	},
 
 	{ .name = "default-shell",
 	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_str = _PATH_BSHELL
 	},
 
 	{ .name = "destroy-unattached",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_num = 0
 	},
 
 	{ .name = "detach-on-destroy",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_num = 1
 	},
 
 	{ .name = "display-panes-active-colour",
 	  .type = OPTIONS_TABLE_COLOUR,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_num = 1
 	},
 
 	{ .name = "display-panes-colour",
 	  .type = OPTIONS_TABLE_COLOUR,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_num = 4
 	},
 
 	{ .name = "display-panes-time",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .minimum = 1,
 	  .maximum = INT_MAX,
 	  .default_num = 1000
@@ -181,6 +197,7 @@ const struct options_table_entry session_options_table[] = {
 
 	{ .name = "display-time",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .minimum = 1,
 	  .maximum = INT_MAX,
 	  .default_num = 750
@@ -188,6 +205,7 @@ const struct options_table_entry session_options_table[] = {
 
 	{ .name = "history-limit",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .minimum = 0,
 	  .maximum = INT_MAX,
 	  .default_num = 2000
@@ -195,6 +213,7 @@ const struct options_table_entry session_options_table[] = {
 
 	{ .name = "lock-after-time",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .minimum = 0,
 	  .maximum = INT_MAX,
 	  .default_num = 0
@@ -202,77 +221,91 @@ const struct options_table_entry session_options_table[] = {
 
 	{ .name = "lock-command",
 	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .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,
 	  .default_str = "bg=yellow,fg=black"
 	},
 
 	{ .name = "mouse",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_num = 0
 	},
 
 	{ .name = "prefix",
 	  .type = OPTIONS_TABLE_KEY,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_num = '\002',
 	},
 
 	{ .name = "prefix2",
 	  .type = OPTIONS_TABLE_KEY,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_num = KEYC_NONE,
 	},
 
 	{ .name = "renumber-windows",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_num = 0
 	},
 
 	{ .name = "repeat-time",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .minimum = 0,
 	  .maximum = SHRT_MAX,
 	  .default_num = 500
@@ -280,44 +313,52 @@ const struct options_table_entry session_options_table[] = {
 
 	{ .name = "set-remain-on-exit",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_num = 0
 	},
 
 	{ .name = "set-titles",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_num = 0
 	},
 
 	{ .name = "set-titles-string",
 	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_str = "#S:#I:#W - \"#T\" #{session_alerts}"
 	},
 
 	{ .name = "status",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .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-interval",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .minimum = 0,
 	  .maximum = INT_MAX,
 	  .default_num = 15
@@ -325,41 +366,48 @@ const struct options_table_entry session_options_table[] = {
 
 	{ .name = "status-justify",
 	  .type = OPTIONS_TABLE_CHOICE,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .choices = options_table_status_justify_list,
 	  .default_num = 0
 	},
 
 	{ .name = "status-keys",
 	  .type = OPTIONS_TABLE_CHOICE,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .choices = options_table_status_keys_list,
 	  .default_num = MODEKEY_EMACS
 	},
 
 	{ .name = "status-left",
 	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .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,
 	  .minimum = 0,
 	  .maximum = SHRT_MAX,
 	  .default_num = 10
@@ -367,40 +415,47 @@ const struct options_table_entry session_options_table[] = {
 
 	{ .name = "status-left-style",
 	  .type = OPTIONS_TABLE_STYLE,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_str = "default"
 	},
 
 	{ .name = "status-position",
 	  .type = OPTIONS_TABLE_CHOICE,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .choices = options_table_status_position_list,
 	  .default_num = 1
 	},
 
 	{ .name = "status-right",
 	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_str = " \"#{=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,
 	  .minimum = 0,
 	  .maximum = SHRT_MAX,
 	  .default_num = 40
@@ -408,16 +463,19 @@ const struct options_table_entry session_options_table[] = {
 
 	{ .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",
 	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_str = "DISPLAY SSH_ASKPASS SSH_AUTH_SOCK SSH_AGENT_PID "
 	                 "SSH_CONNECTION WINDOWID XAUTHORITY"
 
@@ -425,68 +483,75 @@ const struct options_table_entry session_options_table[] = {
 
 	{ .name = "visual-activity",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_num = 0
 	},
 
 	{ .name = "visual-bell",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_num = 0
 	},
 
 	{ .name = "visual-silence",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_num = 0
 	},
 
 	{ .name = "word-separators",
 	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_SESSION,
 	  .default_str = " -_@"
 	},
 
-	{ .name = NULL }
-};
-
-/* Window options. */
-const struct options_table_entry window_options_table[] = {
 	{ .name = "aggressive-resize",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_num = 0
 	},
 
 	{ .name = "allow-rename",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_num = 1
 	},
 
 	{ .name = "alternate-screen",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_num = 1
 	},
 
 	{ .name = "automatic-rename",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_num = 1
 	},
 
 	{ .name = "automatic-rename-format",
 	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_str = "#{?pane_in_mode,[tmux],#{pane_current_command}}"
 	                 "#{?pane_dead,[dead],}"
 	},
 
 	{ .name = "clock-mode-colour",
 	  .type = OPTIONS_TABLE_COLOUR,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_num = 4
 	},
 
 	{ .name = "clock-mode-style",
 	  .type = OPTIONS_TABLE_CHOICE,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .choices = options_table_clock_mode_style_list,
 	  .default_num = 1
 	},
 
 	{ .name = "force-height",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .minimum = 0,
 	  .maximum = INT_MAX,
 	  .default_num = 0
@@ -494,6 +559,7 @@ const struct options_table_entry window_options_table[] = {
 
 	{ .name = "force-width",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .minimum = 0,
 	  .maximum = INT_MAX,
 	  .default_num = 0
@@ -501,6 +567,7 @@ const struct options_table_entry window_options_table[] = {
 
 	{ .name = "main-pane-height",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .minimum = 1,
 	  .maximum = INT_MAX,
 	  .default_num = 24
@@ -508,6 +575,7 @@ const struct options_table_entry window_options_table[] = {
 
 	{ .name = "main-pane-width",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .minimum = 1,
 	  .maximum = INT_MAX,
 	  .default_num = 80
@@ -515,40 +583,47 @@ const struct options_table_entry window_options_table[] = {
 
 	{ .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,
 	  .choices = options_table_mode_keys_list,
 	  .default_num = MODEKEY_EMACS
 	},
 
 	{ .name = "mode-style",
 	  .type = OPTIONS_TABLE_STYLE,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_str = "bg=yellow,fg=black"
 	},
 
 	{ .name = "monitor-activity",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_num = 0
 	},
 
 	{ .name = "monitor-silence",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .minimum = 0,
 	  .maximum = INT_MAX,
 	  .default_num = 0
@@ -556,6 +631,7 @@ const struct options_table_entry window_options_table[] = {
 
 	{ .name = "other-pane-height",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .minimum = 0,
 	  .maximum = INT_MAX,
 	  .default_num = 0
@@ -563,6 +639,7 @@ const struct options_table_entry window_options_table[] = {
 
 	{ .name = "other-pane-width",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .minimum = 0,
 	  .maximum = INT_MAX,
 	  .default_num = 0
@@ -570,23 +647,27 @@ const struct options_table_entry window_options_table[] = {
 
 	{ .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,
 	  .default_str = "fg=green"
 	},
 
 	{ .name = "pane-base-index",
 	  .type = OPTIONS_TABLE_NUMBER,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .minimum = 0,
 	  .maximum = USHRT_MAX,
 	  .default_num = 0
@@ -594,178 +675,210 @@ const struct options_table_entry window_options_table[] = {
 
 	{ .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-style",
 	  .type = OPTIONS_TABLE_STYLE,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_str = "default"
 	},
 
 	{ .name = "remain-on-exit",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_num = 0
 	},
 
 	{ .name = "synchronize-panes",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_num = 0
 	},
 
 	{ .name = "window-active-style",
 	  .type = OPTIONS_TABLE_STYLE,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_str = "default"
 	},
 
 	{ .name = "window-style",
 	  .type = OPTIONS_TABLE_STYLE,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .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,
 	  .default_str = "#I:#W#{?window_flags,#{window_flags}, }"
 	},
 
 	{ .name = "window-status-current-style",
 	  .type = OPTIONS_TABLE_STYLE,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .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",
 	  .type = OPTIONS_TABLE_STYLE,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_str = "default"
 	},
 
 	{ .name = "window-status-separator",
 	  .type = OPTIONS_TABLE_STRING,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_str = " "
 	},
 
 	{ .name = "window-status-style",
 	  .type = OPTIONS_TABLE_STYLE,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_str = "default"
 	},
 
 	{ .name = "wrap-search",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_num = 1
 	},
 
 	{ .name = "xterm-keys",
 	  .type = OPTIONS_TABLE_FLAG,
+	  .scope = OPTIONS_TABLE_WINDOW,
 	  .default_num = 0
 	},
 
@@ -774,12 +887,13 @@ const struct options_table_entry window_options_table[] = {
 
 /* Populate an options tree from a table. */
 void
-options_table_populate_tree(
-    const struct options_table_entry *table, struct options *oo)
+options_table_populate_tree(enum options_table_scope scope, struct options *oo)
 {
 	const struct options_table_entry	*oe;
 
-	for (oe = table; oe->name != NULL; oe++) {
+	for (oe = options_table; oe->name != NULL; oe++) {
+		if (oe->scope != scope)
+			continue;
 		switch (oe->type) {
 		case OPTIONS_TABLE_STRING:
 			options_set_string(oo, oe->name, "%s", oe->default_str);
@@ -845,33 +959,22 @@ options_table_print_entry(const struct options_table_entry *oe,
 
 /* Find an option. */
 int
-options_table_find(
-    const char *optstr, const struct options_table_entry **table,
-    const struct options_table_entry **oe)
+options_table_find(const char *optstr, const struct options_table_entry **oe)
 {
-	static const struct options_table_entry	*tables[] = {
-		server_options_table,
-		window_options_table,
-		session_options_table
-	};
 	const struct options_table_entry	*oe_loop;
-	u_int					 i;
-
-	for (i = 0; i < nitems(tables); i++) {
-		for (oe_loop = tables[i]; oe_loop->name != NULL; oe_loop++) {
-			if (strncmp(oe_loop->name, optstr, strlen(optstr)) != 0)
-				continue;
-
-			/* If already found, ambiguous. */
-			if (*oe != NULL)
-				return (-1);
-			*oe = oe_loop;
-			*table = tables[i];
-
-			/* Bail now if an exact match. */
-			if (strcmp((*oe)->name, optstr) == 0)
-				break;
-		}
+
+	for (oe_loop = options_table; oe_loop->name != NULL; oe_loop++) {
+		if (strncmp(oe_loop->name, optstr, strlen(optstr)) != 0)
+			continue;
+
+		/* If already found, ambiguous. */
+		if (*oe != NULL)
+			return (-1);
+		*oe = oe_loop;
+
+		/* Bail now if an exact match. */
+		if (strcmp(oe_loop->name, optstr) == 0)
+			break;
 	}
 	return (0);
 }