summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
facd762)
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.
git-svn-id: svn://svn.tartarus.org/sgt/putty@2414
cda61777-01e9-0310-a592-
d414129be87e
-/* $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
* All rights reserved.
/*
* Copyright (c) 1999 Ben Harris
* All rights reserved.
mac_gestalts.encvvers = 0;
else {
mac_gestalts.encvvers = (*ti)->tecVersion;
mac_gestalts.encvvers = 0;
else {
mac_gestalts.encvvers = (*ti)->tecVersion;
+ mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
DisposeHandle((Handle)ti);
}
DisposeHandle((Handle)ti);
}
long apprvers;
long cntlattr;
long windattr;
long apprvers;
long cntlattr;
long windattr;
+ 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;
-/* $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, 2002 Ben Harris
/*
* Copyright (c) 1999 Simon Tatham
* Copyright (c) 1999, 2002 Ben Harris
Str255 macfont;
FontInfo fi;
TextEncoding enc;
Str255 macfont;
FontInfo fi;
TextEncoding enc;
SetPort(s->window);
macfont[0] = sprintf((char *)&macfont[1], "%s", s->cfg.font);
SetPort(s->window);
macfont[0] = sprintf((char *)&macfont[1], "%s", s->cfg.font);
if (uni_to_font_fallback_upp == NULL)
uni_to_font_fallback_upp =
NewUnicodeToTextFallbackProc(&uni_to_font_fallback);
if (uni_to_font_fallback_upp == NULL)
uni_to_font_fallback_upp =
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,
- kUnicodeFallbackCustomOnly | kUnicodeFallbackInterruptSafeMask,
- NULL) != noErr) {
+ uni_to_font_fallback_upp, fbflags, NULL) != noErr) {
DisposeUnicodeToTextInfo(&s->uni_to_font);
DisposeUnicodeToTextInfo(&s->uni_to_font);
s->uni_to_font = NULL;
s->font_charset =
charset_from_macenc(FontToScript(s->fontnum),
s->uni_to_font = NULL;
s->font_charset =
charset_from_macenc(FontToScript(s->fontnum),
0, NULL, NULL, NULL,
1024, &iread, &olen, mactextbuf);
if (err != noErr && err != kTECUsedFallbacksStatus)
0, NULL, NULL, NULL,
1024, &iread, &olen, mactextbuf);
if (err != noErr && err != kTECUsedFallbacksStatus)
- /* XXX Should handle this more sensibly */
- return;
} else if (s->font_charset != CS_NONE) {
/* XXX this is bogus if wchar_t and UniChar are different sizes. */
unitextptr = (wchar_t *)unitextbuf;
olen = charset_from_unicode(&unitextptr, &len, mactextbuf, 1024,
s->font_charset, NULL, ".", 1);
} else
} else if (s->font_charset != CS_NONE) {
/* XXX this is bogus if wchar_t and UniChar are different sizes. */
unitextptr = (wchar_t *)unitextbuf;
olen = charset_from_unicode(&unitextptr, &len, mactextbuf, 1024,
s->font_charset, NULL, ".", 1);
} else
a.s = s;
a.text = mactextbuf;
a.s = s;
a.text = mactextbuf;