diff options
| author | nicm <nicm> | 2015-10-27 15:58:42 +0000 |
|---|---|---|
| committer | nicm <nicm> | 2015-10-27 15:58:42 +0000 |
| commit | 44657bf932b068aff5ce1019a4e8a2e7b00b5321 (patch) | |
| tree | 9efb1fa8a96b0a362a51d894bd36c45aa9731a98 /tmux.c | |
| parent | 67c3a014b960b8c1d7931d3c99f570610b1d4d3f (diff) | |
| download | rtmux-44657bf932b068aff5ce1019a4e8a2e7b00b5321.tar.gz rtmux-44657bf932b068aff5ce1019a4e8a2e7b00b5321.tar.bz2 rtmux-44657bf932b068aff5ce1019a4e8a2e7b00b5321.zip | |
Move struct options into options.c.
Diffstat (limited to 'tmux.c')
| -rw-r--r-- | tmux.c | 31 |
1 files changed, 15 insertions, 16 deletions
@@ -38,9 +38,9 @@ extern char *malloc_options; #endif -struct options global_options; /* server options */ -struct options global_s_options; /* session options */ -struct options global_w_options; /* window options */ +struct options *global_options; /* server options */ +struct options *global_s_options; /* session options */ +struct options *global_w_options; /* window options */ struct environ global_environ; char *shell_cmd; @@ -281,22 +281,21 @@ main(int argc, char **argv) if (getcwd(tmp, sizeof tmp) != NULL) environ_set(&global_environ, "PWD", tmp); - options_init(&global_options, NULL); - options_table_populate_tree(server_options_table, &global_options); + global_options = options_create(NULL); + options_table_populate_tree(server_options_table, global_options); - options_init(&global_s_options, NULL); - options_table_populate_tree(session_options_table, &global_s_options); - options_set_string(&global_s_options, "default-shell", "%s", - getshell()); + global_s_options = options_create(NULL); + options_table_populate_tree(session_options_table, global_s_options); + options_set_string(global_s_options, "default-shell", "%s", getshell()); - options_init(&global_w_options, NULL); - options_table_populate_tree(window_options_table, &global_w_options); + global_w_options = options_create(NULL); + options_table_populate_tree(window_options_table, global_w_options); /* Enable UTF-8 if the first client is on UTF-8 terminal. */ if (flags & CLIENT_UTF8) { - options_set_number(&global_s_options, "status-utf8", 1); - options_set_number(&global_s_options, "mouse-utf8", 1); - options_set_number(&global_w_options, "utf8", 1); + options_set_number(global_s_options, "status-utf8", 1); + options_set_number(global_s_options, "mouse-utf8", 1); + options_set_number(global_w_options, "utf8", 1); } /* Override keys to vi if VISUAL or EDITOR are set. */ @@ -307,8 +306,8 @@ main(int argc, char **argv) keys = MODEKEY_VI; else keys = MODEKEY_EMACS; - options_set_number(&global_s_options, "status-keys", keys); - options_set_number(&global_w_options, "mode-keys", keys); + options_set_number(global_s_options, "status-keys", keys); + options_set_number(global_w_options, "mode-keys", keys); } /* |