X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/ce2832135394f17cf34a9ca00db3c7394b591d46..1fc898ead222c1ef1502f13bdeff40cdfbc61d3d:/mac/mac.c?ds=sidebyside

diff --git a/mac/mac.c b/mac/mac.c
index 0abb3375..8ba87956 100644
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.10 2002/12/30 18:21:17 ben Exp $ */
+/* $Id: mac.c,v 1.15 2003/01/04 00:13:18 ben Exp $ */
 /*
  * Copyright (c) 1999 Ben Harris
  * All rights reserved.
@@ -40,6 +40,7 @@
 #include <Devices.h>
 #include <DiskInit.h>
 #include <Gestalt.h>
+#include <LowMem.h>
 #include <Resources.h>
 #include <Script.h>
 #include <TextCommon.h>
@@ -139,12 +140,19 @@ static void mac_startup(void) {
     if (&RegisterAppearanceClient == kUnresolvedCFragSymbolAddress)
 	mac_gestalts.apprvers = 0;
 #endif
+#if TARGET_CPU_68K
+    mac_gestalts.cntlattr = 0;
+    mac_gestalts.windattr = 0;
+#else
     /* Mac OS 8.5 Control Manager (proportional scrollbars)? */
-    if (Gestalt(gestaltControlMgrAttr, &mac_gestalts.cntlattr) != noErr)
+    if (Gestalt(gestaltControlMgrAttr, &mac_gestalts.cntlattr) != noErr ||
+	&SetControlViewSize == kUnresolvedCFragSymbolAddress)
 	mac_gestalts.cntlattr = 0;
     /* Mac OS 8.5 Window Manager? */
-    if (Gestalt(gestaltWindowMgrAttr, &mac_gestalts.windattr) != noErr)
+    if (Gestalt(gestaltWindowMgrAttr, &mac_gestalts.windattr) != noErr ||
+	&SetWindowContentColor == kUnresolvedCFragSymbolAddress)
 	mac_gestalts.windattr = 0;
+#endif
     /* Text Encoding Conversion Manager? */
     if (
 #if TARGET_RT_MAC_CFM
@@ -156,6 +164,7 @@ static void mac_startup(void) {
 	mac_gestalts.encvvers = 0;
     else {
 	mac_gestalts.encvvers = (*ti)->tecVersion;
+	mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
 	DisposeHandle((Handle)ti);
     }
 
@@ -174,6 +183,17 @@ static void mac_startup(void) {
     windows.about = NULL;
     windows.licence = NULL;
 
+    {
+	short vol;
+	long dirid;
+
+	/* Set the default directory for loading and saving settings. */
+	/* XXX Should we create it? */
+	if (get_session_dir(FALSE, &vol, &dirid) == noErr) {
+	    LMSetSFSaveDisk(-vol);
+	    LMSetCurDirStore(dirid);
+	}
+    }
     init_ucs();
 }
 
@@ -261,13 +281,16 @@ static void mac_contentclick(WindowPtr window, EventRecord *event) {
 	mac_clickterm(window, event);
 	break;
       case wAbout:
-	if (DialogSelect(event, &(DialogPtr)window, &item))
+	if (DialogSelect(event, &window, &item))
 	    switch (item) {
 	      case wiAboutLicence:
 		mac_openlicence();
 		break;
 	    }
 	break;
+      case wSettings:
+	mac_clickdlg(window, event);
+	break;
     }
 }
 
@@ -288,6 +311,9 @@ static void mac_activatewindow(WindowPtr window, EventRecord *event) {
       case wTerminal:
 	mac_activateterm(window, active);
 	break;
+      case wSettings:
+	mac_activatedlg(window, event);
+	break;
       case wAbout:
 	mac_activateabout(window, event);
 	break;
@@ -314,6 +340,7 @@ static void mac_updatewindow(WindowPtr window) {
 	mac_updateterm(window);
 	break;
       case wAbout:
+      case wSettings:
 	BeginUpdate(window);
 	UpdateDialog(window, window->visRgn);
 	EndUpdate(window);
@@ -351,6 +378,7 @@ static void mac_updatelicence(WindowPtr window)
  */
 static int mac_windowtype(WindowPtr window) {
     int kind;
+    long refcon;
 
     if (window == NULL)
 	return wNone;
@@ -359,7 +387,11 @@ static int mac_windowtype(WindowPtr window) {
 	return wDA;
     if (GetWVariant(window) == zoomDocProc)
 	return wTerminal;
-    return GetWRefCon(window);
+    refcon = GetWRefCon(window);
+    if (refcon < 1024)
+	return refcon;
+    else
+	return wSettings;
 }
 
 /*