/****************************************************************************
- * Copyright (c) 2006 Free Software Foundation, Inc. *
+ * Copyright (c) 2006-2017,2018 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, 2006
*
- * $Id: foldkeys.c,v 1.3 2006/12/09 16:54:07 tom Exp $
+ * $Id: foldkeys.c,v 1.7 2018/12/29 17:53:03 tom Exp $
*
* Demonstrate a method for altering key definitions at runtime.
*
* merging only for the keys which are defined in the terminal description.
*/
+#define NEED_TIME_H
#include <test.priv.h>
#if defined(NCURSES_VERSION) && NCURSES_EXT_FUNCS
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
#define MY_LOGFILE "demo_foldkeys.log"
#define MY_KEYS (KEY_MAX + 1)
int first, second;
char final[2];
char *value;
+ size_t need = 0;
if (info[j].state == 0
&& sscanf(info[j].value,
"\033[%d;%d%c",
&second,
final) == 3
&& *final != ';'
+ && (need = strlen(info[j].value)) != 0
&& (value = strdup(info[j].value)) != 0) {
- sprintf(value, "\033[%d%c", first, *final);
+ _nc_SPRINTF(value, _nc_SLIMIT(need) "\033[%d%c", first, *final);
for (k = 0; k < info_len; ++k) {
if (info[k].state == 0
&& !strcmp(info[k].value, value)) {
}
}
if (info[j].state == 0) {
- sprintf(value, "\033O%c", *final);
+ _nc_SPRINTF(value, _nc_SLIMIT(need) "\033O%c", *final);
for (k = 0; k < info_len; ++k) {
if (info[k].state == 0
&& !strcmp(info[k].value, value)) {
struct timeval current, previous;
#endif
+ if (newterm(0, stdout, stdin) == 0) {
+ fprintf(stderr, "Cannot initialize terminal\n");
+ ExitProgram(EXIT_FAILURE);
+ }
+
unlink(MY_LOGFILE);
- newterm(0, stdout, stdin);
(void) cbreak(); /* take input chars one at a time, no wait for \n */
(void) noecho(); /* don't echo input */
#if HAVE_GETTIMEOFDAY
gettimeofday(¤t, 0);
- secs = current.tv_sec - previous.tv_sec;
- msecs = (current.tv_usec - previous.tv_usec) / 1000;
+ secs = (int) (current.tv_sec - previous.tv_sec);
+ msecs = (int) ((current.tv_usec - previous.tv_usec) / 1000);
if (msecs < 0) {
msecs += 1000;
--secs;