nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-16 03:53:01 -05:00
Code Issues Projects Releases Wiki Activity

If for some reason do_text() fails to translate from Unicode to the font

Browse Source 
encoding, have it go through the rest of its motions with an empty string
anyway, so as to at least give a sensible empty box of the right colour.

If SetFallbackUnicodeToText() fails, switch over to using the charset
library, hence avoiding problems in do_text().

If the version of the Unicode Converter we're using doesn't understand about
interrupt-safe fallback functions, don't try to tell it we've got one.  This
prevents SetFallbackUnicodeToText() from failing on systems with old Unicode
Converters.

[originally from svn r2414]
This commit is contained in:
Ben Harris 2003-01-02 00:33:40 +00:00
parent cab553028a
commit 0416b77c7f
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mac/mac.c
View File

@ -1,4 +1,4 @@
/* $Id: mac.c,v 1.13 2003/01/01 11:45:43 ben Exp $ */ /* $Id: mac.c,v 1.14 2003/01/02 00:33:40 ben Exp $ */
/* /*
* Copyright (c) 1999 Ben Harris * Copyright (c) 1999 Ben Harris
* All rights reserved. * All rights reserved.
@ -157,6 +157,7 @@ static void mac_startup(void) {
mac_gestalts.encvvers = 0; mac_gestalts.encvvers = 0;
else { else {
mac_gestalts.encvvers = (*ti)->tecVersion; mac_gestalts.encvvers = (*ti)->tecVersion;
mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
DisposeHandle((Handle)ti); DisposeHandle((Handle)ti);
} }

3
mac/mac.h
View File

@ -21,7 +21,8 @@ struct mac_gestalts {
long apprvers; long apprvers;
long cntlattr; long cntlattr;
long windattr; long windattr;
long encvvers; long encvvers; /* TEC version (from TECGetInfo()) */
long uncvattr; /* Unicode Converter attributes (frem TECGetInfo()) */
}; };
extern struct mac_gestalts mac_gestalts; extern struct mac_gestalts mac_gestalts;

18
mac/macterm.c
View File

@ -1,4 +1,4 @@
/* $Id: macterm.c,v 1.30 2003/01/01 19:51:13 ben Exp $ */ /* $Id: macterm.c,v 1.31 2003/01/02 00:33:40 ben Exp $ */
/* /*
* Copyright (c) 1999 Simon Tatham * Copyright (c) 1999 Simon Tatham
* Copyright (c) 1999, 2002 Ben Harris * Copyright (c) 1999, 2002 Ben Harris
@ -212,6 +212,7 @@ static void mac_initfont(Session *s) {
Str255 macfont; Str255 macfont;
FontInfo fi; FontInfo fi;
TextEncoding enc; TextEncoding enc;
OptionBits fbflags;
SetPort(s->window); SetPort(s->window);
macfont[0] = sprintf((char *)&macfont[1], "%s", s->cfg.font); macfont[0] = sprintf((char *)&macfont[1], "%s", s->cfg.font);
@ -241,14 +242,16 @@ static void mac_initfont(Session *s) {
if (uni_to_font_fallback_upp == NULL) if (uni_to_font_fallback_upp == NULL)
uni_to_font_fallback_upp = uni_to_font_fallback_upp =
NewUnicodeToTextFallbackProc(&uni_to_font_fallback); NewUnicodeToTextFallbackProc(&uni_to_font_fallback);
fbflags = kUnicodeFallbackCustomOnly;
if (mac_gestalts.uncvattr & kTECAddFallbackInterruptMask)
fbflags |= kUnicodeFallbackInterruptSafeMask;
if (SetFallbackUnicodeToText(s->uni_to_font, if (SetFallbackUnicodeToText(s->uni_to_font,
uni_to_font_fallback_upp, uni_to_font_fallback_upp, fbflags, NULL) != noErr) {
kUnicodeFallbackCustomOnly | kUnicodeFallbackInterruptSafeMask,
NULL) != noErr) {
DisposeUnicodeToTextInfo(&s->uni_to_font); DisposeUnicodeToTextInfo(&s->uni_to_font);
s->uni_to_font = NULL; goto no_encv;
} }
} else { } else {
no_encv:
s->uni_to_font = NULL; s->uni_to_font = NULL;
s->font_charset = s->font_charset =
charset_from_macenc(FontToScript(s->fontnum), charset_from_macenc(FontToScript(s->fontnum),
@ -983,15 +986,14 @@ void do_text(Context ctx, int x, int y, char *text, int len,
0, NULL, NULL, NULL, 0, NULL, NULL, NULL,
1024, &iread, &olen, mactextbuf); 1024, &iread, &olen, mactextbuf);
if (err != noErr && err != kTECUsedFallbacksStatus) if (err != noErr && err != kTECUsedFallbacksStatus)
/* XXX Should handle this more sensibly */ olen = 0;
return;
} else if (s->font_charset != CS_NONE) { } else if (s->font_charset != CS_NONE) {
/* XXX this is bogus if wchar_t and UniChar are different sizes. */ /* XXX this is bogus if wchar_t and UniChar are different sizes. */
unitextptr = (wchar_t *)unitextbuf; unitextptr = (wchar_t *)unitextbuf;
olen = charset_from_unicode(&unitextptr, &len, mactextbuf, 1024, olen = charset_from_unicode(&unitextptr, &len, mactextbuf, 1024,
s->font_charset, NULL, ".", 1); s->font_charset, NULL, ".", 1);
} else } else
return; olen = 0;
a.s = s; a.s = s;
a.text = mactextbuf; a.text = mactextbuf;