diff options
Diffstat (limited to 'test/demo_defkey.c')
| -rw-r--r-- | test/demo_defkey.c | 50 |
1 files changed, 40 insertions, 10 deletions
diff --git a/test/demo_defkey.c b/test/demo_defkey.c index afe102931a68..441667263f69 100644 --- a/test/demo_defkey.c +++ b/test/demo_defkey.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2018-2023,2024 Thomas E. Dickey * * Copyright 2002-2016,2017 Free Software Foundation, Inc. * * * * Permission is hereby granted, free of charge, to any person obtaining a * @@ -27,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_defkey.c,v 1.31 2020/12/26 17:55:13 tom Exp $ + * $Id: demo_defkey.c,v 1.35 2024/01/20 20:46:12 tom Exp $ * * Demonstrate the define_key() function. * Thomas Dickey - 2002/11/23 @@ -100,7 +100,7 @@ visible(const char *string) { char *result = 0; - if (string != 0 && *string != '\0') { + if (VALID_STRING(string) && *string != '\0') { int pass; int n; size_t need = 1; @@ -148,11 +148,7 @@ really_define_key(WINDOW *win, const char *new_string, int code) } log_last_line(win); - if (vis_string != 0) { - free(vis_string); - vis_string = 0; - } - + free(vis_string); vis_string = visible(new_string); if ((rc = key_defined(new_string)) > 0) { wprintw(win, "%s was bound to %s\n", vis_string, keyname(rc)); @@ -185,7 +181,7 @@ duplicate(WINDOW *win, NCURSES_CONST char *name, int code) { char *value = tigetstr(name); - if (value != 0) { + if (VALID_STRING(value)) { const char *prefix = 0; if (!(strncmp) (value, "\033[", (size_t) 2)) { @@ -214,16 +210,50 @@ remove_definition(WINDOW *win, int code) really_define_key(win, 0, code); } +static void +usage(int ok) +{ + static const char *msg[] = + { + "Usage: demo_defkey [options]" + ,"" + ,USAGE_COMMON + }; + size_t n; + + for (n = 0; n < SIZEOF(msg); n++) + fprintf(stderr, "%s\n", msg[n]); + + ExitProgram(ok ? EXIT_SUCCESS : EXIT_FAILURE); +} +/* *INDENT-OFF* */ +VERSION_COMMON() +/* *INDENT-ON* */ + int -main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) +main(int argc, char *argv[]) { char *fkeys[12]; int n; int ch; WINDOW *win; + while ((ch = getopt(argc, argv, OPTS_COMMON)) != -1) { + switch (ch) { + case OPTS_VERSION: + show_version(argv); + ExitProgram(EXIT_SUCCESS); + default: + usage(ch == OPTS_USAGE); + /* NOTREACHED */ + } + } + if (optind < argc) + usage(FALSE); + unlink(MY_LOGFILE); + setlocale(LC_ALL, ""); initscr(); (void) cbreak(); /* take input chars one at a time, no wait for \n */ (void) noecho(); /* don't echo input */ |