aboutsummaryrefslogtreecommitdiff
path: root/contrib/ncurses/ncurses/base/lib_ungetch.c
diff options
context:
space:
mode:
authorRong-En Fan <rafan@FreeBSD.org>2008-05-09 02:28:12 +0000
committerRong-En Fan <rafan@FreeBSD.org>2008-05-09 02:28:12 +0000
commitaa59d4d4c5dda7e1c6f9dc0cc6edc58992a525c7 (patch)
tree502fa0a691368fb8b60b62eef10b3f3332efe830 /contrib/ncurses/ncurses/base/lib_ungetch.c
parentd8977eaf361f5fdc1261c3f3524988f661ed926e (diff)
downloadsrc-aa59d4d4c5dda7e1c6f9dc0cc6edc58992a525c7.tar.gz
src-aa59d4d4c5dda7e1c6f9dc0cc6edc58992a525c7.zip
Import ncurses 5.6-20080503 snapshot onto the vender branchvendor/ncurses/5.6-20080503
Notes
Notes: svn path=/vendor/ncurses/dist/; revision=178866 svn path=/vendor/ncurses/5.6-20080503/; revision=178868; tag=vendor/ncurses/5.6-20080503
Diffstat (limited to 'contrib/ncurses/ncurses/base/lib_ungetch.c')
-rw-r--r--contrib/ncurses/ncurses/base/lib_ungetch.c49
1 files changed, 29 insertions, 20 deletions
diff --git a/contrib/ncurses/ncurses/base/lib_ungetch.c b/contrib/ncurses/ncurses/base/lib_ungetch.c
index 9570a33edc5e..2eda99017bed 100644
--- a/contrib/ncurses/ncurses/base/lib_ungetch.c
+++ b/contrib/ncurses/ncurses/base/lib_ungetch.c
@@ -1,5 +1,5 @@
/****************************************************************************
- * Copyright (c) 1998-2002,2007 Free Software Foundation, Inc. *
+ * Copyright (c) 1998-2007,2008 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,7 @@
/****************************************************************************
* Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995 *
* and: Eric S. Raymond <esr@snark.thyrsus.com> *
+ * and: Thomas E. Dickey 1996-on *
****************************************************************************/
/*
@@ -40,42 +41,50 @@
#include <curses.priv.h>
-MODULE_ID("$Id: lib_ungetch.c,v 1.9 2007/09/29 21:49:56 tom Exp $")
+MODULE_ID("$Id: lib_ungetch.c,v 1.10 2008/05/03 20:20:58 tom Exp $")
#include <fifo_defs.h>
#ifdef TRACE
NCURSES_EXPORT(void)
-_nc_fifo_dump(void)
+_nc_fifo_dump(SCREEN *sp)
{
int i;
T(("head = %d, tail = %d, peek = %d", head, tail, peek));
for (i = 0; i < 10; i++)
- T(("char %d = %s", i, _tracechar(SP->_fifo[i])));
+ T(("char %d = %s", i, _tracechar(sp->_fifo[i])));
}
#endif /* TRACE */
NCURSES_EXPORT(int)
-ungetch(int ch)
+_nc_ungetch(SCREEN *sp, int ch)
{
- T((T_CALLED("ungetch(%s)"), _tracechar(ch)));
+ int rc = ERR;
- if (tail == -1)
- returnCode(ERR);
- if (head == -1) {
- head = 0;
- t_inc()
+ if (tail != -1) {
+ if (head == -1) {
+ head = 0;
+ t_inc();
peek = tail; /* no raw keys */
- } else
- h_dec();
+ } else
+ h_dec();
- SP->_fifo[head] = ch;
- T(("ungetch %s ok", _tracechar(ch)));
+ sp->_fifo[head] = ch;
+ T(("ungetch %s ok", _tracechar(ch)));
#ifdef TRACE
- if (USE_TRACEF(TRACE_IEVENT)) {
- _nc_fifo_dump();
- _nc_unlock_global(tracef);
- }
+ if (USE_TRACEF(TRACE_IEVENT)) {
+ _nc_fifo_dump(sp);
+ _nc_unlock_global(tracef);
+ }
#endif
- returnCode(OK);
+ rc = OK;
+ }
+ return rc;
+}
+
+NCURSES_EXPORT(int)
+ungetch(int ch)
+{
+ T((T_CALLED("ungetch(%s)"), _tracechar(ch)));
+ returnCode(_nc_ungetch(SP, ch));
}