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

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

diff --git a/mac/mac.c b/mac/mac.c
index 456f4f3..c6a93dc 100644 (file)
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -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
  * All rights reserved.
@@ -157,6 +157,7 @@ static void mac_startup(void) {
        mac_gestalts.encvvers = 0;
     else {
        mac_gestalts.encvvers = (*ti)->tecVersion;
+       mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
        DisposeHandle((Handle)ti);
     }
 

diff --git a/mac/mac.h b/mac/mac.h
index e974d90..85d4bac 100644 (file)
--- a/mac/mac.h
+++ b/mac/mac.h
@@ -21,7 +21,8 @@ struct mac_gestalts {
     long apprvers;
     long cntlattr;
     long windattr;
-    long encvvers;
+    long encvvers; /* TEC version (from TECGetInfo()) */
+    long uncvattr; /* Unicode Converter attributes (frem TECGetInfo()) */
 };
 
 extern struct mac_gestalts mac_gestalts;

diff --git a/mac/macterm.c b/mac/macterm.c
index 2e1a406..3de1d58 100644 (file)
--- a/mac/macterm.c
+++ b/mac/macterm.c
@@ -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, 2002 Ben Harris
@@ -212,6 +212,7 @@ static void mac_initfont(Session *s) {
     Str255 macfont;
     FontInfo fi;
     TextEncoding enc;
+    OptionBits fbflags;
 
     SetPort(s->window);
     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)
            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,
-           uni_to_font_fallback_upp, 
-           kUnicodeFallbackCustomOnly | kUnicodeFallbackInterruptSafeMask,
-           NULL) != noErr) {
+           uni_to_font_fallback_upp, fbflags, NULL) != noErr) {
            DisposeUnicodeToTextInfo(&s->uni_to_font);
-           s->uni_to_font = NULL;
+           goto no_encv;
        }
     } else {
+      no_encv:
        s->uni_to_font = NULL;
        s->font_charset =
            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,
                                       1024, &iread, &olen, mactextbuf);
        if (err != noErr && err != kTECUsedFallbacksStatus)
-           /* XXX Should handle this more sensibly */
-           return;
+           olen = 0;
     } 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
-       return;
+       olen = 0;
 
     a.s = s;
     a.text = mactextbuf;