ncurses 6.0 - patch 20170909

[ncurses.git] / test / filter.c

diff --git a/test/filter.c b/test/filter.c
index 926ec6b8dcae143c6e864dfbaa7ba4a4a182a26e..890adda3fbe23caf416a7225e6015e58e3ba3851 100644 (file)
--- a/test/filter.c
+++ b/test/filter.c
@@ -29,7 +29,7 @@
 /*
  * Author:  Thomas E. Dickey 1998
  *
 /*
  * Author:  Thomas E. Dickey 1998
  *

- * $Id: filter.c,v 1.29 2017/06/17 18:16:39 tom Exp $
+ * $Id: filter.c,v 1.30 2017/09/08 22:34:05 tom Exp $

  *
  * An example of the 'filter()' function in ncurses, this program prompts
  * for commands and executes them (like a command shell).  It illustrates
  *
  * An example of the 'filter()' function in ncurses, this program prompts
  * for commands and executes them (like a command shell).  It illustrates


@@ -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\""
        ,"  -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"
     };
        ,"  -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;
     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, "");
 
     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':
        switch (ch) {
 #ifdef NCURSES_VERSION
        case 'a':


@@ -342,6 +348,11 @@ main(int argc, char *argv[])
        case 'c':
            c_option = TRUE;
            break;
        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 '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
        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);
            background = -1;
 #endif
        init_pair(1, COLOR_CYAN, (short) background);