-/* $Id: mac.c,v 1.11 2002/12/30 19:01:44 ben Exp $ */
+/* $Id: mac.c,v 1.17 2003/01/04 12:45:11 ben Exp $ */
/*
* Copyright (c) 1999 Ben Harris
* All rights reserved.
/* Init TextEdit */
TEInit();
/* Init Dialog Manager */
- InitDialogs(nil);
+ InitDialogs(NULL);
cold = 0;
/* Get base system version (only used if there's no better selector) */
if (Gestalt(gestaltSystemVersion, &mac_gestalts.sysvers) != noErr ||
- (mac_gestalts.sysvers & 0xffff) < 0x700)
+ (mac_gestalts.sysvers &= 0xffff) < 0x700)
fatalbox("PuTTY requires System 7 or newer");
- mac_gestalts.sysvers &= 0xffff;
/* Find out if we've got Color Quickdraw */
if (Gestalt(gestaltQuickdrawVersion, &mac_gestalts.qdvers) != noErr)
mac_gestalts.qdvers = gestaltOriginalQD;
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
mac_gestalts.encvvers = 0;
else {
mac_gestalts.encvvers = (*ti)->tecVersion;
+ mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
DisposeHandle((Handle)ti);
}
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;
}
}
case wTerminal:
mac_activateterm(window, active);
break;
+ case wSettings:
+ mac_activatedlg(window, event);
+ break;
case wAbout:
mac_activateabout(window, event);
break;
mac_updateterm(window);
break;
case wAbout:
+ case wSettings:
BeginUpdate(window);
UpdateDialog(window, window->visRgn);
EndUpdate(window);
*/
static int mac_windowtype(WindowPtr window) {
int kind;
+ long refcon;
if (window == NULL)
return wNone;
return wDA;
if (GetWVariant(window) == zoomDocProc)
return wTerminal;
- return GetWRefCon(window);
+ refcon = GetWRefCon(window);
+ if (refcon < 1024)
+ return refcon;
+ else
+ return wSettings;
}
/*
stuff[0] = vsprintf((char *)(&stuff[1]), fmt, ap);
va_end(ap);
ParamText(stuff, NULL, NULL, NULL);
- StopAlert(128, nil);
+ StopAlert(128, NULL);
exit(1);
}
stuff[0] = vsprintf((char *)(&stuff[1]), fmt, ap);
va_end(ap);
ParamText(stuff, NULL, NULL, NULL);
- StopAlert(128, nil);
+ StopAlert(128, NULL);
exit(1);
}