libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-03-03 13:35:46 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: console: Fix garbled input for non-ASCII chars.

Browse Source 
- After the commit ff4440fc, non-ASCII input may sometimes be garbled.
  This patch fixes the issue.

  Addresses: https://cygwin.com/pipermail/cygwin/2021-June/248775.html
This commit is contained in:
Takashi Yano 2021-06-24 12:40:58 +09:00 committed by Corinna Vinschen
parent bc184284cb
commit 98e3aeb1f5
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
winsup/cygwin/fhandler_console.cc
View File

@ -205,7 +205,7 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
DWORD output_stopped_at = 0;
while (con.owner == myself->pid)
{
DWORD total_read, n, i, j;
DWORD total_read, n, i;
INPUT_RECORD input_rec[INREC_SIZE];
WaitForSingleObject (p->input_mutex, INFINITE);
@ -213,7 +213,7 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
switch (cygwait (p->input_handle, (DWORD) 0))
{
case WAIT_OBJECT_0:
ReadConsoleInputA (p->input_handle,
ReadConsoleInputW (p->input_handle,
input_rec, INREC_SIZE, &total_read);
break;
case WAIT_TIMEOUT:
@ -241,7 +241,10 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
}
for (i = 0; i < total_read; i++)
{
const char c = input_rec[i].Event.KeyEvent.uChar.AsciiChar;
const wchar_t wc = input_rec[i].Event.KeyEvent.uChar.UnicodeChar;
if ((wint_t) wc >= 0x80)
continue;
char c = (char) wc;
bool processed = false;
termios &ti = ttyp->ti;
switch (input_rec[i].EventType)
@ -318,15 +321,15 @@ fhandler_console::cons_master_thread (handle_set_t *p, tty *ttyp)
}
if (processed)
{ /* Remove corresponding record. */
for (j = i; j < total_read - 1; j++)
input_rec[j] = input_rec[j + 1];
memmove (input_rec + i, input_rec + i + 1,
sizeof (INPUT_RECORD) * (total_read - i - 1));
total_read--;
i--;
}
}
if (total_read)
/* Write back input records other than interrupt. */
WriteConsoleInput (p->input_handle, input_rec, total_read, &n);
WriteConsoleInputW (p->input_handle, input_rec, total_read, &n);
skip_writeback:
ReleaseMutex (p->input_mutex);
cygwait (40);