X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ffilter.c;h=e9c0ee99b73271490cc74318ee37a4a1ec3501bb;hp=90a74a6cec9bc2790ed2cfed70630d1b8c12e587;hb=efa78d11c3ea7f51c7078b64a34c98b44ecb0e1a;hpb=e2e9c09c48b19b24979cafb2d4864f538b5ddd1c

diff --git a/test/filter.c b/test/filter.c
index 90a74a6c..e9c0ee99 100644
--- a/test/filter.c
+++ b/test/filter.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2017,2019 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 +29,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.33 2019/08/24 23:11:01 tom Exp $
  *
  * An example of the 'filter()' function in ncurses, this program prompts
  * for commands and executes them (like a command shell).  It illustrates
@@ -100,12 +100,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 +112,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 +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;
@@ -359,7 +370,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 +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);