* [PATCH v2] Cygwin: console: Fix garbled input for non-ASCII chars.
@ 2021-06-24 3:40 Takashi Yano
2021-07-06 14:06 ` Corinna Vinschen
0 siblings, 1 reply; 2+ messages in thread
From: Takashi Yano @ 2021-06-24 3:40 UTC (permalink / raw)
To: cygwin-patches
- 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
---
winsup/cygwin/fhandler_console.cc | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/winsup/cygwin/fhandler_console.cc b/winsup/cygwin/fhandler_console.cc
index b3eae6a5a..e00f2cdbc 100644
--- a/winsup/cygwin/fhandler_console.cc
+++ b/winsup/cygwin/fhandler_console.cc
@@ -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);
--
2.32.0
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v2] Cygwin: console: Fix garbled input for non-ASCII chars.
2021-06-24 3:40 [PATCH v2] Cygwin: console: Fix garbled input for non-ASCII chars Takashi Yano
@ 2021-07-06 14:06 ` Corinna Vinschen
0 siblings, 0 replies; 2+ messages in thread
From: Corinna Vinschen @ 2021-07-06 14:06 UTC (permalink / raw)
To: cygwin-patches
On Jun 24 12:40, Takashi Yano wrote:
> - 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
> ---
> winsup/cygwin/fhandler_console.cc | 15 +++++++++------
> 1 file changed, 9 insertions(+), 6 deletions(-)
Pushed. Apologies for applying the v1 first, accidentally!
Thanks,
Corinna
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-07-06 14:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-24 3:40 [PATCH v2] Cygwin: console: Fix garbled input for non-ASCII chars Takashi Yano
2021-07-06 14:06 ` Corinna Vinschen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).