X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/5a9eb1056517b6ee6efa526a3a6b5a21aa802648..deed9e2553ba99e7cd912c924482ba468cab61a1:/mac/mac.c?ds=inline

diff --git a/mac/mac.c b/mac/mac.c
index a2c9b08f..632b6a41 100644
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.21 2003/01/09 18:06:29 simon Exp $ */
+/* $Id: mac.c,v 1.24 2003/01/11 19:43:59 ben Exp $ */
 /*
  * Copyright (c) 1999 Ben Harris
  * All rights reserved.
@@ -169,8 +169,13 @@ static void mac_startup(void) {
 	mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
 	DisposeHandle((Handle)ti);
     }
-
-    mactcp_init();
+    /* MacTCP? */
+    if (Gestalt(FOUR_CHAR_CODE('mtcp'), &mac_gestalts.mtcpvers) != noErr)
+	mac_gestalts.mtcpvers = 0;
+    if (mac_gestalts.mtcpvers > 0) {
+	if (mactcp_init() != noErr)
+	    mac_gestalts.mtcpvers = 0;
+    }
 
     /* We've been tested with the Appearance Manager */
     if (mac_gestalts.apprvers != 0)
@@ -225,7 +230,8 @@ static void mac_eventloop(void) {
 	mac_adjustcursor(cursrgn);
 	if (gotevent)
 	    mac_event(&event);
-	mactcp_poll();
+	if (mac_gestalts.mtcpvers != 0)
+	    mactcp_poll();
 	mac_pollterm();
     }
     DisposeRgn(cursrgn);
@@ -617,7 +623,8 @@ void cleanup_exit(int status)
     if (mac_gestalts.encvvers != 0)
 	TerminateUnicodeConverter();
 #endif
-    mactcp_shutdown();
+    if (mac_gestalts.mtcpvers != 0)
+	mactcp_shutdown();
     exit(status);
 }
 
@@ -696,15 +703,40 @@ void old_keyfile_warning(void)
 
 char *platform_default_s(char *name)
 {
-    if (!strcmp(name, "Font"))
-	return "Monaco";
+    long smfs;
+    Str255 pname;
+    static char cname[256];
+
+    if (!strcmp(name, "Font")) {
+	smfs = GetScriptVariable(smSystemScript, smScriptMonoFondSize);
+	if (smfs == 0)
+	    smfs = GetScriptVariable(smRoman, smScriptMonoFondSize);
+	if (smfs != 0) {
+	    GetFontName(HiWord(smfs), pname);
+	    if (pname[0] == 0)
+		return "Monaco";
+	    p2cstrcpy(cname, pname);
+	    return cname;
+	} else
+	    return "Monaco";
+    }
     return NULL;
 }
 
 int platform_default_i(char *name, int def)
 {
-    if (!strcmp(name, "FontHeight"))
-	return 9;
+    long smfs;
+
+    if (!strcmp(name, "FontHeight")) {
+	smfs = GetScriptVariable(smSystemScript, smScriptMonoFondSize);
+	if (smfs == 0)
+	    smfs = GetScriptVariable(smRoman, smScriptMonoFondSize);
+	if (smfs != 0)
+	    return LoWord(smfs);
+	else
+	    return 9;
+    }
+
     /* Non-raw cut and paste of line-drawing chars works badly on the
      * current Unix stub implementation of the Unicode functions.
      * So I'm going to temporarily set the default to raw mode so
@@ -715,6 +747,12 @@ int platform_default_i(char *name, int def)
     return def;
 }
 
+void platform_get_x11_auth(char *display, int *proto,
+                           unsigned char *data, int *datalen)
+{
+    /* SGT: I have no idea whether Mac X servers need anything here. */
+}
+
 /*
  * Local Variables:
  * c-file-style: "simon"