diff options
author | Nicholas Marriott <nicm@openbsd.org> | 2009-06-02 23:39:32 +0000 |
---|---|---|
committer | Nicholas Marriott <nicm@openbsd.org> | 2009-06-02 23:39:32 +0000 |
commit | 3f76a973ee6b19071df1839cd218b2f6071c4380 (patch) | |
tree | 549726c92fd71b8753503a187a5b97b077a338da | |
parent | 4215d009a518d2763203a71e1ed51944951fd46e (diff) | |
download | rtmux-3f76a973ee6b19071df1839cd218b2f6071c4380.tar.gz rtmux-3f76a973ee6b19071df1839cd218b2f6071c4380.tar.bz2 rtmux-3f76a973ee6b19071df1839cd218b2f6071c4380.zip |
Recent code to try and detect if a terminal supports UTF-8 by printing to it
fails spectacularly on (at least) sparc64, so disable it for now. Thanks to
naddy and Josh Elsasser for help and testing.
-rw-r--r-- | tmux.1 | 8 | ||||
-rw-r--r-- | tty.c | 4 |
2 files changed, 7 insertions, 5 deletions
@@ -109,13 +109,11 @@ flag is ignored. Unlock the server. .It Fl u .Nm -attempts to guess if the terminal is likely to support UTF-8 by first checking +attempts to guess if the terminal is likely to support UTF-8 by checking the .Ev LANG -environment variable for the string "UTF-8", and then by - if the terminal -looks suitable - trying to print a UTF-8 character and measuring the cursor -movement. -These are not always successful: the +environment variable for the string "UTF-8". +This is not always correct: the .Fl u flag explicitly informs .Nm @@ -134,7 +134,9 @@ tty_start_tty(struct tty *tty) struct termios tio; int what; +#if 0 tty_detect_utf8(tty); +#endif if (tcgetattr(tty->fd, &tty->tio) != 0) fatal("tcgetattr failed"); @@ -204,6 +206,7 @@ tty_stop_tty(struct tty *tty) tty_raw(tty, "\033[?1000l"); } +#if 0 void tty_detect_utf8(struct tty *tty) { @@ -278,6 +281,7 @@ tty_detect_utf8(struct tty *tty) if (tcsetattr(tty->fd, TCSANOW, &old_tio) != 0) fatal("tcsetattr failed"); } +#endif void tty_fill_acs(struct tty *tty) |