diff options
| author | Thomas Adam <thomas@xteddy.org> | 2015-04-20 15:44:27 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2015-04-20 15:44:27 +0100 |
| commit | b25dc423b0b1369aaec5dee8e051d541bd55043f (patch) | |
| tree | 4ee106369e8b28504959d1b43c56daf89e196240 /options-table.c | |
| parent | acb8248ba64e1c9770d39d9790439c74eb9e5d80 (diff) | |
| parent | 0fd9a97202dc2878d9cf21f3bea01b599c21e61b (diff) | |
| download | rtmux-b25dc423b0b1369aaec5dee8e051d541bd55043f.tar.gz rtmux-b25dc423b0b1369aaec5dee8e051d541bd55043f.tar.bz2 rtmux-b25dc423b0b1369aaec5dee8e051d541bd55043f.zip | |
Merge branch 'obsd-master'
Diffstat (limited to 'options-table.c')
| -rw-r--r-- | options-table.c | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/options-table.c b/options-table.c index 2bcf29b4..d3959626 100644 --- a/options-table.c +++ b/options-table.c @@ -35,9 +35,6 @@ const char *options_table_mode_keys_list[] = { "emacs", "vi", NULL }; -const char *options_table_mode_mouse_list[] = { - "off", "on", "copy-mode", NULL -}; const char *options_table_clock_mode_style_list[] = { "12", "24", NULL }; @@ -254,17 +251,7 @@ const struct options_table_entry session_options_table[] = { .default_str = "bg=yellow,fg=black" }, - { .name = "mouse-resize-pane", - .type = OPTIONS_TABLE_FLAG, - .default_num = 0 - }, - - { .name = "mouse-select-pane", - .type = OPTIONS_TABLE_FLAG, - .default_num = 0 - }, - - { .name = "mouse-select-window", + { .name = "mouse", .type = OPTIONS_TABLE_FLAG, .default_num = 0 }, @@ -574,12 +561,6 @@ const struct options_table_entry window_options_table[] = { .default_num = MODEKEY_EMACS }, - { .name = "mode-mouse", - .type = OPTIONS_TABLE_CHOICE, - .choices = options_table_mode_mouse_list, - .default_num = 0 - }, - { .name = "mode-style", .type = OPTIONS_TABLE_STYLE, .default_str = "bg=yellow,fg=black" @@ -667,6 +648,16 @@ const struct options_table_entry window_options_table[] = { .default_num = 0 /* overridden in main() */ }, + { .name = "window-active-style", + .type = OPTIONS_TABLE_STYLE, + .default_str = "default" + }, + + { .name = "window-style", + .type = OPTIONS_TABLE_STYLE, + .default_str = "default" + }, + { .name = "window-status-activity-attr", .type = OPTIONS_TABLE_ATTRIBUTES, .default_num = GRID_ATTR_REVERSE, |