Add some backends, a network interface and some library routines to the

[sgt/putty] / mac / macterm.c

diff --git a/mac/macterm.c b/mac/macterm.c
index 2e1a406..fe692fd 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.33 2003/01/04 00:48:13 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),
@@ -333,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);
@@ -789,7 +792,7 @@ void request_paste(void *frontend)
 static struct {
     Rect msgrect;
     Point msgorigin;
-    Point startmouse;
+    Point zeromouse;
     Session *s;
     char oldmsg[20];
 } growterm_state;
@@ -807,7 +810,9 @@ void mac_growterm(WindowPtr window, EventRecord *event) {
 
     draghooksave = LMGetDragHook();
     growterm_state.oldmsg[0] = '\0';
-    growterm_state.startmouse = event->where;
+    growterm_state.zeromouse = event->where;
+    growterm_state.zeromouse.h -= s->term->cols * s->font_width;
+    growterm_state.zeromouse.v -= s->term->rows * s->font_height;
     growterm_state.s = s;
     GetPort(&portsave);
     SetPort(s->window);
@@ -848,11 +853,9 @@ static pascal void mac_growtermdraghook(void)
     int newrows, newcols;
     
     GetMouse(&mouse);
-    newrows = (mouse.v - growterm_state.startmouse.v) / s->font_height +
-       s->term->rows;
+    newrows = (mouse.v - growterm_state.zeromouse.v) / s->font_height;
     if (newrows < 1) newrows = 1;
-    newcols = (mouse.h - growterm_state.startmouse.h) / s->font_width +
-       s->term->cols;
+    newcols = (mouse.h - growterm_state.zeromouse.h) / s->font_width;
     if (newcols < 1) newcols = 1;
     sprintf(buf, "%dx%d", newcols, newrows);
     if (strcmp(buf, growterm_state.oldmsg) == 0)
@@ -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;
@@ -1178,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