Correct handling of Mac OS 8.5 Window Manager and Control Manager. The new

[sgt/putty] / mac / macterm.c

diff --git a/mac/macterm.c b/mac/macterm.c
index 9a26abe..2cc85b9 100644 (file)
--- a/mac/macterm.c
+++ b/mac/macterm.c
@@ -1,4 +1,4 @@
-/* $Id: macterm.c,v 1.29 2002/12/31 22:49:03 ben Exp $ */
+/* $Id: macterm.c,v 1.32 2003/01/04 00:13:18 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);
@@ -232,24 +233,30 @@ static void mac_initfont(Session *s) {
 
     if (s->uni_to_font != NULL)
        DisposeUnicodeToTextInfo(&s->uni_to_font);
-    if (mac_gestalts.encvvers == 0 ||
+    if (mac_gestalts.encvvers != 0 &&
        UpgradeScriptInfoToTextEncoding(kTextScriptDontCare,
                                        kTextLanguageDontCare,
                                        kTextRegionDontCare, macfont,
-                                       &enc) != noErr ||
-       CreateUnicodeToTextInfoByEncoding(enc, &s->uni_to_font) != noErr) {
-       s->uni_to_font = NULL;
-    } else {
+                                       &enc) == noErr &&
+       CreateUnicodeToTextInfoByEncoding(enc, &s->uni_to_font) == noErr) {
        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),
+                               GetScriptManagerVariable(smRegionCode),
+                               mac_gestalts.sysvers, s->cfg.font);
     }
 
     mac_adjustsize(s, s->term->rows, s->term->cols);
@@ -329,7 +336,7 @@ static void mac_adjustwinbg(Session *s) {
 
     if (!HAVE_COLOR_QD())
        return;
-#if TARGET_RT_CFM /* XXX doesn't link (at least for 68k) */
+#if !TARGET_CPU_68K
     if (mac_gestalts.windattr & gestaltWindowMgrPresent)
        SetWindowContentColor(s->window,
                              &(*s->palette)->pmInfo[DEFAULT_BG].ciRGB);
@@ -979,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;
-    } else {
+           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;
-       /* XXX Should choose charset based on script, font etc. */
        olen = charset_from_unicode(&unitextptr, &len, mactextbuf, 1024,
-                                   CS_MAC_ROMAN, NULL, ".", 1);
-    }
+                                   s->font_charset, NULL, ".", 1);
+    } else
+       olen = 0;
 
     a.s = s;
     a.text = mactextbuf;
@@ -1174,8 +1180,7 @@ void set_sbar(void *frontend, int total, int start, int page) {
     (*s->scrollbar)->contrlMin = 0;
     (*s->scrollbar)->contrlMax = total - page;
     SetControlValue(s->scrollbar, start);
-#if TARGET_RT_CFM
-    /* XXX: This doesn't link for me. */
+#if !TARGET_CPU_68K
     if (mac_gestalts.cntlattr & gestaltControlMgrPresent)
        SetControlViewSize(s->scrollbar, page);
 #endif