X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fbase%2Flib_ungetch.c;h=8742f867fa946f8e3fa099386f6ba818006862da;hp=5fdfb47d490f0e9c7c21d34751e0fac56fa303a9;hb=1c2ec25b8186b7973aeb06ec4da6b63656e12f7d;hpb=0eb88fc5281804773e2a0c7a488a4452463535ce

diff --git a/ncurses/base/lib_ungetch.c b/ncurses/base/lib_ungetch.c
index 5fdfb47d..8742f867 100644
--- a/ncurses/base/lib_ungetch.c
+++ b/ncurses/base/lib_ungetch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998 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,35 +41,50 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_ungetch.c,v 1.2 1998/02/11 12:13:56 tom Exp $")
+MODULE_ID("$Id: lib_ungetch.c,v 1.11 2008/05/31 16:44:54 tom Exp $")
 
 #include <fifo_defs.h>
 
 #ifdef TRACE
-void _nc_fifo_dump(void)
+NCURSES_EXPORT(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, _trace_key(SP->_fifo[i])));
+    int i;
+    T(("head = %d, tail = %d, peek = %d", head, tail, peek));
+    for (i = 0; i < 10; i++)
+	T(("char %d = %s", i, _nc_tracechar(sp, sp->_fifo[i])));
 }
 #endif /* TRACE */
 
-int ungetch(int ch)
+NCURSES_EXPORT(int)
+_nc_ungetch(SCREEN *sp, int ch)
 {
-	if (tail == -1)
-		return ERR;
+    int rc = ERR;
+
+    if (tail != -1) {
 	if (head == -1) {
-		head = 0;
-		t_inc()
-		peek = tail; /* no raw keys */
+	    head = 0;
+	    t_inc();
+	    peek = tail;	/* no raw keys */
 	} else
-		h_dec();
+	    h_dec();
 
-	SP->_fifo[head] = ch;
-	T(("ungetch %#x ok", ch));
+	sp->_fifo[head] = ch;
+	T(("ungetch %s ok", _nc_tracechar(sp, ch)));
 #ifdef TRACE
-	if (_nc_tracing & TRACE_IEVENT) _nc_fifo_dump();
+	if (USE_TRACEF(TRACE_IEVENT)) {
+	    _nc_fifo_dump(sp);
+	    _nc_unlock_global(tracef);
+	}
 #endif
-	return OK;
+	rc = OK;
+    }
+    return rc;
+}
+
+NCURSES_EXPORT(int)
+ungetch(int ch)
+{
+    T((T_CALLED("ungetch(%s)"), _nc_tracechar(SP, ch)));
+    returnCode(_nc_ungetch(SP, ch));
 }