mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-06-21 03:00:19 +02:00
Code Activity

Windows 11: for fport input from the console, ignore terminal returns

Browse source 
There is an apparent bug in Windows 11 (not Windows 10) where,
when reading from an fd backed by the Console, a single
return character will always be available.

* libguile/posix-w32.c (console_has_return_keyevent_w32): new procedure
* libguile/posix-w32.h: declare console_has_return_keyevent_w32
* libguile/fports.c [__MINGW32__](fport_input_waiting): ignore return keyevent
This commit is contained in:
Michael Gran 2023-06-20 16:04:59 -07:00
parent adbf2156ab
commit af96820e07
3 changed files with 63 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

48
libguile/posix-w32.c
View file

@ -289,6 +289,54 @@ dlerror_w32 ()
snprintf (dlerror_str, DLERROR_LEN, "error %ld: %s", (long) dw, msg_buf);
return dlerror_str;
}
/* Check for the Windows 11 bug where there's a return character in the
* console input queue despite draining the input. */
int
console_has_return_keyevent_w32 (int fdes)
{
HANDLE h;
DWORD mode;
h = (HANDLE) _get_osfhandle (fdes);
if (h == -1)
return 0;
if (GetConsoleMode (h, &mode) == 0)
return 0;
// Rarely need more than 1 INPUT_RECORD for this test, but just in
// case there is a mouse event in the queue.
#define NBUFFER 8
INPUT_RECORD irbuffer[NBUFFER];
BOOL bRet;
DWORD avail;
int i;
int n_chars = 0;
int n_returns = 0;
while (1)
{
bRet = PeekConsoleInput (h, irbuffer, NBUFFER, &avail);
if (!bRet || avail == 0)
break;
for (i = 0; i < avail; i++)
if (irbuffer[i].EventType == KEY_EVENT)
{
n_chars ++;
if (irbuffer[i].Event.KeyEvent.uChar.AsciiChar == 13)
n_returns ++;
}
if (avail < NBUFFER)
break;
}
if (n_chars == 1 && n_returns == 1)
return 1;
return 0;
#undef NBUFFER
}
int
getpagesize_w32 (void)
{