X-Git-Url: https://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=test%2Fdemo_altkeys.c;h=fb3cd65c6f048ab6cfb3a9138138162145f91b02;hp=0f4e898a7a6c38baca71e14a77d6dfcaaa8d0761;hb=3e91848cbe3dad23fdb60962fa9b678592591c34;hpb=bfe3845eb1a2ff02a740e917b537e939ec4e44cb diff --git a/test/demo_altkeys.c b/test/demo_altkeys.c index 0f4e898a..fb3cd65c 100644 --- a/test/demo_altkeys.c +++ b/test/demo_altkeys.c @@ -1,5 +1,6 @@ /**************************************************************************** - * Copyright (c) 2005-2017,2018 Free Software Foundation, Inc. * + * Copyright 2018-2019,2020 Thomas E. Dickey * + * Copyright 2005-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 * @@ -26,7 +27,7 @@ * authorization. * ****************************************************************************/ /* - * $Id: demo_altkeys.c,v 1.12 2018/12/29 17:52:53 tom Exp $ + * $Id: demo_altkeys.c,v 1.14 2020/02/02 23:34:34 tom Exp $ * * Demonstrate the define_key() function. * Thomas Dickey - 2005/10/22 @@ -47,11 +48,12 @@ static void log_last_line(WINDOW *win) { FILE *fp; - int y, x, n; - char temp[256]; if ((fp = fopen(MY_LOGFILE, "a")) != 0) { + char temp[256]; + int y, x, n; int need = sizeof(temp) - 1; + if (need > COLS) need = COLS; getyx(win, y, x); @@ -75,8 +77,7 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) int n; int ch; #if HAVE_GETTIMEOFDAY - int secs, msecs; - struct timeval current, previous; + struct timeval previous; #endif unlink(MY_LOGFILE); @@ -119,8 +120,10 @@ main(int argc GCC_UNUSED, char *argv[]GCC_UNUSED) while ((ch = getch()) != ERR) { bool escaped = (ch >= MY_KEYS); const char *name = keyname(escaped ? (ch - MY_KEYS) : ch); - #if HAVE_GETTIMEOFDAY + int secs, msecs; + struct timeval current; + gettimeofday(¤t, 0); secs = (int) (current.tv_sec - previous.tv_sec); msecs = (int) ((current.tv_usec - previous.tv_usec) / 1000);