circlecloud
/
tmux
mirror of https://github.com/tmux/tmux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge IDENTIFY_* flags with CLIENT_* flags.

pull/1/head
nicm 2013-10-10 12:12:08 +00:00
parent 6c093010e0
commit eb26dbd072
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tmux.c
View File

@ -261,17 +261,17 @@ main(int argc, char **argv)
while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:uUv")) != -1) { while ((opt = getopt(argc, argv, "2c:Cdf:lL:qS:uUv")) != -1) {
switch (opt) { switch (opt) {
case '2': case '2':
flags |= IDENTIFY_256COLOURS; flags |= CLIENT_256COLOURS;
break; break;
case 'c': case 'c':
free(shell_cmd); free(shell_cmd);
shell_cmd = xstrdup(optarg); shell_cmd = xstrdup(optarg);
break; break;
case 'C': case 'C':
if (flags & IDENTIFY_CONTROL) if (flags & CLIENT_CONTROL)
flags |= IDENTIFY_TERMIOS; flags |= CLIENT_CONTROLCONTROL;
else else
flags |= IDENTIFY_CONTROL; flags |= CLIENT_CONTROL;
break; break;
case 'f': case 'f':
free(cfg_file); free(cfg_file);
@ -292,7 +292,7 @@ main(int argc, char **argv)
path = xstrdup(optarg); path = xstrdup(optarg);
break; break;
case 'u': case 'u':
flags |= IDENTIFY_UTF8; flags |= CLIENT_UTF8;
break; break;
case 'v': case 'v':
debug_level++; debug_level++;
@ -307,7 +307,7 @@ main(int argc, char **argv)
if (shell_cmd != NULL && argc != 0) if (shell_cmd != NULL && argc != 0)
usage(); usage();
if (!(flags & IDENTIFY_UTF8)) { if (!(flags & CLIENT_UTF8)) {
/* /*
* If the user has set whichever of LC_ALL, LC_CTYPE or LANG * If the user has set whichever of LC_ALL, LC_CTYPE or LANG
* exist (in that order) to contain UTF-8, it is a safe * exist (in that order) to contain UTF-8, it is a safe
@ -321,7 +321,7 @@ main(int argc, char **argv)
} }
if (s != NULL && (strcasestr(s, "UTF-8") != NULL || if (s != NULL && (strcasestr(s, "UTF-8") != NULL ||
strcasestr(s, "UTF8") != NULL)) strcasestr(s, "UTF8") != NULL))
flags |= IDENTIFY_UTF8; flags |= CLIENT_UTF8;
} }
environ_init(&global_environ); environ_init(&global_environ);
@ -340,7 +340,7 @@ main(int argc, char **argv)
options_table_populate_tree(window_options_table, &global_w_options); options_table_populate_tree(window_options_table, &global_w_options);
/* Enable UTF-8 if the first client is on UTF-8 terminal. */ /* Enable UTF-8 if the first client is on UTF-8 terminal. */
if (flags & IDENTIFY_UTF8) { if (flags & CLIENT_UTF8) {
options_set_number(&global_s_options, "status-utf8", 1); options_set_number(&global_s_options, "status-utf8", 1);
options_set_number(&global_s_options, "mouse-utf8", 1); options_set_number(&global_s_options, "mouse-utf8", 1);
options_set_number(&global_w_options, "utf8", 1); options_set_number(&global_w_options, "utf8", 1);