ncurses 6.2 - patch 20210418

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

diff --git a/ncurses/base/lib_ungetch.c b/ncurses/base/lib_ungetch.c
index 9570a33edc5eb45e034d2f4dc8b5e20d778b0106..fcbe6f4a90c1fe3c32f79af2504bccc11ab249c3 100644 (file)
--- a/ncurses/base/lib_ungetch.c
+++ b/ncurses/base/lib_ungetch.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2002,2007 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            *
  *                                                                          *
  * 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>                         *
 /****************************************************************************
  *  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,42 +43,52 @@
 
 #include <curses.priv.h>
 
 
 #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.17 2020/02/02 23:34:34 tom Exp $")

 
 #include <fifo_defs.h>
 
 #ifdef TRACE
 NCURSES_EXPORT(void)
 
 #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++)
 {
     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, _nc_tracechar(sp, sp->_fifo[i])));

 }
 #endif /* TRACE */
 
 NCURSES_EXPORT(int)
 }
 #endif /* TRACE */
 
 NCURSES_EXPORT(int)

-ungetch(int ch)
+safe_ungetch(SCREEN *sp, int ch)

 {
 {

-    T((T_CALLED("ungetch(%s)"), _tracechar(ch)));
+    int rc = ERR;
+
+    T((T_CALLED("ungetch(%p,%s)"), (void *) sp, _nc_tracechar(sp, ch)));

 
 

-    if (tail == -1)
-       returnCode(ERR);
-    if (head == -1) {
-       head = 0;
-       t_inc()
+    if (sp != 0 && tail >= 0) {
+       if (head < 0) {
+           head = 0;
+           t_inc();

            peek = tail;        /* no raw keys */
            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", _nc_tracechar(sp, ch)));

 #ifdef TRACE
 #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
 #endif

-    returnCode(OK);
+       rc = OK;
+    }
+    returnCode(rc);
+}
+
+NCURSES_EXPORT(int)
+ungetch(int ch)
+{
+    return safe_ungetch(CURRENT_SCREEN, ch);

 }
 }