X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Ftinfo%2Flib_kernel.c;h=37f70842907d755b5f53e2138b95b10aeb39b158;hp=3c8c88ee2aabcac7af1a880915407029d0ddad0d;hb=c55d387cebf1cee4757ca2c2ef4fbeae59ee4175;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/tinfo/lib_kernel.c b/ncurses/tinfo/lib_kernel.c
index 3c8c88ee..37f70842 100644
--- a/ncurses/tinfo/lib_kernel.c
+++ b/ncurses/tinfo/lib_kernel.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright (c) 1998-2009,2010 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,9 +29,10 @@
 /****************************************************************************
  *  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                    *
  ****************************************************************************/
 
-
 /*
  *	lib_kernel.c
  *
@@ -46,9 +47,29 @@
  */
 
 #include <curses.priv.h>
-#include <term.h>	/* cur_term */
 
-MODULE_ID("$Id: lib_kernel.c,v 1.19 1998/12/20 00:18:45 tom Exp $")
+MODULE_ID("$Id: lib_kernel.c,v 1.31 2010/12/19 01:21:19 tom Exp $")
+
+static int
+_nc_vdisable(void)
+{
+    int value = -1;
+#if defined(_POSIX_VDISABLE) && HAVE_UNISTD_H
+    value = _POSIX_VDISABLE;
+#endif
+#if defined(_PC_VDISABLE)
+    if (value == -1) {
+	value = (int) fpathconf(0, _PC_VDISABLE);
+	if (value == -1) {
+	    value = 0377;
+	}
+    }
+#elif defined(VDISABLE)
+    if (value == -1)
+	value = VDISABLE;
+#endif
+    return value;
+}
 
 /*
  *	erasechar()
@@ -57,22 +78,33 @@ MODULE_ID("$Id: lib_kernel.c,v 1.19 1998/12/20 00:18:45 tom Exp $")
  *
  */
 
-char
-erasechar(void)
+NCURSES_EXPORT(char)
+NCURSES_SP_NAME(erasechar) (NCURSES_SP_DCL0)
 {
-	T((T_CALLED("erasechar()")));
+    int result = ERR;
+    TERMINAL *termp = TerminalOf(SP_PARM);
+
+    T((T_CALLED("erasechar(%p)"), (void *) SP_PARM));
 
-	if (cur_term != 0) {
+    if (termp != 0) {
 #ifdef TERMIOS
-		returnCode(cur_term->Ottyb.c_cc[VERASE]);
+	result = termp->Ottyb.c_cc[VERASE];
+	if (result == _nc_vdisable())
+	    result = ERR;
 #else
-		returnCode(cur_term->Ottyb.sg_erase);
+	result = termp->Ottyb.sg_erase;
 #endif
-	}
-	returnCode(ERR);
+    }
+    returnChar((char) result);
 }
 
-
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(char)
+erasechar(void)
+{
+    return NCURSES_SP_NAME(erasechar) (CURRENT_SCREEN);
+}
+#endif
 
 /*
  *	killchar()
@@ -81,22 +113,33 @@ erasechar(void)
  *
  */
 
-char
-killchar(void)
+NCURSES_EXPORT(char)
+NCURSES_SP_NAME(killchar) (NCURSES_SP_DCL0)
 {
-	T((T_CALLED("killchar()")));
+    int result = ERR;
+    TERMINAL *termp = TerminalOf(SP_PARM);
 
-	if (cur_term != 0) {
+    T((T_CALLED("killchar(%p)"), (void *) SP_PARM));
+
+    if (termp != 0) {
 #ifdef TERMIOS
-		returnCode(cur_term->Ottyb.c_cc[VKILL]);
+	result = termp->Ottyb.c_cc[VKILL];
+	if (result == _nc_vdisable())
+	    result = ERR;
 #else
-		returnCode(cur_term->Ottyb.sg_kill);
+	result = termp->Ottyb.sg_kill;
 #endif
-	}
-	returnCode(ERR);
+    }
+    returnChar((char) result);
 }
 
-
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(char)
+killchar(void)
+{
+    return NCURSES_SP_NAME(killchar) (CURRENT_SCREEN);
+}
+#endif
 
 /*
  *	flushinp()
@@ -105,26 +148,37 @@ killchar(void)
  *
  */
 
-int flushinp(void)
+NCURSES_EXPORT(int)
+NCURSES_SP_NAME(flushinp) (NCURSES_SP_DCL0)
 {
-	T((T_CALLED("flushinp()")));
+    TERMINAL *termp = TerminalOf(SP_PARM);
 
-	if (cur_term != 0) {
+    T((T_CALLED("flushinp(%p)"), (void *) SP_PARM));
+
+    if (termp != 0) {
 #ifdef TERMIOS
-		tcflush(cur_term->Filedes, TCIFLUSH);
+	tcflush(termp->Filedes, TCIFLUSH);
 #else
-		errno = 0;
-		do {
-		    ioctl(cur_term->Filedes, TIOCFLUSH, 0);
-		} while
-		    (errno == EINTR);
+	errno = 0;
+	do {
+	    ioctl(termp->Filedes, TIOCFLUSH, 0);
+	} while
+	    (errno == EINTR);
 #endif
-		if (SP) {
-			SP->_fifohead = -1;
-			SP->_fifotail = 0;
-			SP->_fifopeek = 0;
-		}
-		returnCode(OK);
+	if (SP_PARM) {
+	    SP_PARM->_fifohead = -1;
+	    SP_PARM->_fifotail = 0;
+	    SP_PARM->_fifopeek = 0;
 	}
-	returnCode(ERR);
+	returnCode(OK);
+    }
+    returnCode(ERR);
 }
+
+#if NCURSES_SP_FUNCS
+NCURSES_EXPORT(int)
+flushinp(void)
+{
+    return NCURSES_SP_NAME(flushinp) (CURRENT_SCREEN);
+}
+#endif