ncurses 5.6 - patch 20070421

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

diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c
index e66602c28ce1c60fc8df896a626eaa82b65a7c66..d8906daec63b7de903b3b82465e1c40a69bd813f 100644 (file)
--- a/ncurses/base/lib_getch.c
+++ b/ncurses/base/lib_getch.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2005,2006 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2006,2007 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            *


@@ -41,12 +41,20 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_getch.c,v 1.77 2007/02/25 00:43:54 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.79 2007/04/19 20:57:49 tom Exp $")

 
 #include <fifo_defs.h>
 
 
 #include <fifo_defs.h>
 

+#if USE_REENTRANT
+NCURSES_EXPORT(int)
+NCURSES_PUBLIC_VAR(ESCDELAY) (void)
+{
+    return SP ? SP->_ESCDELAY : 1000;
+}
+#else

 NCURSES_EXPORT_VAR(int)
 ESCDELAY = 1000;               /* max interval betw. chars in funkeys, in millisecs */
 NCURSES_EXPORT_VAR(int)
 ESCDELAY = 1000;               /* max interval betw. chars in funkeys, in millisecs */

+#endif

 
 #ifdef NCURSES_WGETCH_EVENTS
 #define TWAIT_MASK 7
 
 #ifdef NCURSES_WGETCH_EVENTS
 #define TWAIT_MASK 7


@@ -383,7 +391,7 @@ _nc_wgetch(WINDOW *win,
 
     if (ch == ERR) {
 #if USE_SIZECHANGE
 
     if (ch == ERR) {
 #if USE_SIZECHANGE

-       if (SP->_sig_winch) {
+       if (_nc_handle_sigwinch(FALSE)) {

            _nc_update_screensize();
            /* resizeterm can push KEY_RESIZE */
            if (cooked_key_in_fifo()) {
            _nc_update_screensize();
            /* resizeterm can push KEY_RESIZE */
            if (cooked_key_in_fifo()) {