From 5126037ea0bfc8a5245562156a0b5051cb9cdb02 Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sat, 18 Sep 2010 15:43:53 +0000 Subject: Sync OpenBSD patchset 762: Use UTF-8 line drawing characters on UTF-8 terminals. Fixes some stupid terminals (I'm looking at you, putty) which disable the vt100 ACS mode switching sequences in UTF-8 mode. Also on terminals without ACS at all, use ASCII equivalents where obvious. --- tmux.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'tmux.h') diff --git a/tmux.h b/tmux.h index d32dba35..951617e6 100644 --- a/tmux.h +++ b/tmux.h @@ -1,4 +1,4 @@ -/* $Id: tmux.h,v 1.576 2010-09-10 13:36:17 tcunha Exp $ */ +/* $Id: tmux.h,v 1.577 2010-09-18 15:43:53 tcunha Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -970,6 +970,8 @@ struct tty_term { char *name; u_int references; + char acs[UCHAR_MAX + 1][2]; + struct tty_code codes[NTTYCODE]; #define TERM_256COLOURS 0x1 @@ -1007,8 +1009,6 @@ struct tty { struct grid_cell cell; - u_char acs[UCHAR_MAX + 1]; - #define TTY_NOCURSOR 0x1 #define TTY_FREEZE 0x2 #define TTY_ESCAPE 0x4 @@ -1370,7 +1370,6 @@ void environ_push(struct environ *); /* tty.c */ void tty_raw(struct tty *, const char *); -u_char tty_get_acs(struct tty *, u_char); void tty_attributes(struct tty *, const struct grid_cell *); void tty_reset(struct tty *); void tty_region_pane(struct tty *, const struct tty_ctx *, u_int, u_int); @@ -1424,6 +1423,9 @@ const char *tty_term_string2( int tty_term_number(struct tty_term *, enum tty_code_code); int tty_term_flag(struct tty_term *, enum tty_code_code); +/* tty-acs.c */ +const char *tty_acs_get(struct tty *, u_char); + /* tty-keys.c */ void tty_keys_init(struct tty *); void tty_keys_free(struct tty *); -- cgit