X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/8768ce315f36b41e4645dfa099bb9c5a60b0d964..1fc898ead222c1ef1502f13bdeff40cdfbc61d3d:/mac/macterm.c diff --git a/mac/macterm.c b/mac/macterm.c index 185c7eb8..2cc85b95 100644 --- a/mac/macterm.c +++ b/mac/macterm.c @@ -1,4 +1,4 @@ -/* $Id: macterm.c,v 1.23 2002/12/13 00:02:48 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 @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -59,7 +60,9 @@ #include "macresid.h" #include "putty.h" +#include "charset.h" #include "mac.h" +#include "storage.h" #include "terminal.h" #define NCOLOURS (lenof(((Config *)0)->colours)) @@ -119,7 +122,7 @@ static void inbuf_putstr(Session *s, const char *c) { static void display_resource(Session *s, unsigned long type, short id) { Handle h; - int len, i; + int len; char *t; h = GetResource(type, id); @@ -135,19 +138,36 @@ static void display_resource(Session *s, unsigned long type, short id) { DisposeHandle(h); } - -void mac_newsession(void) { +void mac_opensession(void) { Session *s; - UInt32 starttime; - char msg[128]; - OSErr err; + StandardFileReply sfr; + static const OSType sftypes[] = { 'Sess', 0, 0, 0 }; + void *sesshandle; - /* This should obviously be initialised by other means */ s = smalloc(sizeof(*s)); memset(s, 0, sizeof(*s)); - do_defaults(NULL, &s->cfg); + + StandardGetFile(NULL, 1, sftypes, &sfr); + if (!sfr.sfGood) goto fail; + + sesshandle = open_settings_r_fsp(&sfr.sfFile); + if (sesshandle == NULL) goto fail; + load_open_settings(sesshandle, TRUE, &s->cfg); + close_settings_r(sesshandle); s->back = &loop_backend; - + mac_startsession(s); + return; + + fail: + sfree(s); + return; +} + +void mac_startsession(Session *s) +{ + UInt32 starttime; + char msg[128]; + /* XXX: Own storage management? */ if (HAVE_COLOR_QD()) s->window = GetNewCWindow(wTerminal, NULL, (WindowPtr)-1); @@ -192,7 +212,7 @@ static void mac_initfont(Session *s) { Str255 macfont; FontInfo fi; TextEncoding enc; - OSStatus err; + OptionBits fbflags; SetPort(s->window); macfont[0] = sprintf((char *)&macfont[1], "%s", s->cfg.font); @@ -213,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); @@ -243,7 +269,13 @@ static pascal OSStatus uni_to_font_fallback(UniChar *ucp, if (olen < 1) return kTECOutputBufferFullStatus; - *obuf = '?'; + /* + * What I'd _like_ to do here is to somehow generate the + * missing-character glyph that every font is required to have. + * Unfortunately (and somewhat surprisingly), I can't find any way + * to actually ask for it explicitly. Bah. + */ + *obuf = '.'; *iusedp = ilen; *ousedp = 1; return noErr; @@ -270,7 +302,6 @@ static void mac_adjustsize(Session *s, int newrows, int newcols) { } static void mac_initpalette(Session *s) { - int i; if (!HAVE_COLOR_QD()) return; @@ -305,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); @@ -928,7 +959,10 @@ void do_text(Context ctx, int x, int y, char *text, int len, RgnHandle textrgn; char mactextbuf[1024]; UniChar unitextbuf[1024]; + wchar_t *unitextptr; int i; + ByteCount iread, olen; + OSStatus err; assert(len <= 1024); @@ -942,23 +976,28 @@ void do_text(Context ctx, int x, int y, char *text, int len, if (!RectInRgn(&a.textrect, s->window->visRgn)) return; - if (s->uni_to_font != NULL) { - ByteCount iread, olen; - OSStatus err; + /* Unpack Unicode from the mad format we get passed */ + for (i = 0; i < len; i++) + unitextbuf[i] = (unsigned char)text[i] | (attr & CSET_MASK); - for (i = 0; i < len; i++) - unitextbuf[i] = (unsigned char)text[i] | (attr & CSET_MASK); + if (s->uni_to_font != NULL) { err = ConvertFromUnicodeToText(s->uni_to_font, len * sizeof(UniChar), unitextbuf, kUnicodeUseFallbacksMask, 0, NULL, NULL, NULL, 1024, &iread, &olen, mactextbuf); - if (err == noErr || err == kTECUsedFallbacksStatus) - text = mactextbuf; len = olen; - } + if (err != noErr && err != kTECUsedFallbacksStatus) + 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 + olen = 0; a.s = s; - a.text = text; - a.len = len; + a.text = mactextbuf; + a.len = olen; a.attr = attr; a.lattr = lattr; a.numer.h = a.numer.v = a.denom.h = a.denom.v = 1; @@ -1141,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