ncurses 6.0 - patch 20170916

[ncurses.git] / test / filter.c

diff --git a/test/filter.c b/test/filter.c
index 926ec6b8dcae143c6e864dfbaa7ba4a4a182a26e..2bd9b20f881d4a1651b48d3035c259c70bc8c7da 100644 (file)
--- a/test/filter.c
+++ b/test/filter.c
@@ -29,7 +29,7 @@
 /*
  * Author:  Thomas E. Dickey 1998
  *
- * $Id: filter.c,v 1.29 2017/06/17 18:16:39 tom Exp $
+ * $Id: filter.c,v 1.31 2017/09/10 19:49:55 tom Exp $
  *
  * An example of the 'filter()' function in ncurses, this program prompts
  * for commands and executes them (like a command shell).  It illustrates
@@ -253,7 +253,7 @@ new_command(char *buffer, int length, int underline, bool clocked, bool polled)
     }
     attroff(underline);
     attroff(A_BOLD);
-    printw("\n");
+    refresh();
 
     return code;
 }
@@ -308,6 +308,9 @@ usage(void)
        ,"  -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
        ,"  -i   use initscr() rather than newterm()"
        ,"  -p   poll for individual characters rather than using getnstr"
     };
@@ -327,12 +330,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, "adcip")) != -1) {
        switch (ch) {
 #ifdef NCURSES_VERSION
        case 'a':
@@ -342,6 +348,11 @@ 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;
@@ -376,7 +387,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);