ncurses 6.4 - patch 20240420

[ncurses.git] / test / foldkeys.c

diff --git a/test/foldkeys.c b/test/foldkeys.c
index 1a5aac0d97fce1ee224f49a5722eb934a51efed9..bb3801e282fe4e31e71f6feac04963e894c4aaa5 100644 (file)
--- a/test/foldkeys.c
+++ b/test/foldkeys.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright 2018-2019,2020 Thomas E. Dickey                                *
+ * Copyright 2018-2022,2023 Thomas E. Dickey                                *
  * Copyright 2006-2016,2017 Free Software Foundation, Inc.                  *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
@@ -30,7 +30,7 @@
 /*
  * Author: Thomas E. Dickey, 2006
  *
- * $Id: foldkeys.c,v 1.9 2020/02/02 23:34:34 tom Exp $
+ * $Id: foldkeys.c,v 1.12 2023/02/25 16:51:01 tom Exp $
  *
  * Demonstrate a method for altering key definitions at runtime.
  *
@@ -146,7 +146,8 @@ demo_foldkeys(void)
        int first, second;
        char final[2];
        char *value;
-       size_t need = 0;
+       size_t need;
+
        if (info[j].state == 0
            && sscanf(info[j].value,
                      "\033[%d;%d%c",
@@ -156,6 +157,7 @@ demo_foldkeys(void)
            && *final != ';'
            && (need = strlen(info[j].value)) != 0
            && (value = strdup(info[j].value)) != 0) {
+           (void) need;        /* _nc_SLIMIT is normally nothing  */
            _nc_SPRINTF(value, _nc_SLIMIT(need) "\033[%d%c", first, *final);
            for (k = 0; k < info_len; ++k) {
                if (info[k].state == 0
@@ -191,13 +193,44 @@ demo_foldkeys(void)
     printw("Merged to %d key definitions\n", info_len - merged);
 }
 
+static void
+usage(int ok)
+{
+    static const char *msg[] =
+    {
+       "Usage: foldkeys [options]"
+       ,""
+       ,USAGE_COMMON
+    };
+    size_t n;
+
+    for (n = 0; n < SIZEOF(msg); n++)
+       fprintf(stderr, "%s\n", msg[n]);
+
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
+}
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
+
 int
-main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
+main(int argc, char *argv[])
 {
     int ch;
-#if HAVE_GETTIMEOFDAY
-    struct timeval previous;
-#endif
+    TimeType previous;
+
+    while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) {
+       switch (ch) {
+       case OPTS_VERSION:
+           show_version(argv);
+           ExitProgram(EXIT_SUCCESS);
+       default:
+           usage(ch == OPTS_USAGE);
+           /* NOTREACHED */
+       }
+    }
+    if (optind < argc)
+       usage(FALSE);
 
     if (newterm(0, stdout, stdin) == 0) {
        fprintf(stderr, "Cannot initialize terminal\n");
@@ -215,32 +248,17 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED)
 
     demo_foldkeys();
 
-#if HAVE_GETTIMEOFDAY
-    gettimeofday(&previous, 0);
-#endif
+    GetClockTime(&previous);
 
     while ((ch = getch()) != ERR) {
        bool escaped = (ch >= MY_KEYS);
        const char *name = keyname(escaped ? (ch - MY_KEYS) : ch);
+       TimeType current;
 
-#if HAVE_GETTIMEOFDAY
-       int secs, msecs;
-       struct timeval current;
-
-       gettimeofday(&current, 0);
-       secs = (int) (current.tv_sec - previous.tv_sec);
-       msecs = (int) ((current.tv_usec - previous.tv_usec) / 1000);
-       if (msecs < 0) {
-           msecs += 1000;
-           --secs;
-       }
-       if (msecs >= 1000) {
-           secs += msecs / 1000;
-           msecs %= 1000;
-       }
-       printw("%6d.%03d ", secs, msecs);
+       GetClockTime(&current);
+       printw("%6.03f ", ElapsedSeconds(&previous, &current));
        previous = current;
-#endif
+
        printw("Keycode %d, name %s%s\n",
               ch,
               escaped ? "ESC-" : "",