ncurses 6.5 - patch 20240504

[ncurses.git] / ncurses / tty / lib_twait.c

diff --git a/ncurses/tty/lib_twait.c b/ncurses/tty/lib_twait.c
index 6b4d4ecf3f54a45a05fc30242187800474b03092..6fa73eedb4cedc06b0b301fffde2371f0e92cee7 100644 (file)
--- a/ncurses/tty/lib_twait.c
+++ b/ncurses/tty/lib_twait.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2015,2016 Free Software Foundation, Inc.              *
+ * Copyright 2018-2020,2023 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            *
@@ -70,13 +71,16 @@
 #  include <sys/select.h>
 # endif
 #endif
-#ifdef __MINGW32__
+#if HAVE_SYS_TIME_H
 #  include <sys/time.h>
 #endif
 #undef CUR
 
-MODULE_ID("$Id: lib_twait.c,v 1.71 2016/05/28 23:32:40 tom Exp $")
+MODULE_ID("$Id: lib_twait.c,v 1.81 2023/09/16 16:30:40 tom Exp $")
 
+/*
+ * Returns an elapsed time, in milliseconds (if possible).
+ */
 static long
 _nc_gettime(TimeType * t0, int first)
 {
@@ -84,18 +88,20 @@ _nc_gettime(TimeType * t0, int first)
 
 #if PRECISE_GETTIME
     TimeType t1;
-    gettimeofday(&t1, (struct timezone *) 0);
-    if (first) {
+    if (GetClockTime(&t1) == -1) {
+       *t0 = t1;
+       res = first ? 0 : 1;
+    } else if (first) {
        *t0 = t1;
        res = 0;
     } else {
        /* .tv_sec and .tv_usec are unsigned, be careful when subtracting */
-       if (t0->tv_usec > t1.tv_usec) {
-           t1.tv_usec += 1000000;      /* Convert 1s in 1e6 microsecs */
+       if (t0->sub_secs > t1.sub_secs) {
+           t1.sub_secs += TimeScale;
            t1.tv_sec--;
        }
-       res = (t1.tv_sec - t0->tv_sec) * 1000
-           + (t1.tv_usec - t0->tv_usec) / 1000;
+       res = (long) ((t1.tv_sec - t0->tv_sec) * 1000L
+                     + (t1.sub_secs - t0->sub_secs) / (TimeScale / 1000L));
     }
 #else
     time_t t1 = time((time_t *) 0);
@@ -197,6 +203,10 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
 
     long starttime, returntime;
 
+#ifdef NCURSES_WGETCH_EVENTS
+    (void) timeout_is_event;
+#endif
+
     TR(TRACE_IEVENT, ("start twait: %d milliseconds, mode: %d",
                      milliseconds, mode));
 
@@ -350,7 +360,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
     if ((mode & TW_MOUSE)
        && (fd = sp->_mouse_fd) >= 0) {
        FD_SET(fd, &set);
-       count = max(fd, count) + 1;
+       count = Max(fd, count) + 1;
     }
 #ifdef NCURSES_WGETCH_EVENTS
     if ((mode & TW_EVENT) && evl) {
@@ -360,7 +370,7 @@ _nc_timed_wait(SCREEN *sp MAYBE_UNUSED,
            if (ev->type == _NC_EVENT_FILE
                && (ev->data.fev.flags & _NC_EVENT_FILE_READABLE)) {
                FD_SET(ev->data.fev.fd, &set);
-               count = max(ev->data.fev.fd + 1, count);
+               count = Max(ev->data.fev.fd + 1, count);
            }
        }
     }