JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* dcrt0.cc (dll_crt0_1): Eliminate SetFileApisToOEM and CharToOem.

Browse Source 
* (dummy_autoload): Add functions used in fhandler_console.
* fhandler_console.cc (fhandler_console::read): Use ENCHANCED_KEY flag to
distinguish extended keys.  Translate an input character from the OEM code page
to the ANSI code page.
* (fhandler_console::write_normal): Translate output characters from the ANSI
code page to the OEM code page.
* syscalls.cc (_link): Use MultiByteToWideChar instead of OemToCharW.
This commit is contained in:
Christopher Faylor
2000-07-04 02:26:20 +00:00
parent 3b09c754da
commit 610739191f
4 changed files with 30 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
winsup/cygwin/fhandler_console.cc
View File

@@ -179,7 +179,9 @@ fhandler_console::read (void *pv, size_t buflen)
!input_rec.Event.KeyEvent.bKeyDown)
continue;
if (ich == 0 || (ich & 0xff) == 0xe0) /* arrow/function keys */
if (ich == 0 ||
/* arrow/function keys */
(input_rec.Event.KeyEvent.dwControlKeyState & ENHANCED_KEY))
{
toadd = get_nonascii_key (input_rec);
if (!toadd)
@@ -187,7 +189,10 @@ fhandler_console::read (void *pv, size_t buflen)
nread = strlen (toadd);
}
else if (!(input_rec.Event.KeyEvent.dwControlKeyState & LEFT_ALT_PRESSED))
toadd = &ich;
{
OemToCharBuff (&ich, &ich, 1);
toadd = &ich;
}
else
{
static char tmp[2];
@@ -1024,13 +1029,20 @@ fhandler_console::write_normal (const unsigned char *src,
/* Print all the base ones out */
if (found != src)
{
if (! WriteFile (get_output_handle (), src, found - src, &done, 0))
char buf[256];
int len = found - src;
do {
int l2 = min (256, len);
CharToOemBuff ((LPCSTR)src, buf, l2);
if (! WriteFile (get_output_handle (), buf, l2, &done, 0))
{
debug_printf ("write failed, handle %p", get_output_handle ());
__seterrno ();
return 0;
}
src += done;
len -= done;
src += done;
} while (len > 0);
}
if (src < end)
{