version 1.123, 2013/10/10 12:03:22 |
version 1.124, 2013/10/10 12:12:08 |
|
|
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); |
|
|
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++; |
|
|
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 |
|
|
} |
} |
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); |
|
|
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); |