X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/3976728b1aa1805bee688fcfa9131edcbe4dae88..b7a189f38294c745ae4ea6efb55891c8196e275b:/mac/mac.c diff --git a/mac/mac.c b/mac/mac.c index 2e4bfdf7..779792fb 100644 --- a/mac/mac.c +++ b/mac/mac.c @@ -1,4 +1,4 @@ -/* $Id: mac.c,v 1.2 2002/11/23 15:11:13 ben Exp $ */ +/* $Id: mac.c,v 1.7 2002/12/13 00:02:48 ben Exp $ */ /* * Copyright (c) 1999 Ben Harris * All rights reserved. @@ -41,7 +41,10 @@ #include #include #include +#include +#include #include +#include #include #include @@ -69,10 +72,12 @@ static void mac_growwindow(WindowPtr, EventRecord *); static void mac_activatewindow(WindowPtr, EventRecord *); static void mac_activateabout(WindowPtr, EventRecord *); static void mac_updatewindow(WindowPtr); +static void mac_updatelicence(WindowPtr); static void mac_keypress(EventRecord *); static int mac_windowtype(WindowPtr); static void mac_menucommand(long); static void mac_openabout(void); +static void mac_openlicence(void); static void mac_adjustcursor(RgnHandle); static void mac_adjustmenus(void); static void mac_closewindow(WindowPtr); @@ -97,6 +102,7 @@ int main (int argc, char **argv) { static void mac_startup(void) { Handle menuBar; + TECInfoHandle ti; /* Init Memory Manager */ MaxApplZone(); @@ -114,6 +120,11 @@ static void mac_startup(void) { InitDialogs(nil); 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) + 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; @@ -134,6 +145,19 @@ static void mac_startup(void) { /* Mac OS 8.5 Window Manager? */ if (Gestalt(gestaltWindowMgrAttr, &mac_gestalts.windattr) != noErr) mac_gestalts.windattr = 0; + /* Text Encoding Conversion Manager? */ + if ( +#if TARGET_RT_MAC_CFM + &TECGetInfo == kUnresolvedCFragSymbolAddress || +#else + InitializeUnicodeConverter(NULL) != noErr || +#endif + TECGetInfo(&ti) != noErr) + mac_gestalts.encvvers = 0; + else { + mac_gestalts.encvvers = (*ti)->tecVersion; + DisposeHandle((Handle)ti); + } /* We've been tested with the Appearance Manager */ if (mac_gestalts.apprvers != 0) @@ -240,7 +264,7 @@ static void mac_contentclick(WindowPtr window, EventRecord *event) { if (DialogSelect(event, &(DialogPtr)window, &item)) switch (item) { case wiAboutLicence: - /* XXX: Do something */ + mac_openlicence(); break; } break; @@ -295,11 +319,32 @@ static void mac_updatewindow(WindowPtr window) { EndUpdate(window); break; case wLicence: - /* Do something */ - break; + mac_updatelicence(window); + break; } } +static void mac_updatelicence(WindowPtr window) +{ + Handle h; + int len; + long fondsize; + + SetPort(window); + BeginUpdate(window); + fondsize = GetScriptVariable(smRoman, smScriptSmallFondSize); + TextFont(HiWord(fondsize)); + TextSize(LoWord(fondsize)); + h = Get1Resource('TEXT', wLicence); + len = GetResourceSizeOnDisk(h); + if (h != NULL) { + HLock(h); + TETextBox(*h, len, &window->portRect, teFlushDefault); + HUnlock(h); + } + EndUpdate(window); +} + /* * Work out what kind of window we're dealing with. * Concept shamelessly nicked from SurfWriter. @@ -398,17 +443,33 @@ static void mac_openabout(void) { SelectWindow(windows.about); else { windows.about = GetNewDialog(wAbout, NULL, (WindowPtr)-1); - /* XXX check we're using the right resource file? */ - vers = (VersRecHndl)GetResource('vers', 1); - assert(vers != NULL && *vers != NULL); - longvers = (*vers)->shortVersion + (*vers)->shortVersion[0] + 1; - GetDialogItem(windows.about, wiAboutVersion, &itemtype, &item, &box); - assert(itemtype & kStaticTextDialogItem); - SetDialogItemText(item, longvers); + vers = (VersRecHndl)Get1Resource('vers', 1); + if (vers != NULL && *vers != NULL) { + longvers = (*vers)->shortVersion + (*vers)->shortVersion[0] + 1; + GetDialogItem(windows.about, wiAboutVersion, + &itemtype, &item, &box); + assert(itemtype & kStaticTextDialogItem); + SetDialogItemText(item, longvers); + } ShowWindow(windows.about); } } +static void mac_openlicence(void) { + DialogItemType itemtype; + Handle item; + VersRecHndl vers; + Rect box; + StringPtr longvers; + + if (windows.licence) + SelectWindow(windows.licence); + else { + windows.licence = GetNewWindow(wLicence, NULL, (WindowPtr)-1); + ShowWindow(windows.licence); + } +} + static void mac_closewindow(WindowPtr window) { switch (mac_windowtype(window)) { @@ -422,6 +483,10 @@ static void mac_closewindow(WindowPtr window) { windows.about = NULL; CloseWindow(window); break; + case wLicence: + windows.licence = NULL; + CloseWindow(window); + break; default: CloseWindow(window); break; @@ -499,6 +564,8 @@ static void mac_adjustcursor(RgnHandle cursrgn) { static void mac_shutdown(void) { + if (mac_gestalts.encvvers != 0) + TerminateUnicodeConverter(); exit(0); }