ncurses 6.2 - patch 20210213

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

diff --git a/ncurses/base/lib_getch.c b/ncurses/base/lib_getch.c
index 4048fde57265dcbf3d88d07ff1b2facef2998206..38537591afc0ab8bda04ed5ec382ba0292453584 100644 (file)
--- a/ncurses/base/lib_getch.c
+++ b/ncurses/base/lib_getch.c
@@ -1,5 +1,6 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2014,2015 Free Software Foundation, Inc.              *
+ * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 1998-2015,2016 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            *


@@ -40,9 +41,10 @@
 **
 */
 
 **
 */
 

+#define NEED_KEY_EVENT

 #include <curses.priv.h>
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_getch.c,v 1.133 2015/11/29 01:28:52 tom Exp $")
+MODULE_ID("$Id: lib_getch.c,v 1.141 2020/09/05 22:50:47 tom Exp $")

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


@@ -69,16 +71,20 @@ NCURSES_EXPORT(int)
 NCURSES_SP_NAME(set_escdelay) (NCURSES_SP_DCLx int value)
 {
     int code = OK;
 NCURSES_SP_NAME(set_escdelay) (NCURSES_SP_DCLx int value)
 {
     int code = OK;

-#if USE_REENTRANT
-    if (SP_PARM) {
-       SET_ESCDELAY(value);
-    } else {
+    if (value < 0) {

        code = ERR;
        code = ERR;

-    }
+    } else {
+#if USE_REENTRANT
+       if (SP_PARM) {
+           SET_ESCDELAY(value);
+       } else {
+           code = ERR;
+       }

 #else
 #else

-    (void) SP_PARM;
-    ESCDELAY = value;
+       (void) SP_PARM;
+       ESCDELAY = value;

 #endif
 #endif

+    }

     return code;
 }
 
     return code;
 }
 


@@ -87,12 +93,16 @@ NCURSES_EXPORT(int)
 set_escdelay(int value)
 {
     int code;
 set_escdelay(int value)
 {
     int code;

+    if (value < 0) {
+       code = ERR;
+    } else {

 #if USE_REENTRANT
 #if USE_REENTRANT

-    code = NCURSES_SP_NAME(set_escdelay) (CURRENT_SCREEN, value);
+       code = NCURSES_SP_NAME(set_escdelay) (CURRENT_SCREEN, value);

 #else
 #else

-    ESCDELAY = value;
-    code = OK;
+       ESCDELAY = value;
+       code = OK;

 #endif
 #endif

+    }

     return code;
 }
 #endif
     return code;
 }
 #endif


@@ -125,7 +135,7 @@ _nc_use_meta(WINDOW *win)
 }
 
 #ifdef USE_TERM_DRIVER
 }
 
 #ifdef USE_TERM_DRIVER

-# ifdef __MINGW32__
+# if defined(_NC_WINDOWS) && !defined(EXP_WIN32_DRIVER)

 static HANDLE
 _nc_get_handle(int fd)
 {
 static HANDLE
 _nc_get_handle(int fd)
 {


@@ -146,7 +156,14 @@ check_mouse_activity(SCREEN *sp, int delay EVENTLIST_2nd(_nc_eventlist * evl))
 #ifdef USE_TERM_DRIVER
     TERMINAL_CONTROL_BLOCK *TCB = TCBOf(sp);
     rc = TCBOf(sp)->drv->td_testmouse(TCBOf(sp), delay EVENTLIST_2nd(evl));
 #ifdef USE_TERM_DRIVER
     TERMINAL_CONTROL_BLOCK *TCB = TCBOf(sp);
     rc = TCBOf(sp)->drv->td_testmouse(TCBOf(sp), delay EVENTLIST_2nd(evl));

-# ifdef __MINGW32__
+# if defined(EXP_WIN32_DRIVER)
+    /* if we emulate terminfo on console, we have to use the console routine */
+    if (IsTermInfoOnConsole(sp)) {
+       rc = _nc_console_testmouse(sp,
+                                  _nc_console_handle(sp->_ifd),
+                                  delay EVENTLIST_2nd(evl));
+    } else
+# elif defined(_NC_WINDOWS)

     /* if we emulate terminfo on console, we have to use the console routine */
     if (IsTermInfoOnConsole(sp)) {
        HANDLE fd = _nc_get_handle(sp->_ifd);
     /* if we emulate terminfo on console, we have to use the console routine */
     if (IsTermInfoOnConsole(sp)) {
        HANDLE fd = _nc_get_handle(sp->_ifd);


@@ -154,29 +171,36 @@ check_mouse_activity(SCREEN *sp, int delay EVENTLIST_2nd(_nc_eventlist * evl))
     } else
 # endif
        rc = TCB->drv->td_testmouse(TCB, delay EVENTLIST_2nd(evl));
     } else
 # endif
        rc = TCB->drv->td_testmouse(TCB, delay EVENTLIST_2nd(evl));

-#else
-#if USE_SYSMOUSE
+#else /* !USE_TERM_DRIVER */
+# if USE_SYSMOUSE

     if ((sp->_mouse_type == M_SYSMOUSE)
        && (sp->_sysmouse_head < sp->_sysmouse_tail)) {
        rc = TW_MOUSE;
     } else
     if ((sp->_mouse_type == M_SYSMOUSE)
        && (sp->_sysmouse_head < sp->_sysmouse_tail)) {
        rc = TW_MOUSE;
     } else

-#endif
+# endif

     {
     {

+# if defined(EXP_WIN32_DRIVER)
+       rc = _nc_console_testmouse(sp,
+                                  _nc_console_handle(sp->_ifd),
+                                  delay
+                                  EVENTLIST_2nd(evl));
+# else

        rc = _nc_timed_wait(sp,
                            TWAIT_MASK,
                            delay,
                            (int *) 0
                            EVENTLIST_2nd(evl));
        rc = _nc_timed_wait(sp,
                            TWAIT_MASK,
                            delay,
                            (int *) 0
                            EVENTLIST_2nd(evl));

-#if USE_SYSMOUSE
+# endif
+# if USE_SYSMOUSE

        if ((sp->_mouse_type == M_SYSMOUSE)
            && (sp->_sysmouse_head < sp->_sysmouse_tail)
            && (rc == 0)
            && (errno == EINTR)) {
            rc |= TW_MOUSE;
        }
        if ((sp->_mouse_type == M_SYSMOUSE)
            && (sp->_sysmouse_head < sp->_sysmouse_tail)
            && (rc == 0)
            && (errno == EINTR)) {
            rc |= TW_MOUSE;
        }

-#endif
+# endif

     }
     }

-#endif
+#endif /* USE_TERM_DRIVER */

     return rc;
 }
 
     return rc;
 }
 


@@ -224,11 +248,6 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
     if (tail < 0)
        return ERR;
 
     if (tail < 0)
        return ERR;
 

-#ifdef HIDE_EINTR
-  again:
-    errno = 0;
-#endif
-

 #ifdef NCURSES_WGETCH_EVENTS
     if (evl
 #if USE_GPM_SUPPORT || USE_EMX_MOUSE || USE_SYSMOUSE
 #ifdef NCURSES_WGETCH_EVENTS
     if (evl
 #if USE_GPM_SUPPORT || USE_EMX_MOUSE || USE_SYSMOUSE


@@ -286,51 +305,56 @@ fifo_push(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
     } else
 #endif
     {                          /* Can block... */
     } else
 #endif
     {                          /* Can block... */

-#ifdef USE_TERM_DRIVER
+#if defined(USE_TERM_DRIVER)

        int buf;
        int buf;

-#ifdef __MINGW32__
+# if defined(EXP_WIN32_DRIVER)
+       if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && sp->_cbreak) {
+#  if USE_PTHREADS_EINTR
+           if ((pthread_self) && (pthread_kill) && (pthread_equal))
+               _nc_globals.read_thread = pthread_self();
+#  endif
+           n = _nc_console_read(sp,
+                                _nc_console_handle(sp->_ifd),
+                                &buf);
+#  if USE_PTHREADS_EINTR
+           _nc_globals.read_thread = 0;
+#  endif
+       } else
+# elif defined(_NC_WINDOWS)

        if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && sp->_cbreak)
            n = _nc_mingw_console_read(sp,
                                       _nc_get_handle(sp->_ifd),
                                       &buf);
        else
        if (NC_ISATTY(sp->_ifd) && IsTermInfoOnConsole(sp) && sp->_cbreak)
            n = _nc_mingw_console_read(sp,
                                       _nc_get_handle(sp->_ifd),
                                       &buf);
        else

-#endif
+# endif        /* EXP_WIN32_DRIVER */

            n = CallDriver_1(sp, td_read, &buf);
        ch = buf;
            n = CallDriver_1(sp, td_read, &buf);
        ch = buf;

-#else
+#else /* !USE_TERM_DRIVER */
+#if defined(EXP_WIN32_DRIVER)
+       int buf;
+#endif

        unsigned char c2 = 0;
        unsigned char c2 = 0;

-# if USE_PTHREADS_EINTR
-#  if USE_WEAK_SYMBOLS
+#if USE_PTHREADS_EINTR
+#if USE_WEAK_SYMBOLS

        if ((pthread_self) && (pthread_kill) && (pthread_equal))
        if ((pthread_self) && (pthread_kill) && (pthread_equal))

-#  endif
+#endif

            _nc_globals.read_thread = pthread_self();
            _nc_globals.read_thread = pthread_self();

-# endif
+#endif
+#if defined(EXP_WIN32_DRIVER)
+       n = _nc_console_read(sp,
+                            _nc_console_handle(sp->_ifd),
+                            &buf);
+       c2 = buf;
+#else

        n = (int) read(sp->_ifd, &c2, (size_t) 1);
        n = (int) read(sp->_ifd, &c2, (size_t) 1);

+#endif

 #if USE_PTHREADS_EINTR
        _nc_globals.read_thread = 0;
 #endif
        ch = c2;
 #if USE_PTHREADS_EINTR
        _nc_globals.read_thread = 0;
 #endif
        ch = c2;

-#endif
+#endif /* USE_TERM_DRIVER */

     }
 
     }
 

-#ifdef HIDE_EINTR
-    /*
-     * Under System V curses with non-restarting signals, getch() returns
-     * with value ERR when a handled signal keeps it from completing.
-     * If signals restart system calls, OTOH, the signal is invisible
-     * except to its handler.
-     *
-     * We don't want this difference to show.  This piece of code
-     * tries to make it look like we always have restarting signals.
-     */
-    if (n <= 0 && errno == EINTR
-# if USE_PTHREADS_EINTR
-       && (_nc_globals.have_sigwinch == 0)
-# endif
-       )
-       goto again;
-#endif
-

     if ((n == -1) || (n == 0)) {
        TR(TRACE_IEVENT, ("read(%d,&ch,1)=%d, errno=%d", sp->_ifd, n, errno));
        ch = ERR;
     if ((n == -1) || (n == 0)) {
        TR(TRACE_IEVENT, ("read(%d,&ch,1)=%d, errno=%d", sp->_ifd, n, errno));
        ch = ERR;


@@ -360,7 +384,7 @@ fifo_clear(SCREEN *sp)
     tail = peek = 0;
 }
 
     tail = peek = 0;
 }
 

-static int kgetch(SCREEN *EVENTLIST_2nd(_nc_eventlist * evl));
+static int kgetch(SCREEN *, bool EVENTLIST_2nd(_nc_eventlist *));

 
 static void
 recur_wrefresh(WINDOW *win)
 
 static void
 recur_wrefresh(WINDOW *win)


@@ -497,8 +521,6 @@ _nc_wgetch(WINDOW *win,
            TR(TRACE_IEVENT, ("timed delay in wgetch()"));
            if (sp->_cbreak > 1)
                delay = (sp->_cbreak - 1) * 100;
            TR(TRACE_IEVENT, ("timed delay in wgetch()"));
            if (sp->_cbreak > 1)
                delay = (sp->_cbreak - 1) * 100;

-           else if (win->_notimeout)
-               delay = 0;

            else
                delay = win->_delay;
 
            else
                delay = win->_delay;
 


@@ -539,7 +561,7 @@ _nc_wgetch(WINDOW *win,
        int runcount = 0;
 
        do {
        int runcount = 0;
 
        do {

-           ch = kgetch(sp EVENTLIST_2nd(evl));
+           ch = kgetch(sp, win->_notimeout EVENTLIST_2nd(evl));

            if (ch == KEY_MOUSE) {
                ++runcount;
                if (sp->_mouse_inline(sp))
            if (ch == KEY_MOUSE) {
                ++runcount;
                if (sp->_mouse_inline(sp))


@@ -651,7 +673,7 @@ wgetch_events(WINDOW *win, _nc_eventlist * evl)
     int code;
     int value;
 
     int code;
     int value;
 

-    T((T_CALLED("wgetch_events(%p,%p)"), win, evl));
+    T((T_CALLED("wgetch_events(%p,%p)"), (void *) win, (void *) evl));

     code = _nc_wgetch(win,
                      &value,
                      _nc_use_meta(win)
     code = _nc_wgetch(win,
                      &value,
                      _nc_use_meta(win)


@@ -694,11 +716,11 @@ wgetch(WINDOW *win)
 */
 
 static int
 */
 
 static int

-kgetch(SCREEN *sp EVENTLIST_2nd(_nc_eventlist * evl))
+kgetch(SCREEN *sp, bool forever EVENTLIST_2nd(_nc_eventlist * evl))

 {
     TRIES *ptr;
     int ch = 0;
 {
     TRIES *ptr;
     int ch = 0;

-    int timeleft = GetEscdelay(sp);
+    int timeleft = forever ? 9999999 : GetEscdelay(sp);

 
     TR(TRACE_IEVENT, ("kgetch() called"));
 
 
     TR(TRACE_IEVENT, ("kgetch() called"));