ncurses 6.4 - patch 20230225

[ncurses.git] / test / ncurses.c

diff --git a/test/ncurses.c b/test/ncurses.c
index afa631ad5a3943ce008a554182c4e4d7679abe32..fed8b9bef27810bd023c2f2d0a114dec7978ecce 100644 (file)
--- a/test/ncurses.c
+++ b/test/ncurses.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2021,2022 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 1998-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -41,24 +41,24 @@ AUTHOR
    Author: Eric S. Raymond <esr@snark.thyrsus.com> 1993
            Thomas E. Dickey (beginning revision 1.27 in 1996).
 
-$Id: ncurses.c,v 1.532 2022/12/04 00:40:11 tom Exp $
+$Id: ncurses.c,v 1.534 2023/02/25 19:30:27 tom Exp $
 
 ***************************************************************************/
 
+#define NEED_TIME_H 1
 #include <test.priv.h>
 
 #ifdef __hpux
 #undef mvwdelch                        /* HPUX 11.23 macro will not compile */
 #endif
 
-#if HAVE_GETTIMEOFDAY
 #if HAVE_SYS_TIME_H && HAVE_SYS_TIME_SELECT
 #include <sys/time.h>
 #endif
+
 #if HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
-#endif
 
 #if USE_LIBPANEL
 #include <panel.h>
@@ -5600,10 +5600,8 @@ panner(WINDOW *pad,
        int (*pgetc) (WINDOW *),
        bool colored)
 {
-#if HAVE_GETTIMEOFDAY
-    struct timeval before, after;
+    TimeType before, after;
     bool timing = TRUE;
-#endif
     bool pan_lines = FALSE;
     bool scrollers = TRUE;
     int basex = 0;
@@ -5649,13 +5647,11 @@ panner(WINDOW *pad,
            pending_pan = FALSE;
            break;
 
-#if HAVE_GETTIMEOFDAY
        case 't':
            timing = !timing;
            if (!timing)
                panner_legend(LINES - 1);
            break;
-#endif
        case 's':
            scrollers = !scrollers;
            break;
@@ -5828,9 +5824,7 @@ panner(WINDOW *pad,
        MvAddCh(porty - 1, portx - 1, ACS_LRCORNER);
 
        if (!pending_pan) {
-#if HAVE_GETTIMEOFDAY
-           gettimeofday(&before, 0);
-#endif
+           GetClockTime(&before);
            wnoutrefresh(stdscr);
 
            pnoutrefresh(pad,
@@ -5840,17 +5834,12 @@ panner(WINDOW *pad,
                         portx - (pymax > porty) - 1);
 
            doupdate();
-#if HAVE_GETTIMEOFDAY
-#define TIMEVAL2S(data) ((double) data.tv_sec + ((double) data.tv_usec / 1.0e6))
            if (timing) {
-               double elapsed;
-               gettimeofday(&after, 0);
-               elapsed = (TIMEVAL2S(after) - TIMEVAL2S(before));
+               GetClockTime(&after);
                move(LINES - 1, COLS - 12);
-               printw("Secs: %2.03f", elapsed);
+               printw("Secs: %6.03f", ElapsedSeconds(&before, &after));
                refresh();
            }
-#endif
        }
 
     } while