aboutsummaryrefslogtreecommitdiff
path: root/ncurses/tinfo/lib_kernel.c
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
committerXin LI <delphij@FreeBSD.org>2014-02-28 19:12:44 +0000
commit4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a (patch)
treeb8f6e12b479a78216f3bffb8e1258d54087268de /ncurses/tinfo/lib_kernel.c
parente07762606a5bf651a501cb095c98cba90e4a8fe2 (diff)
downloadsrc-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.tar.gz
src-4b819fa20a8d007a10f2d3e8d6a5dedf7f18fc9a.zip
Undo two previous imports which was never done in preparation of doing a
new import.
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=262616
Diffstat (limited to 'ncurses/tinfo/lib_kernel.c')
-rw-r--r--ncurses/tinfo/lib_kernel.c82
1 files changed, 26 insertions, 56 deletions
diff --git a/ncurses/tinfo/lib_kernel.c b/ncurses/tinfo/lib_kernel.c
index 37f70842907d..89dc1e80ea8e 100644
--- a/ncurses/tinfo/lib_kernel.c
+++ b/ncurses/tinfo/lib_kernel.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2009,2010 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2003,2004 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,8 +29,7 @@
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
- * and: Thomas E. Dickey 2002 *
- * and: Juergen Pfeifer 2009 *
+ * and: Thomas E. Dickey 2002 *
****************************************************************************/
/*
@@ -47,8 +46,9 @@
*/
#include <curses.priv.h>
+#include <term.h> /* cur_term */
-MODULE_ID("$Id: lib_kernel.c,v 1.31 2010/12/19 01:21:19 tom Exp $")
+MODULE_ID("$Id: lib_kernel.c,v 1.24 2004/05/08 17:11:21 tom Exp $")
static int
_nc_vdisable(void)
@@ -59,7 +59,7 @@ _nc_vdisable(void)
#endif
#if defined(_PC_VDISABLE)
if (value == -1) {
- value = (int) fpathconf(0, _PC_VDISABLE);
+ value = fpathconf(0, _PC_VDISABLE);
if (value == -1) {
value = 0377;
}
@@ -79,32 +79,22 @@ _nc_vdisable(void)
*/
NCURSES_EXPORT(char)
-NCURSES_SP_NAME(erasechar) (NCURSES_SP_DCL0)
+erasechar(void)
{
int result = ERR;
- TERMINAL *termp = TerminalOf(SP_PARM);
-
- T((T_CALLED("erasechar(%p)"), (void *) SP_PARM));
+ T((T_CALLED("erasechar()")));
- if (termp != 0) {
+ if (cur_term != 0) {
#ifdef TERMIOS
- result = termp->Ottyb.c_cc[VERASE];
+ result = cur_term->Ottyb.c_cc[VERASE];
if (result == _nc_vdisable())
result = ERR;
#else
- result = termp->Ottyb.sg_erase;
+ result = cur_term->Ottyb.sg_erase;
#endif
}
- returnChar((char) result);
-}
-
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(char)
-erasechar(void)
-{
- return NCURSES_SP_NAME(erasechar) (CURRENT_SCREEN);
+ returnCode(result);
}
-#endif
/*
* killchar()
@@ -114,32 +104,22 @@ erasechar(void)
*/
NCURSES_EXPORT(char)
-NCURSES_SP_NAME(killchar) (NCURSES_SP_DCL0)
+killchar(void)
{
int result = ERR;
- TERMINAL *termp = TerminalOf(SP_PARM);
+ T((T_CALLED("killchar()")));
- T((T_CALLED("killchar(%p)"), (void *) SP_PARM));
-
- if (termp != 0) {
+ if (cur_term != 0) {
#ifdef TERMIOS
- result = termp->Ottyb.c_cc[VKILL];
+ result = cur_term->Ottyb.c_cc[VKILL];
if (result == _nc_vdisable())
result = ERR;
#else
- result = termp->Ottyb.sg_kill;
+ result = cur_term->Ottyb.sg_kill;
#endif
}
- returnChar((char) result);
-}
-
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(char)
-killchar(void)
-{
- return NCURSES_SP_NAME(killchar) (CURRENT_SCREEN);
+ returnCode(result);
}
-#endif
/*
* flushinp()
@@ -149,36 +129,26 @@ killchar(void)
*/
NCURSES_EXPORT(int)
-NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0)
+flushinp(void)
{
- TERMINAL *termp = TerminalOf(SP_PARM);
-
- T((T_CALLED("flushinp(%p)"), (void *) SP_PARM));
+ T((T_CALLED("flushinp()")));
- if (termp != 0) {
+ if (cur_term != 0) {
#ifdef TERMIOS
- tcflush(termp->Filedes, TCIFLUSH);
+ tcflush(cur_term->Filedes, TCIFLUSH);
#else
errno = 0;
do {
- ioctl(termp->Filedes, TIOCFLUSH, 0);
+ ioctl(cur_term->Filedes, TIOCFLUSH, 0);
} while
(errno == EINTR);
#endif
- if (SP_PARM) {
- SP_PARM->_fifohead = -1;
- SP_PARM->_fifotail = 0;
- SP_PARM->_fifopeek = 0;
+ if (SP) {
+ SP->_fifohead = -1;
+ SP->_fifotail = 0;
+ SP->_fifopeek = 0;
}
returnCode(OK);
}
returnCode(ERR);
}
-
-#if NCURSES_SP_FUNCS
-NCURSES_EXPORT(int)
-flushinp(void)
-{
- return NCURSES_SP_NAME(flushinp) (CURRENT_SCREEN);
-}
-#endif