diff options
| author | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-06-02 23:39:33 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@cvs.openbsd.org> | 2009-06-02 23:39:33 +0000 |
| commit | 020d96350364dc054c1648b95e02a384549c6535 (patch) | |
| tree | 93d9178c774928ead354a16cb67df743bea553df | |
| parent | a3e8d50e99168183daf1fcbb0d28c78a9afb45bd (diff) | |
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-- | usr.bin/tmux/tmux.1 | 10 | ||||
| -rw-r--r-- | usr.bin/tmux/tty.c | 6 |
2 files changed, 9 insertions, 7 deletions
diff --git a/usr.bin/tmux/tmux.1 b/usr.bin/tmux/tmux.1 index 774248b4dc5..5a6450fcc88 100644 --- a/usr.bin/tmux/tmux.1 +++ b/usr.bin/tmux/tmux.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: tmux.1,v 1.4 2009/06/02 16:46:00 sobrado Exp $ +.\" $OpenBSD: tmux.1,v 1.5 2009/06/02 23:39:32 nicm Exp $ .\" .\" Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> .\" @@ -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 diff --git a/usr.bin/tmux/tty.c b/usr.bin/tmux/tty.c index c8a61f96d7b..e4d023a52d0 100644 --- a/usr.bin/tmux/tty.c +++ b/usr.bin/tmux/tty.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty.c,v 1.1 2009/06/01 22:58:49 nicm Exp $ */ +/* $OpenBSD: tty.c,v 1.2 2009/06/02 23:39:32 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott <nicm@users.sourceforge.net> @@ -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) |