ncurses 6.2 - patch 20200531

[ncurses.git] / ncurses / base / lib_ungetch.c

diff --git a/ncurses/base/lib_ungetch.c b/ncurses/base/lib_ungetch.c
index 5fdfb47d490f0e9c7c21d34751e0fac56fa303a9..fcbe6f4a90c1fe3c32f79af2504bccc11ab249c3 100644 (file)
--- a/ncurses/base/lib_ungetch.c
+++ b/ncurses/base/lib_ungetch.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998 Free Software Foundation, Inc.                        *
+ * Copyright 2020 Thomas E. Dickey                                          *
+ * Copyright 1998-2011,2012 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 +30,8 @@
 /****************************************************************************
  *  Author: Zeyd M. Ben-Halim <zmbenhal@netcom.com> 1992,1995               *
  *     and: Eric S. Raymond <esr@snark.thyrsus.com>                         *
+ *     and: Thomas E. Dickey                        1996-on                 *
+ *     and: Juergen Pfeifer                         2009                    *
  ****************************************************************************/
 
 /*
@@ -40,35 +43,52 @@
 
 #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.17 2020/02/02 23:34:34 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)
+safe_ungetch(SCREEN *sp, int ch)
 {
-       if (tail == -1)
-               return ERR;
-       if (head == -1) {
-               head = 0;
-               t_inc()
-               peek = tail; /* no raw keys */
-       } else
-               h_dec();
+    int rc = ERR;
 
-       SP->_fifo[head] = ch;
-       T(("ungetch %#x ok", ch));
+    T((T_CALLED("ungetch(%p,%s)"), (void *) sp, _nc_tracechar(sp, ch)));
+
+    if (sp != 0 && tail >= 0) {
+       if (head < 0) {
+           head = 0;
+           t_inc();
+           peek = tail;        /* no raw keys */
+       } else {
+           h_dec();
+       }
+
+       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;
+    }
+    returnCode(rc);
+}
+
+NCURSES_EXPORT(int)
+ungetch(int ch)
+{
+    return safe_ungetch(CURRENT_SCREEN, ch);
 }