mirror of
				https://github.com/tmux/tmux.git
				synced 2025-11-04 00:56:10 +00:00 
			
		
		
		
	vis functions for Linux.
This commit is contained in:
		@@ -1,4 +1,4 @@
 | 
			
		||||
# $Id: GNUmakefile,v 1.46 2008-12-15 21:21:56 nicm Exp $
 | 
			
		||||
# $Id: GNUmakefile,v 1.47 2009-01-10 12:52:57 nicm Exp $
 | 
			
		||||
 | 
			
		||||
.PHONY: clean
 | 
			
		||||
 | 
			
		||||
@@ -31,9 +31,9 @@ SRCS= tmux.c server.c server-msg.c server-fn.c buffer.c buffer-poll.c status.c \
 | 
			
		||||
      cmd-show-window-options.c cmd-command-prompt.c cmd-set-buffer.c \
 | 
			
		||||
      cmd-show-buffer.c cmd-list-buffers.c cmd-delete-buffer.c \
 | 
			
		||||
      cmd-list-commands.c cmd-move-window.c cmd-select-prompt.c \
 | 
			
		||||
      cmd-respawn-window.c cmd-source-file.c \
 | 
			
		||||
      cmd-respawn-window.c cmd-source-file.c cmd-server-info.c \
 | 
			
		||||
      window-scroll.c window-more.c window-copy.c options.c paste.c \
 | 
			
		||||
      tty.c tty-keys.c tty-write.c colour.c utf8.c options-cmd.c
 | 
			
		||||
      tty.c tty-term.c tty-keys.c tty-write.c colour.c utf8.c options-cmd.c
 | 
			
		||||
 | 
			
		||||
CC?= gcc
 | 
			
		||||
INCDIRS+= -I. -I-
 | 
			
		||||
@@ -88,7 +88,7 @@ endif
 | 
			
		||||
ifeq ($(shell uname),Linux)
 | 
			
		||||
INCDIRS+= -Icompat
 | 
			
		||||
SRCS+= compat/strlcpy.c compat/strlcat.c compat/strtonum.c \
 | 
			
		||||
       compat/fgetln.c compat/getopt_long.c
 | 
			
		||||
       compat/fgetln.c compat/getopt_long.c compat/vis.c
 | 
			
		||||
CFLAGS+= $(shell getconf LFS_CFLAGS) -D_GNU_SOURCE \
 | 
			
		||||
         -DNO_STRLCPY -DNO_STRLCAT -DNO_STRTONUM -DNO_SETPROCTITLE \
 | 
			
		||||
         -DNO_QUEUE_H -DNO_TREE_H -DUSE_PTY_H -DNO_FGETLN \
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										2
									
								
								TODO
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								TODO
									
									
									
									
									
								
							@@ -63,3 +63,5 @@
 | 
			
		||||
- document server-info
 | 
			
		||||
- document status line options, title bits
 | 
			
		||||
- document window options changes
 | 
			
		||||
- FAQ: why; vim 256 colours; vim ctrl-pgup/dn; bug reports
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -1,4 +1,4 @@
 | 
			
		||||
/* $Id: cmd-server-info.c,v 1.4 2009-01-10 01:51:21 nicm Exp $ */
 | 
			
		||||
/* $Id: cmd-server-info.c,v 1.5 2009-01-10 12:52:57 nicm Exp $ */
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
 | 
			
		||||
@@ -19,6 +19,7 @@
 | 
			
		||||
#include <sys/types.h>
 | 
			
		||||
 | 
			
		||||
#include <stdlib.h>
 | 
			
		||||
#include <time.h>
 | 
			
		||||
#include <unistd.h>
 | 
			
		||||
#include <vis.h>
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
							
								
								
									
										219
									
								
								compat/vis.c
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										219
									
								
								compat/vis.c
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,219 @@
 | 
			
		||||
/*	$OpenBSD: vis.c,v 1.19 2005/09/01 17:15:49 millert Exp $ */
 | 
			
		||||
/*-
 | 
			
		||||
 * Copyright (c) 1989, 1993
 | 
			
		||||
 *	The Regents of the University of California.  All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * Redistribution and use in source and binary forms, with or without
 | 
			
		||||
 * modification, are permitted provided that the following conditions
 | 
			
		||||
 * are met:
 | 
			
		||||
 * 1. Redistributions of source code must retain the above copyright
 | 
			
		||||
 *    notice, this list of conditions and the following disclaimer.
 | 
			
		||||
 * 2. Redistributions in binary form must reproduce the above copyright
 | 
			
		||||
 *    notice, this list of conditions and the following disclaimer in the
 | 
			
		||||
 *    documentation and/or other materials provided with the distribution.
 | 
			
		||||
 * 3. Neither the name of the University nor the names of its contributors
 | 
			
		||||
 *    may be used to endorse or promote products derived from this software
 | 
			
		||||
 *    without specific prior written permission.
 | 
			
		||||
 *
 | 
			
		||||
 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 | 
			
		||||
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 | 
			
		||||
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 | 
			
		||||
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 | 
			
		||||
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 | 
			
		||||
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 | 
			
		||||
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 | 
			
		||||
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 | 
			
		||||
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 | 
			
		||||
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 | 
			
		||||
 * SUCH DAMAGE.
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#include <sys/types.h>
 | 
			
		||||
#include <limits.h>
 | 
			
		||||
#include <ctype.h>
 | 
			
		||||
#include <string.h>
 | 
			
		||||
#include <vis.h>
 | 
			
		||||
 | 
			
		||||
#define	isoctal(c)	(((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
 | 
			
		||||
#define	isvisible(c)							\
 | 
			
		||||
	(((u_int)(c) <= UCHAR_MAX && isascii((u_char)(c)) &&		\
 | 
			
		||||
	(((c) != '*' && (c) != '?' && (c) != '[' && (c) != '#') ||	\
 | 
			
		||||
		(flag & VIS_GLOB) == 0) && isgraph((u_char)(c))) ||	\
 | 
			
		||||
	((flag & VIS_SP) == 0 && (c) == ' ') ||				\
 | 
			
		||||
	((flag & VIS_TAB) == 0 && (c) == '\t') ||			\
 | 
			
		||||
	((flag & VIS_NL) == 0 && (c) == '\n') ||			\
 | 
			
		||||
	((flag & VIS_SAFE) && ((c) == '\b' ||				\
 | 
			
		||||
		(c) == '\007' || (c) == '\r' ||				\
 | 
			
		||||
		isgraph((u_char)(c)))))
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * vis - visually encode characters
 | 
			
		||||
 */
 | 
			
		||||
char *
 | 
			
		||||
vis(char *dst, int c, int flag, int nextc)
 | 
			
		||||
{
 | 
			
		||||
	if (isvisible(c)) {
 | 
			
		||||
		*dst++ = c;
 | 
			
		||||
		if (c == '\\' && (flag & VIS_NOSLASH) == 0)
 | 
			
		||||
			*dst++ = '\\';
 | 
			
		||||
		*dst = '\0';
 | 
			
		||||
		return (dst);
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	if (flag & VIS_CSTYLE) {
 | 
			
		||||
		switch(c) {
 | 
			
		||||
		case '\n':
 | 
			
		||||
			*dst++ = '\\';
 | 
			
		||||
			*dst++ = 'n';
 | 
			
		||||
			goto done;
 | 
			
		||||
		case '\r':
 | 
			
		||||
			*dst++ = '\\';
 | 
			
		||||
			*dst++ = 'r';
 | 
			
		||||
			goto done;
 | 
			
		||||
		case '\b':
 | 
			
		||||
			*dst++ = '\\';
 | 
			
		||||
			*dst++ = 'b';
 | 
			
		||||
			goto done;
 | 
			
		||||
		case '\a':
 | 
			
		||||
			*dst++ = '\\';
 | 
			
		||||
			*dst++ = 'a';
 | 
			
		||||
			goto done;
 | 
			
		||||
		case '\v':
 | 
			
		||||
			*dst++ = '\\';
 | 
			
		||||
			*dst++ = 'v';
 | 
			
		||||
			goto done;
 | 
			
		||||
		case '\t':
 | 
			
		||||
			*dst++ = '\\';
 | 
			
		||||
			*dst++ = 't';
 | 
			
		||||
			goto done;
 | 
			
		||||
		case '\f':
 | 
			
		||||
			*dst++ = '\\';
 | 
			
		||||
			*dst++ = 'f';
 | 
			
		||||
			goto done;
 | 
			
		||||
		case ' ':
 | 
			
		||||
			*dst++ = '\\';
 | 
			
		||||
			*dst++ = 's';
 | 
			
		||||
			goto done;
 | 
			
		||||
		case '\0':
 | 
			
		||||
			*dst++ = '\\';
 | 
			
		||||
			*dst++ = '0';
 | 
			
		||||
			if (isoctal(nextc)) {
 | 
			
		||||
				*dst++ = '0';
 | 
			
		||||
				*dst++ = '0';
 | 
			
		||||
			}
 | 
			
		||||
			goto done;
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	if (((c & 0177) == ' ') || (flag & VIS_OCTAL) ||
 | 
			
		||||
	    ((flag & VIS_GLOB) && (c == '*' || c == '?' || c == '[' || c == '#'))) {
 | 
			
		||||
		*dst++ = '\\';
 | 
			
		||||
		*dst++ = ((u_char)c >> 6 & 07) + '0';
 | 
			
		||||
		*dst++ = ((u_char)c >> 3 & 07) + '0';
 | 
			
		||||
		*dst++ = ((u_char)c & 07) + '0';
 | 
			
		||||
		goto done;
 | 
			
		||||
	}
 | 
			
		||||
	if ((flag & VIS_NOSLASH) == 0)
 | 
			
		||||
		*dst++ = '\\';
 | 
			
		||||
	if (c & 0200) {
 | 
			
		||||
		c &= 0177;
 | 
			
		||||
		*dst++ = 'M';
 | 
			
		||||
	}
 | 
			
		||||
	if (iscntrl((u_char)c)) {
 | 
			
		||||
		*dst++ = '^';
 | 
			
		||||
		if (c == 0177)
 | 
			
		||||
			*dst++ = '?';
 | 
			
		||||
		else
 | 
			
		||||
			*dst++ = c + '@';
 | 
			
		||||
	} else {
 | 
			
		||||
		*dst++ = '-';
 | 
			
		||||
		*dst++ = c;
 | 
			
		||||
	}
 | 
			
		||||
done:
 | 
			
		||||
	*dst = '\0';
 | 
			
		||||
	return (dst);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * strvis, strnvis, strvisx - visually encode characters from src into dst
 | 
			
		||||
 *	
 | 
			
		||||
 *	Dst must be 4 times the size of src to account for possible
 | 
			
		||||
 *	expansion.  The length of dst, not including the trailing NULL,
 | 
			
		||||
 *	is returned. 
 | 
			
		||||
 *
 | 
			
		||||
 *	Strnvis will write no more than siz-1 bytes (and will NULL terminate).
 | 
			
		||||
 *	The number of bytes needed to fully encode the string is returned.
 | 
			
		||||
 *
 | 
			
		||||
 *	Strvisx encodes exactly len bytes from src into dst.
 | 
			
		||||
 *	This is useful for encoding a block of data.
 | 
			
		||||
 */
 | 
			
		||||
int
 | 
			
		||||
strvis(char *dst, const char *src, int flag)
 | 
			
		||||
{
 | 
			
		||||
	char c;
 | 
			
		||||
	char *start;
 | 
			
		||||
 | 
			
		||||
	for (start = dst; (c = *src);)
 | 
			
		||||
		dst = vis(dst, c, flag, *++src);
 | 
			
		||||
	*dst = '\0';
 | 
			
		||||
	return (dst - start);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int
 | 
			
		||||
strnvis(char *dst, const char *src, size_t siz, int flag)
 | 
			
		||||
{
 | 
			
		||||
	char *start, *end;
 | 
			
		||||
	char tbuf[5];
 | 
			
		||||
	int c, i;
 | 
			
		||||
 | 
			
		||||
	i = 0;
 | 
			
		||||
	for (start = dst, end = start + siz - 1; (c = *src) && dst < end; ) {
 | 
			
		||||
		if (isvisible(c)) {
 | 
			
		||||
			i = 1;
 | 
			
		||||
			*dst++ = c;
 | 
			
		||||
			if (c == '\\' && (flag & VIS_NOSLASH) == 0) {
 | 
			
		||||
				/* need space for the extra '\\' */
 | 
			
		||||
				if (dst < end)
 | 
			
		||||
					*dst++ = '\\';
 | 
			
		||||
				else {
 | 
			
		||||
					dst--;
 | 
			
		||||
					i = 2;
 | 
			
		||||
					break;
 | 
			
		||||
				}
 | 
			
		||||
			}
 | 
			
		||||
			src++;
 | 
			
		||||
		} else {
 | 
			
		||||
			i = vis(tbuf, c, flag, *++src) - tbuf;
 | 
			
		||||
			if (dst + i <= end) {
 | 
			
		||||
				memcpy(dst, tbuf, i);
 | 
			
		||||
				dst += i;
 | 
			
		||||
			} else {
 | 
			
		||||
				src--;
 | 
			
		||||
				break;
 | 
			
		||||
			}
 | 
			
		||||
		}
 | 
			
		||||
	}
 | 
			
		||||
	if (siz > 0)
 | 
			
		||||
		*dst = '\0';
 | 
			
		||||
	if (dst + i > end) {
 | 
			
		||||
		/* adjust return value for truncation */
 | 
			
		||||
		while ((c = *src))
 | 
			
		||||
			dst += vis(tbuf, c, flag, *++src) - tbuf;
 | 
			
		||||
	}
 | 
			
		||||
	return (dst - start);
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
int
 | 
			
		||||
strvisx(char *dst, const char *src, size_t len, int flag)
 | 
			
		||||
{
 | 
			
		||||
	char c;
 | 
			
		||||
	char *start;
 | 
			
		||||
 | 
			
		||||
	for (start = dst; len > 1; len--) {
 | 
			
		||||
		c = *src;
 | 
			
		||||
		dst = vis(dst, c, flag, *++src);
 | 
			
		||||
	}
 | 
			
		||||
	if (len)
 | 
			
		||||
		dst = vis(dst, *src, flag, '\0');
 | 
			
		||||
	*dst = '\0';
 | 
			
		||||
	return (dst - start);
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										87
									
								
								compat/vis.h
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										87
									
								
								compat/vis.h
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,87 @@
 | 
			
		||||
/*	$OpenBSD: vis.h,v 1.11 2005/08/09 19:38:31 millert Exp $	*/
 | 
			
		||||
/*	$NetBSD: vis.h,v 1.4 1994/10/26 00:56:41 cgd Exp $	*/
 | 
			
		||||
 | 
			
		||||
/*-
 | 
			
		||||
 * Copyright (c) 1990 The Regents of the University of California.
 | 
			
		||||
 * All rights reserved.
 | 
			
		||||
 *
 | 
			
		||||
 * Redistribution and use in source and binary forms, with or without
 | 
			
		||||
 * modification, are permitted provided that the following conditions
 | 
			
		||||
 * are met:
 | 
			
		||||
 * 1. Redistributions of source code must retain the above copyright
 | 
			
		||||
 *    notice, this list of conditions and the following disclaimer.
 | 
			
		||||
 * 2. Redistributions in binary form must reproduce the above copyright
 | 
			
		||||
 *    notice, this list of conditions and the following disclaimer in the
 | 
			
		||||
 *    documentation and/or other materials provided with the distribution.
 | 
			
		||||
 * 3. Neither the name of the University nor the names of its contributors
 | 
			
		||||
 *    may be used to endorse or promote products derived from this software
 | 
			
		||||
 *    without specific prior written permission.
 | 
			
		||||
 *
 | 
			
		||||
 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
 | 
			
		||||
 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 | 
			
		||||
 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
 | 
			
		||||
 * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
 | 
			
		||||
 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
 | 
			
		||||
 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
 | 
			
		||||
 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
 | 
			
		||||
 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
 | 
			
		||||
 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 | 
			
		||||
 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 | 
			
		||||
 * SUCH DAMAGE.
 | 
			
		||||
 *
 | 
			
		||||
 *	@(#)vis.h	5.9 (Berkeley) 4/3/91
 | 
			
		||||
 */
 | 
			
		||||
 | 
			
		||||
#ifndef _VIS_H_
 | 
			
		||||
#define	_VIS_H_
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * to select alternate encoding format
 | 
			
		||||
 */
 | 
			
		||||
#define	VIS_OCTAL	0x01	/* use octal \ddd format */
 | 
			
		||||
#define	VIS_CSTYLE	0x02	/* use \[nrft0..] where appropriate */
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * to alter set of characters encoded (default is to encode all
 | 
			
		||||
 * non-graphic except space, tab, and newline).
 | 
			
		||||
 */
 | 
			
		||||
#define	VIS_SP		0x04	/* also encode space */
 | 
			
		||||
#define	VIS_TAB		0x08	/* also encode tab */
 | 
			
		||||
#define	VIS_NL		0x10	/* also encode newline */
 | 
			
		||||
#define	VIS_WHITE	(VIS_SP | VIS_TAB | VIS_NL)
 | 
			
		||||
#define	VIS_SAFE	0x20	/* only encode "unsafe" characters */
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * other
 | 
			
		||||
 */
 | 
			
		||||
#define	VIS_NOSLASH	0x40	/* inhibit printing '\' */
 | 
			
		||||
#define	VIS_GLOB	0x100	/* encode glob(3) magics and '#' */
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * unvis return codes
 | 
			
		||||
 */
 | 
			
		||||
#define	UNVIS_VALID	 1	/* character valid */
 | 
			
		||||
#define	UNVIS_VALIDPUSH	 2	/* character valid, push back passed char */
 | 
			
		||||
#define	UNVIS_NOCHAR	 3	/* valid sequence, no character produced */
 | 
			
		||||
#define	UNVIS_SYNBAD	-1	/* unrecognized escape sequence */
 | 
			
		||||
#define	UNVIS_ERROR	-2	/* decoder in unknown state (unrecoverable) */
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
 * unvis flags
 | 
			
		||||
 */
 | 
			
		||||
#define	UNVIS_END	1	/* no more characters */
 | 
			
		||||
 | 
			
		||||
#include <sys/cdefs.h>
 | 
			
		||||
 | 
			
		||||
__BEGIN_DECLS
 | 
			
		||||
char	*vis(char *, int, int, int);
 | 
			
		||||
int	strvis(char *, const char *, int);
 | 
			
		||||
int	strnvis(char *, const char *, size_t, int);
 | 
			
		||||
int	strvisx(char *, const char *, size_t, int);
 | 
			
		||||
int	strunvis(char *, const char *);
 | 
			
		||||
int	unvis(char *, char, int *, int);
 | 
			
		||||
ssize_t strnunvis(char *, const char *, size_t);
 | 
			
		||||
 | 
			
		||||
__END_DECLS
 | 
			
		||||
 | 
			
		||||
#endif /* !_VIS_H_ */
 | 
			
		||||
		Reference in New Issue
	
	Block a user