d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge vendor changes onto mainline

Browse Source
This commit is contained in:
Peter Wemm 2000-07-03 09:35:22 +00:00
parent 60b9f94d09
commit bd2a88692c
2 changed files with 542 additions and 508 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

908
contrib/ncurses/ncurses/tinfo/comp_scan.c
View File

File diff suppressed because it is too large Load Diff

142
contrib/ncurses/ncurses/tinfo/lib_termcap.c
View File

@ -1,5 +1,5 @@
/****************************************************************************
* Copyright (c) 1998 Free Software Foundation, Inc. *
* Copyright (c) 1998,1999,2000 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 *
@ -41,15 +41,15 @@
#define __INTERNAL_CAPS_VISIBLE
#include <term_entry.h>
MODULE_ID("$Id: lib_termcap.c,v 1.29 1999/09/05 01:06:43 tom Exp $")
MODULE_ID("$Id: lib_termcap.c,v 1.36 2000/02/13 01:01:26 tom Exp $")
/*
some of the code in here was contributed by:
Magnus Bengtsson, d6mbeng@dtek.chalmers.se
*/
char *UP;
char *BC;
char *UP = 0;
char *BC = 0;
#ifdef FREEBSD_NATIVE
#undef GCC_UNUSED
@ -72,29 +72,30 @@ extern char _nc_termcap[]; /* buffer to copy out */
*
***************************************************************************/
int tgetent(char *bufp GCC_UNUSED, const char *name)
int
tgetent(char *bufp GCC_UNUSED, const char *name)
{
int errcode;
int errcode;
T((T_CALLED("tgetent()")));
T((T_CALLED("tgetent()")));
setupterm((NCURSES_CONST char *)name, STDOUT_FILENO, &errcode);
setupterm((NCURSES_CONST char *) name, STDOUT_FILENO, &errcode);
if (errcode == 1) {
if (errcode == 1) {
if (cursor_left)
if ((backspaces_with_bs = !strcmp(cursor_left, "\b")) == 0)
backspace_if_not_bs = cursor_left;
if (cursor_left)
if ((backspaces_with_bs = !strcmp(cursor_left, "\b")) == 0)
backspace_if_not_bs = cursor_left;
/* we're required to export these */
if (pad_char != NULL)
PC = pad_char[0];
if (cursor_up != NULL)
UP = cursor_up;
if (backspace_if_not_bs != NULL)
BC = backspace_if_not_bs;
/* we're required to export these */
if (pad_char != NULL)
PC = pad_char[0];
if (cursor_up != NULL)
UP = cursor_up;
if (backspace_if_not_bs != NULL)
BC = backspace_if_not_bs;
(void) baudrate(); /* sets ospeed as a side-effect */
(void) baudrate(); /* sets ospeed as a side-effect */
/* LINT_PREPRO
#if 0*/
@ -102,7 +103,6 @@ int errcode;
/* LINT_PREPRO
#endif*/
}
#ifdef FREEBSD_NATIVE
/*
* This is a REALLY UGLY hack. Basically, if we originate with
@ -112,7 +112,8 @@ int errcode;
strncpy(bufp, _nc_termcap, 1024);
#endif
returnCode(errcode);
}
returnCode(errcode);
}
/***************************************************************************
@ -124,22 +125,23 @@ int errcode;
*
***************************************************************************/
int tgetflag(NCURSES_CONST char *id)
int
tgetflag(NCURSES_CONST char *id)
{
int i;
int i;
T((T_CALLED("tgetflag(%s)"), id));
if (cur_term != 0) {
TERMTYPE *tp = &(cur_term->type);
for_each_boolean(i, tp) {
const char *capname = ExtBoolname(tp, i, boolcodes);
if (!strncmp(id, capname, 2)) {
/* setupterm forces invalid booleans to false */
returnCode(tp->Booleans[i]);
}
T((T_CALLED("tgetflag(%s)"), id));
if (cur_term != 0) {
TERMTYPE *tp = &(cur_term->type);
for_each_boolean(i, tp) {
const char *capname = ExtBoolname(tp, i, boolcodes);
if (!strncmp(id, capname, 2)) {
/* setupterm forces invalid booleans to false */
returnCode(tp->Booleans[i]);
}
}
returnCode(0); /* Solaris does this */
}
returnCode(0); /* Solaris does this */
}
/***************************************************************************
@ -151,23 +153,24 @@ int i;
*
***************************************************************************/
int tgetnum(NCURSES_CONST char *id)
int
tgetnum(NCURSES_CONST char *id)
{
int i;
int i;
T((T_CALLED("tgetnum(%s)"), id));
if (cur_term != 0) {
TERMTYPE *tp = &(cur_term->type);
for_each_number(i, tp) {
const char *capname = ExtNumname(tp, i, numcodes);
if (!strncmp(id, capname, 2)) {
if (!VALID_NUMERIC(tp->Numbers[i]))
return -1;
returnCode(tp->Numbers[i]);
}
T((T_CALLED("tgetnum(%s)"), id));
if (cur_term != 0) {
TERMTYPE *tp = &(cur_term->type);
for_each_number(i, tp) {
const char *capname = ExtNumname(tp, i, numcodes);
if (!strncmp(id, capname, 2)) {
if (!VALID_NUMERIC(tp->Numbers[i]))
returnCode(ABSENT_NUMERIC);
returnCode(tp->Numbers[i]);
}
}
returnCode(ERR);
}
returnCode(ABSENT_NUMERIC);
}
/***************************************************************************
@ -179,30 +182,30 @@ int i;
*
***************************************************************************/
char *tgetstr(NCURSES_CONST char *id, char **area)
char *
tgetstr(NCURSES_CONST char *id, char **area)
{
int i;
int i;
T((T_CALLED("tgetstr(%s,%p)"), id, area));
if (cur_term != 0) {
TERMTYPE *tp = &(cur_term->type);
for_each_string(i, tp) {
const char *capname = ExtStrname(tp, i, strcodes);
T(("trying %s", capname));
if (!strncmp(id, capname, 2)) {
T(("found match : %s", _nc_visbuf(tp->Strings[i])));
/* setupterm forces cancelled strings to null */
if (area != 0
&& *area != 0
&& VALID_STRING(tp->Strings[i])) {
(void) strcpy(*area, tp->Strings[i]);
*area += strlen(*area) + 1;
}
returnPtr(tp->Strings[i]);
T((T_CALLED("tgetstr(%s,%p)"), id, area));
if (cur_term != 0) {
TERMTYPE *tp = &(cur_term->type);
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])));
/* 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;
}
returnPtr(tp->Strings[i]);
}
}
returnPtr(NULL);
}
returnPtr(NULL);
}
/*
@ -214,8 +217,9 @@ int i;
*
*/
char *tgoto(const char *string, int x, int y)
char *
tgoto(const char *string, int x, int y)
{
T((T_CALLED("tgoto(%s,%d,%d)"), string, x, y));
returnPtr(tparm((NCURSES_CONST char *)string, y, x));
T((T_CALLED("tgoto(%s,%d,%d)"), string, x, y));
returnPtr(tparm((NCURSES_CONST char *) string, y, x));
}