Merge ncurses-5.2-20010512 -> ncurses-5.2-20020518 changes onto mainline.
This commit is contained in:
Peter Wemm
parent
7467abe828
commit
a17d2cb23c
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=97052
@ -52,7 +52,7 @@
|
||||
#include <term_entry.h>
|
||||
#include <tic.h>
|
||||
|
||||
MODULE_ID("$Id: comp_scan.c,v 1.56 2001/04/21 18:53:34 tom Exp $")
|
||||
MODULE_ID("$Id: comp_scan.c,v 1.59 2001/09/23 00:56:29 tom Exp $")
|
||||
|
||||
/*
|
||||
* Maximum length of string capability we'll accept before raising an error.
|
||||
@ -88,7 +88,7 @@ _nc_curr_token =
|
||||
static bool first_column; /* See 'next_char()' below */
|
||||
static char separator; /* capability separator */
|
||||
static int pushtype; /* type of pushback token */
|
||||
static char pushname[MAX_NAME_SIZE + 1];
|
||||
static char *pushname;
|
||||
|
||||
#if NCURSES_EXT_FUNCS
|
||||
NCURSES_EXPORT_VAR(bool)
|
||||
@ -148,26 +148,28 @@ NCURSES_EXPORT(int)
|
||||
_nc_get_token(bool silent)
|
||||
{
|
||||
static const char terminfo_punct[] = "@%&*!#";
|
||||
long number;
|
||||
int type;
|
||||
int ch;
|
||||
static char *buffer;
|
||||
|
||||
char *numchk;
|
||||
char numbuf[80];
|
||||
unsigned found;
|
||||
static char buffer[MAX_ENTRY_SIZE];
|
||||
char *ptr;
|
||||
char numbuf[80];
|
||||
int ch;
|
||||
int dot_flag = FALSE;
|
||||
int type;
|
||||
long number;
|
||||
long token_start;
|
||||
unsigned found;
|
||||
|
||||
if (pushtype != NO_PUSHBACK) {
|
||||
int retval = pushtype;
|
||||
|
||||
_nc_set_type(pushname);
|
||||
_nc_set_type(pushname != 0 ? pushname : "");
|
||||
DEBUG(3, ("pushed-back token: `%s', class %d",
|
||||
_nc_curr_token.tk_name, pushtype));
|
||||
|
||||
pushtype = NO_PUSHBACK;
|
||||
pushname[0] = '\0';
|
||||
if (pushname != 0)
|
||||
pushname[0] = '\0';
|
||||
|
||||
/* currtok wasn't altered by _nc_push_token() */
|
||||
return (retval);
|
||||
@ -220,6 +222,9 @@ _nc_get_token(bool silent)
|
||||
goto start_token;
|
||||
}
|
||||
|
||||
if (buffer == 0)
|
||||
buffer = _nc_doalloc(buffer, MAX_ENTRY_SIZE);
|
||||
|
||||
ptr = buffer;
|
||||
*(ptr++) = ch;
|
||||
|
||||
@ -306,7 +311,7 @@ _nc_get_token(bool silent)
|
||||
* special characters can be dangerous due to shell expansion.
|
||||
*/
|
||||
for (ptr = buffer; ptr < desc; ptr++) {
|
||||
if (isspace(CharOf(*ptr))) {
|
||||
if (isspace(UChar(*ptr))) {
|
||||
if (!silent)
|
||||
_nc_warning("whitespace in name or alias field");
|
||||
break;
|
||||
@ -377,7 +382,7 @@ _nc_get_token(bool silent)
|
||||
break;
|
||||
|
||||
case '=':
|
||||
ch = _nc_trans_string(ptr, buffer + sizeof(buffer));
|
||||
ch = _nc_trans_string(ptr, buffer + MAX_ENTRY_SIZE);
|
||||
if (!silent && ch != separator)
|
||||
_nc_warning("Missing separator");
|
||||
_nc_curr_token.tk_name = buffer;
|
||||
@ -633,10 +638,12 @@ _nc_push_token(int tokclass)
|
||||
/*
|
||||
* This implementation is kind of bogus, it will fail if we ever do more
|
||||
* than one pushback at a time between get_token() calls. It relies on the
|
||||
* fact that curr_tok is static storage that nothing but get_token()
|
||||
* touches.
|
||||
* fact that _nc_curr_token is static storage that nothing but
|
||||
* _nc_get_token() touches.
|
||||
*/
|
||||
pushtype = tokclass;
|
||||
if (pushname == 0)
|
||||
pushname = _nc_doalloc(pushname, MAX_NAME_SIZE + 1);
|
||||
_nc_get_type(pushname);
|
||||
|
||||
DEBUG(3, ("pushing token: `%s', class %d",
|
||||
@ -684,7 +691,8 @@ NCURSES_EXPORT(void)
|
||||
_nc_reset_input(FILE * fp, char *buf)
|
||||
{
|
||||
pushtype = NO_PUSHBACK;
|
||||
pushname[0] = '\0';
|
||||
if (pushname != 0)
|
||||
pushname[0] = '\0';
|
||||
yyin = fp;
|
||||
bufstart = bufptr = buf;
|
||||
_nc_curr_file_pos = 0L;
|
||||
@ -703,7 +711,7 @@ last_char(void)
|
||||
{
|
||||
size_t len = strlen(bufptr);
|
||||
while (len--) {
|
||||
if (!isspace(CharOf(bufptr[len])))
|
||||
if (!isspace(UChar(bufptr[len])))
|
||||
return bufptr[len];
|
||||
}
|
||||
return 0;
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. *
|
||||
* Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc. *
|
||||
* *
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a *
|
||||
* copy of this software and associated documentation files (the *
|
||||
@ -50,7 +50,7 @@
|
||||
#include <curses.priv.h>
|
||||
#include <term.h> /* cur_term */
|
||||
|
||||
MODULE_ID("$Id: lib_raw.c,v 1.10 2000/12/10 02:55:07 tom Exp $")
|
||||
MODULE_ID("$Id: lib_raw.c,v 1.12 2001/08/04 17:18:38 tom Exp $")
|
||||
|
||||
#if SVR4_TERMIO && !defined(_POSIX_SOURCE)
|
||||
#define _POSIX_SOURCE
|
||||
@ -142,8 +142,8 @@ qiflush(void)
|
||||
cur_term->Nttyb.c_lflag &= ~(NOFLSH);
|
||||
AFTER("qiflush");
|
||||
(void) _nc_set_tty_mode(&cur_term->Nttyb);
|
||||
returnVoid;
|
||||
#endif
|
||||
returnVoid;
|
||||
}
|
||||
|
||||
NCURSES_EXPORT(int)
|
||||
@ -207,8 +207,8 @@ noqiflush(void)
|
||||
cur_term->Nttyb.c_lflag |= NOFLSH;
|
||||
AFTER("noqiflush");
|
||||
(void) _nc_set_tty_mode(&cur_term->Nttyb);
|
||||
returnVoid;
|
||||
#endif
|
||||
returnVoid;
|
||||
}
|
||||
|
||||
NCURSES_EXPORT(int)
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/****************************************************************************
|
||||
* Copyright (c) 1998,1999,2000 Free Software Foundation, Inc. *
|
||||
* Copyright (c) 1998,1999,2000,2001 Free Software Foundation, Inc. *
|
||||
* *
|
||||
* Permission is hereby granted, free of charge, to any person obtaining a *
|
||||
* copy of this software and associated documentation files (the *
|
||||
@ -29,6 +29,9 @@
|
||||
/****************************************************************************
|
||||
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
|
||||
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
|
||||
* *
|
||||
* some of the code in here was contributed by: *
|
||||
* Magnus Bengtsson, d6mbeng@dtek.chalmers.se (Nov'93) *
|
||||
****************************************************************************/
|
||||
|
||||
/* $FreeBSD$ */
|
||||
@ -37,21 +40,20 @@
|
||||
|
||||
#include <termcap.h>
|
||||
#include <tic.h>
|
||||
#include <ctype.h>
|
||||
|
||||
#define __INTERNAL_CAPS_VISIBLE
|
||||
#include <term_entry.h>
|
||||
|
||||
MODULE_ID("$Id: lib_termcap.c,v 1.39 2000/12/10 02:56:30 tom Exp $")
|
||||
MODULE_ID("$Id: lib_termcap.c,v 1.42 2001/09/22 19:17:31 tom Exp $")
|
||||
|
||||
/*
|
||||
some of the code in here was contributed by:
|
||||
Magnus Bengtsson, d6mbeng@dtek.chalmers.se
|
||||
*/
|
||||
#define CSI 233
|
||||
#define ESC 033 /* ^[ */
|
||||
#define L_BRACK '['
|
||||
#define SHIFT_OUT 017 /* ^N */
|
||||
|
||||
NCURSES_EXPORT_VAR(char *)
|
||||
UP = 0;
|
||||
NCURSES_EXPORT_VAR(char *)
|
||||
BC = 0;
|
||||
NCURSES_EXPORT_VAR(char *) UP = 0;
|
||||
NCURSES_EXPORT_VAR(char *) BC = 0;
|
||||
|
||||
#ifdef FREEBSD_NATIVE
|
||||
#undef GCC_UNUSED
|
||||
@ -59,6 +61,57 @@ BC = 0;
|
||||
extern char _nc_termcap[]; /* buffer to copy out */
|
||||
#endif
|
||||
|
||||
static char *fix_me = 0;
|
||||
|
||||
static char *
|
||||
set_attribute_9(int flag)
|
||||
{
|
||||
const char *result;
|
||||
|
||||
if ((result = tparm(set_attributes, 0, 0, 0, 0, 0, 0, 0, 0, flag)) == 0)
|
||||
result = "";
|
||||
return strdup(result);
|
||||
}
|
||||
|
||||
static int
|
||||
is_csi(char *s)
|
||||
{
|
||||
if (UChar(s[0]) == CSI)
|
||||
return 1;
|
||||
else if (s[0] == ESC && s[1] == L_BRACK)
|
||||
return 2;
|
||||
return 0;
|
||||
}
|
||||
|
||||
static char *
|
||||
skip_zero(char *s)
|
||||
{
|
||||
if (s[0] == '0') {
|
||||
if (s[1] == ';')
|
||||
s += 2;
|
||||
else if (isalpha(UChar(s[1])))
|
||||
s += 1;
|
||||
}
|
||||
return s;
|
||||
}
|
||||
|
||||
static bool
|
||||
similar_sgr(char *a, char *b)
|
||||
{
|
||||
int csi_a = is_csi(a);
|
||||
int csi_b = is_csi(b);
|
||||
|
||||
if (csi_a != 0 && csi_b != 0 && csi_a == csi_b) {
|
||||
a += csi_a;
|
||||
b += csi_b;
|
||||
if (*a != *b) {
|
||||
a = skip_zero(a);
|
||||
b = skip_zero(b);
|
||||
}
|
||||
}
|
||||
return strcmp(a, b) == 0;
|
||||
}
|
||||
|
||||
/***************************************************************************
|
||||
*
|
||||
* tgetent(bufp, term)
|
||||
@ -75,8 +128,7 @@ extern char _nc_termcap[]; /* buffer to copy out */
|
||||
***************************************************************************/
|
||||
|
||||
NCURSES_EXPORT(int)
|
||||
tgetent
|
||||
(char *bufp GCC_UNUSED, const char *name)
|
||||
tgetent(char *bufp GCC_UNUSED, const char *name)
|
||||
{
|
||||
int errcode;
|
||||
|
||||
@ -84,6 +136,11 @@ tgetent
|
||||
|
||||
setupterm((NCURSES_CONST char *) name, STDOUT_FILENO, &errcode);
|
||||
|
||||
PC = 0;
|
||||
UP = 0;
|
||||
BC = 0;
|
||||
fix_me = 0;
|
||||
|
||||
if (errcode == 1) {
|
||||
|
||||
if (cursor_left)
|
||||
@ -98,6 +155,68 @@ tgetent
|
||||
if (backspace_if_not_bs != NULL)
|
||||
BC = backspace_if_not_bs;
|
||||
|
||||
/*
|
||||
* While 'sgr0' is the "same" as termcap 'me', there is a compatibility
|
||||
* issue. The sgr/sgr0 capabilities include setting/clearing alternate
|
||||
* character set mode. A termcap application cannot use sgr, so sgr0
|
||||
* strings that reset alternate character set mode will be
|
||||
* misinterpreted. Here, we remove those from the more common
|
||||
* ISO/ANSI/VT100 entries, which have sgr0 agreeing with sgr.
|
||||
*/
|
||||
if (exit_attribute_mode != 0
|
||||
&& set_attributes != 0) {
|
||||
char *on = set_attribute_9(1);
|
||||
char *off = set_attribute_9(0);
|
||||
char *tmp;
|
||||
size_t i, j, k;
|
||||
|
||||
if (similar_sgr(off, exit_attribute_mode)
|
||||
&& !similar_sgr(off, on)) {
|
||||
TR(TRACE_DATABASE, ("adjusting sgr0 : %s", _nc_visbuf(off)));
|
||||
FreeIfNeeded(fix_me);
|
||||
fix_me = off;
|
||||
for (i = 0; off[i] != '\0'; ++i) {
|
||||
if (on[i] != off[i]) {
|
||||
j = strlen(off);
|
||||
k = strlen(on);
|
||||
while (j != 0
|
||||
&& k != 0
|
||||
&& off[j - 1] == on[k - 1]) {
|
||||
--j, --k;
|
||||
}
|
||||
while (off[j] != '\0') {
|
||||
off[i++] = off[j++];
|
||||
}
|
||||
off[i] = '\0';
|
||||
break;
|
||||
}
|
||||
}
|
||||
/* SGR 10 would reset to normal font */
|
||||
if ((i = is_csi(off)) != 0
|
||||
&& off[strlen(off) - 1] == 'm') {
|
||||
tmp = skip_zero(off + i);
|
||||
if (tmp[0] == '1'
|
||||
&& skip_zero(tmp + 1) != tmp + 1) {
|
||||
i = tmp - off;
|
||||
if (off[i - 1] == ';')
|
||||
i--;
|
||||
j = skip_zero(tmp + 1) - off;
|
||||
while (off[j] != '\0') {
|
||||
off[i++] = off[j++];
|
||||
}
|
||||
off[i] = '\0';
|
||||
}
|
||||
}
|
||||
TR(TRACE_DATABASE, ("...adjusted me : %s", _nc_visbuf(fix_me)));
|
||||
if (!strcmp(fix_me, exit_attribute_mode)) {
|
||||
TR(TRACE_DATABASE, ("...same result, discard"));
|
||||
free(fix_me);
|
||||
fix_me = 0;
|
||||
}
|
||||
}
|
||||
free(on);
|
||||
}
|
||||
|
||||
(void) baudrate(); /* sets ospeed as a side-effect */
|
||||
|
||||
/* LINT_PREPRO
|
||||
@ -187,10 +306,10 @@ tgetnum(NCURSES_CONST char *id)
|
||||
***************************************************************************/
|
||||
|
||||
NCURSES_EXPORT(char *)
|
||||
tgetstr
|
||||
(NCURSES_CONST char *id, char **area)
|
||||
tgetstr(NCURSES_CONST char *id, char **area)
|
||||
{
|
||||
int i;
|
||||
char *result = NULL;
|
||||
|
||||
T((T_CALLED("tgetstr(%s,%p)"), id, area));
|
||||
if (cur_term != 0) {
|
||||
@ -198,17 +317,24 @@ tgetstr
|
||||
for_each_string(i, tp) {
|
||||
const char *capname = ExtStrname(tp, i, strcodes);
|
||||
if (!strncmp(id, capname, 2)) {
|
||||
TR(TRACE_DATABASE, ("found match : %s", _nc_visbuf(tp->Strings[i])));
|
||||
result = tp->Strings[i];
|
||||
TR(TRACE_DATABASE, ("found match : %s", _nc_visbuf(result)));
|
||||
/* setupterm forces canceled strings to null */
|
||||
if (area != 0
|
||||
&& *area != 0
|
||||
&& VALID_STRING(tp->Strings[i])) {
|
||||
(void) strcpy(*area, tp->Strings[i]);
|
||||
*area += strlen(*area) + 1;
|
||||
if (VALID_STRING(result)) {
|
||||
if (result == exit_attribute_mode
|
||||
&& fix_me != 0) {
|
||||
result = fix_me;
|
||||
TR(TRACE_DATABASE, ("altered to : %s", _nc_visbuf(result)));
|
||||
}
|
||||
if (area != 0
|
||||
&& *area != 0) {
|
||||
(void) strcpy(*area, result);
|
||||
*area += strlen(*area) + 1;
|
||||
}
|
||||
}
|
||||
returnPtr(tp->Strings[i]);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
returnPtr(NULL);
|
||||
returnPtr(result);
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user