suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix stdio window for non-ASCII output

Browse Source 
svn: r1449
This commit is contained in:
Matthew Flatt 2005-11-30 20:17:34 +00:00
parent 651c57fbc1
commit a100409714
1 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/mred/mred.cxx
View File

@ -2196,6 +2196,8 @@ static int stdio_kills_prog = 0;
static Bool RecordInput(void *media, wxEvent *event, void *data); static Bool RecordInput(void *media, wxEvent *event, void *data);
static Bool SendBreak(void *media, wxEvent *event, void *data); static Bool SendBreak(void *media, wxEvent *event, void *data);
static void break_console_reading_threads(); static void break_console_reading_threads();
static char utf8_leftover[8];
static int utf8_leftover_count;
class IOMediaEdit : public wxMediaEdit class IOMediaEdit : public wxMediaEdit
{ {
@ -2479,7 +2481,8 @@ static void MrEdSchemeMessages(char *msg, ...)
vfprintf(stderr, msg, args); vfprintf(stderr, msg, args);
} else if (!msg) { } else if (!msg) {
char *s; char *s;
long d, l; wxchar *us;
long d, l, ulen, ipos;
s = HIDE_FROM_XFORM(va_arg(args, char*)); s = HIDE_FROM_XFORM(va_arg(args, char*));
d = HIDE_FROM_XFORM(va_arg(args, long)); d = HIDE_FROM_XFORM(va_arg(args, long));
@ -2489,11 +2492,31 @@ static void MrEdSchemeMessages(char *msg, ...)
ioFrame->media->BeginEditSequence(); ioFrame->media->BeginEditSequence();
ioFrame->beginEditSeq = 1; ioFrame->beginEditSeq = 1;
} }
s = COPYSTRING_TO_ALIGNED(s, d);
ioFrame->media->Insert(l, s, ioFrame->endpos); if (utf8_leftover_count) {
ioFrame->endpos += l; char *naya;
naya = new WXGC_ATOMIC char[l + utf8_leftover_count];
memcpy(naya, utf8_leftover, utf8_leftover_count);
memcpy(naya + utf8_leftover_count, s + d, l);
s = naya;
d = 0;
l += utf8_leftover_count;
}
if (l != 1 || s[0] == '\n') { ulen = scheme_utf8_decode_as_prefix((unsigned char *)s, d, l,
NULL, 0, -1,
&ipos, 0, '?');
utf8_leftover_count = (l - ipos);
memcpy(utf8_leftover, s + d + ipos, utf8_leftover_count);
us = (wxchar *)scheme_malloc_atomic(sizeof(wxchar) * ulen);
scheme_utf8_decode_as_prefix((unsigned char *)s, d, l,
us, 0, -1,
&ipos, 0, '?');
ioFrame->media->Insert(ulen, us, ioFrame->endpos);
ioFrame->endpos += ulen;
if (ulen != 1 || s[0] == '\n') {
ioFrame->media->EndEditSequence(); ioFrame->media->EndEditSequence();
ioFrame->beginEditSeq = 0; ioFrame->beginEditSeq = 0;
} }