mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	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.
This commit is contained in:
		
							
								
								
									
										97
									
								
								tty-acs.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										97
									
								
								tty-acs.c
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,97 @@
 | 
			
		||||
/* $OpenBSD$ */
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * Copyright (c) 2010 Nicholas Marriott <nicm@users.sourceforge.net>
 | 
			
		||||
 *
 | 
			
		||||
 * Permission to use, copy, modify, and distribute this software for any
 | 
			
		||||
 * purpose with or without fee is hereby granted, provided that the above
 | 
			
		||||
 * copyright notice and this permission notice appear in all copies.
 | 
			
		||||
 *
 | 
			
		||||
 * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 | 
			
		||||
 * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 | 
			
		||||
 * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 | 
			
		||||
 * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 | 
			
		||||
 * WHATSOEVER RESULTING FROM LOSS OF MIND, USE, DATA OR PROFITS, WHETHER
 | 
			
		||||
 * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING
 | 
			
		||||
 * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include <sys/types.h>
 | 
			
		||||
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
 | 
			
		||||
#include "tmux.h"
 | 
			
		||||
 | 
			
		||||
int	tty_acs_cmp(const void *, const void *);
 | 
			
		||||
 | 
			
		||||
/* Table mapping ACS entries to UTF-8. */
 | 
			
		||||
struct tty_acs_entry {
 | 
			
		||||
	u_char	 	 key;
 | 
			
		||||
	const char	*string;
 | 
			
		||||
};
 | 
			
		||||
const struct tty_acs_entry tty_acs_table[] = {
 | 
			
		||||
	{ '+', "\342\206\222" },
 | 
			
		||||
	{ ',', "\342\206\220" },
 | 
			
		||||
	{ '-', "\342\206\221" },
 | 
			
		||||
	{ '.', "\342\206\223" },
 | 
			
		||||
	{ '0', "\342\226\256" },
 | 
			
		||||
	{ '`', "\342\227\206" },
 | 
			
		||||
	{ 'a', "\342\226\222" },
 | 
			
		||||
	{ 'f', "\302\260" },
 | 
			
		||||
	{ 'g', "\302\261" },
 | 
			
		||||
	{ 'h', "\342\226\222" },
 | 
			
		||||
	{ 'i', "\342\230\203" },
 | 
			
		||||
	{ 'j', "\342\224\230" },
 | 
			
		||||
	{ 'k', "\342\224\220" },
 | 
			
		||||
	{ 'l', "\342\224\214" },
 | 
			
		||||
	{ 'm', "\342\224\224" },
 | 
			
		||||
	{ 'n', "\342\224\274" },
 | 
			
		||||
	{ 'o', "\342\216\272" },
 | 
			
		||||
	{ 'p', "\342\216\273" },
 | 
			
		||||
	{ 'q', "\342\224\200" },
 | 
			
		||||
	{ 'r', "\342\216\274" },
 | 
			
		||||
	{ 's', "\342\216\275" },
 | 
			
		||||
	{ 't', "\342\224\234" },
 | 
			
		||||
	{ 'u', "\342\224\244" },
 | 
			
		||||
	{ 'v', "\342\224\264" },
 | 
			
		||||
	{ 'w', "\342\224\254" },
 | 
			
		||||
	{ 'x', "\342\224\202" },
 | 
			
		||||
	{ 'y', "\342\211\244" },
 | 
			
		||||
	{ 'z', "\342\211\245" },
 | 
			
		||||
	{ '{', "\317\200" },
 | 
			
		||||
	{ '|', "\342\211\240" },
 | 
			
		||||
	{ '}', "\302\243" },
 | 
			
		||||
	{ '~', "\302\267" }
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
int
 | 
			
		||||
tty_acs_cmp(const void *key, const void *value)
 | 
			
		||||
{
 | 
			
		||||
	const struct tty_acs_entry	*entry = value;
 | 
			
		||||
	u_char				 ch;
 | 
			
		||||
 | 
			
		||||
	ch = *(u_char *) key;
 | 
			
		||||
	return (ch - entry->key);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/* Retrieve ACS to output as a string. */
 | 
			
		||||
const char *
 | 
			
		||||
tty_acs_get(struct tty *tty, u_char ch)
 | 
			
		||||
{
 | 
			
		||||
	struct tty_acs_entry *entry;
 | 
			
		||||
 | 
			
		||||
	/* If not a UTF-8 terminal, use the ACS set. */
 | 
			
		||||
	if (!(tty->flags & TTY_UTF8)) {
 | 
			
		||||
		if (tty->term->acs[ch][0] == '\0')
 | 
			
		||||
			return (NULL);
 | 
			
		||||
		return (&tty->term->acs[ch][0]);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	/* Otherwise look up the UTF-8 translation. */
 | 
			
		||||
	entry = bsearch(&ch,
 | 
			
		||||
	    tty_acs_table, nitems(tty_acs_table), sizeof tty_acs_table[0],
 | 
			
		||||
	    tty_acs_cmp);
 | 
			
		||||
	if (entry == NULL)
 | 
			
		||||
		return (NULL);
 | 
			
		||||
	return (entry->string);
 | 
			
		||||
}
 | 
			
		||||
		Reference in New Issue
	
	Block a user