ncurses 6.4 - patch 20240414

[ncurses.git] / test / filter.c

diff --git a/test/filter.c b/test/filter.c
index 90a74a6cec9bc2790ed2cfed70630d1b8c12e587..b7444569b789a026a8ac4005396a1a59aa88f115 100644 (file)
--- a/test/filter.c
+++ b/test/filter.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.              *
+ * Copyright 2019-2020,2022 Thomas E. Dickey                                *
+ * Copyright 1998-2016,2017 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            *
@@ -29,7 +30,7 @@
 /*
  * Author:  Thomas E. Dickey 1998
  *
- * $Id: filter.c,v 1.28 2016/09/10 21:23:23 tom Exp $
+ * $Id: filter.c,v 1.38 2022/12/04 00:40:11 tom Exp $
  *
  * An example of the 'filter()' function in ncurses, this program prompts
  * for commands and executes them (like a command shell).  It illustrates
@@ -41,6 +42,7 @@
  * reset_shell_mode() and reset_prog_mode() functions, we could invoke endwin()
  * and refresh(), but that does not work any better.
  */
+#define NEED_KEY_EVENT
 #include <test.priv.h>
 
 #if HAVE_FILTER
@@ -100,12 +102,11 @@ static int
 new_command(char *buffer, int length, int underline, bool clocked, bool polled)
 {
     int code = OK;
-    int limit;
 
     if (polled) {
        bool done = FALSE;
        bool first = TRUE;
-       int y, x;
+       int y = 0, x = 0;
        int n;
        int mark = 0;
        int used = 0;
@@ -113,6 +114,7 @@ new_command(char *buffer, int length, int underline, bool clocked, bool polled)
 
        timeout(20);            /* no one types 50CPS... */
        while (!done) {
+           int limit;
            int ch = getch();
 
            buffer[used] = '\0';
@@ -253,7 +255,7 @@ new_command(char *buffer, int length, int underline, bool clocked, bool polled)
     }
     attroff(underline);
     attroff(A_BOLD);
-    printw("\n");
+    refresh();
 
     return code;
 }
@@ -297,25 +299,32 @@ cancel_altscreen(void)
 #endif
 
 static void
-usage(void)
+usage(int ok)
 {
     static const char *msg[] =
     {
        "Usage: filter [options]"
        ,""
+       ,USAGE_COMMON
        ,"Options:"
 #ifdef NCURSES_VERSION
-       ,"  -a   suppress xterm alternate-screen by amending smcup/rmcup"
+       ," -a       suppress xterm alternate-screen by amending smcup/rmcup"
+#endif
+       ," -c       show current time on prompt line with \"Command\""
+#if HAVE_USE_DEFAULT_COLORS
+       ," -d       invoke use_default_colors"
 #endif
-       ,"  -c   show current time on prompt line with \"Command\""
-       ,"  -i   use initscr() rather than newterm()"
-       ,"  -p   poll for individual characters rather than using getnstr"
+       ," -i       use initscr() rather than newterm()"
+       ," -p       poll for individual characters rather than using getnstr"
     };
     unsigned n;
     for (n = 0; n < SIZEOF(msg); n++)
        fprintf(stderr, "%s\n", msg[n]);
-    ExitProgram(EXIT_FAILURE);
+    ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE);
 }
+/* *INDENT-OFF* */
+VERSION_COMMON()
+/* *INDENT-ON* */
 
 int
 main(int argc, char *argv[])
@@ -327,12 +336,15 @@ main(int argc, char *argv[])
     bool a_option = FALSE;
 #endif
     bool c_option = FALSE;
+#if HAVE_USE_DEFAULT_COLORS
+    bool d_option = FALSE;
+#endif
     bool i_option = FALSE;
     bool p_option = FALSE;
 
     setlocale(LC_ALL, "");
 
-    while ((ch = getopt(argc, argv, "acip")) != -1) {
+    while ((ch = getopt(argc, argv, OPTS_COMMON "adcip")) != -1) {
        switch (ch) {
 #ifdef NCURSES_VERSION
        case 'a':
@@ -342,14 +354,23 @@ main(int argc, char *argv[])
        case 'c':
            c_option = TRUE;
            break;
+#if HAVE_USE_DEFAULT_COLORS
+       case 'd':
+           d_option = TRUE;
+           break;
+#endif
        case 'i':
            i_option = TRUE;
            break;
        case 'p':
            p_option = TRUE;
            break;
+       case OPTS_VERSION:
+           show_version(argv);
+           ExitProgram(EXIT_SUCCESS);
        default:
-           usage();
+           usage(ch == OPTS_USAGE);
+           /* NOTREACHED */
        }
     }
 
@@ -359,7 +380,10 @@ main(int argc, char *argv[])
     if (i_option) {
        initscr();
     } else {
-       (void) newterm((char *) 0, stdout, stdin);
+       if (newterm((char *) 0, stdout, stdin) == 0) {
+           fprintf(stderr, "cannot initialize terminal\n");
+           ExitProgram(EXIT_FAILURE);
+       }
     }
 #ifdef NCURSES_VERSION
     if (a_option) {
@@ -373,7 +397,7 @@ main(int argc, char *argv[])
        int background = COLOR_BLACK;
        start_color();
 #if HAVE_USE_DEFAULT_COLORS
-       if (use_default_colors() != ERR)
+       if (d_option && (use_default_colors() != ERR))
            background = -1;
 #endif
        init_pair(1, COLOR_CYAN, (short) background);