X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Ffilter.c;h=e070620b27201996ab4cb77d1bd90b33c1de2091;hp=926ec6b8dcae143c6e864dfbaa7ba4a4a182a26e;hb=7d6371e47006c8aef4ac94f52998a35b03bf89cf;hpb=af3d0ee323cbb22d2a7596d564bf68f7307f5076 diff --git a/test/filter.c b/test/filter.c index 926ec6b8..e070620b 100644 --- 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.32 2017/09/28 23:40:39 tom Exp $ * * An example of the 'filter()' function in ncurses, this program prompts * for commands and executes them (like a command shell). It illustrates @@ -105,7 +105,7 @@ new_command(char *buffer, int length, int underline, bool clocked, bool polled) if (polled) { bool done = FALSE; bool first = TRUE; - int y, x; + int y = 0, x = 0; int n; int mark = 0; int 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; @@ -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);