/****************************************************************************
- * Copyright (c) 1998-2014,2016 Free Software Foundation, Inc. *
+ * Copyright 2019,2020 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 *
/*
* Author: Thomas E. Dickey 1998
*
- * $Id: filter.c,v 1.26 2016/08/20 20:38:56 tom Exp $
+ * $Id: filter.c,v 1.35 2020/07/25 22:40:57 tom Exp $
*
* An example of the 'filter()' function in ncurses, this program prompts
* for commands and executes them (like a command shell). It illustrates
* 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
int skip, y, x;
int margin;
- sprintf(buffer, "%02d:%02d:%02d",
- my->tm_hour,
- my->tm_min,
- my->tm_sec);
+ _nc_SPRINTF(buffer, _nc_SLIMIT(sizeof(buffer)) "%02d:%02d:%02d",
+ my->tm_hour,
+ my->tm_min,
+ my->tm_sec);
if (limit > 9) {
skip = 0;
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;
timeout(20); /* no one types 50CPS... */
while (!done) {
+ int limit;
int ch = getch();
buffer[used] = '\0';
*/
#ifdef KEY_EVENT
if (code == KEY_EVENT)
- strcpy(buffer, "# event!");
+ _nc_STRCPY(buffer, "# event!", length);
#endif
#ifdef KEY_RESIZE
if (code == KEY_RESIZE) {
- strcpy(buffer, "# resize!");
+ _nc_STRCPY(buffer, "# resize!", length);
getch();
}
#endif
}
attroff(underline);
attroff(A_BOLD);
- printw("\n");
+ refresh();
return code;
}
," -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"
};
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':
case 'c':
c_option = TRUE;
break;
+#if HAVE_USE_DEFAULT_COLORS
+ case 'd':
+ d_option = TRUE;
+ break;
+#endif
case 'i':
i_option = TRUE;
break;
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) {
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);