Revert "Added experimental feature NEW_KEYBOARD_HIT."

This reverts commit bc65112ce0.
This commit is contained in:
Bart House
2019-07-14 21:28:55 -07:00
parent e83fcd0353
commit 5870cb6a92
14 changed files with 3 additions and 199 deletions

View File

@@ -398,12 +398,10 @@ int mode; // unused
{
DWORD cmode;
#ifndef NEW_KEYBOARD_HIT
/* Initialize the function pointer that points to
* the kbhit() equivalent, in this TTY case nttty_kbhit()
*/
nt_kbhit = nttty_kbhit;
#endif
if (!SetConsoleCtrlHandler((PHANDLER_ROUTINE) CtrlHandler, TRUE)) {
/* Unable to set control handler */
@@ -438,19 +436,11 @@ int portdebug;
return ch;
}
#ifndef NEW_KEYBOARD_HIT
int
nttty_kbhit()
{
return keyboard_handler.pNHkbhit(console.hConIn, &ir);
}
#else
boolean
tkbhit()
{
return keyboard_handler.pNHkbhit(console.hConIn, &ir) != 0;
}
#endif
int
tgetch()

View File

@@ -56,7 +56,6 @@ extern void NDECL(backsp);
int NDECL(windows_console_custom_nhgetch);
extern void NDECL(safe_routines);
#ifndef NEW_KEYBOARD_HIT
/* The function pointer nt_kbhit contains a kbhit() equivalent
* which varies depending on which window port is active.
* For the tty port it is tty_kbhit() [from nttty.c]
@@ -66,7 +65,6 @@ extern void NDECL(safe_routines);
int def_kbhit(void);
int (*nt_kbhit)() = def_kbhit;
#endif
char
switchar()
@@ -160,13 +158,11 @@ max_filename()
return 0;
}
#ifndef NEW_KEYBOARD_HIT
int
def_kbhit()
{
return 0;
}
#endif
/*
* Strip out troublesome file system characters.
@@ -514,9 +510,7 @@ int code;
exit(code);
}
#ifndef NEW_KEYBOARD_HIT
#undef kbhit
#endif
#include <conio.h>
int
@@ -725,6 +719,7 @@ sys_random_seed(VOID_ARGS)
}
return ourseed;
}
#endif /* WIN32 */
/*winnt.c*/