X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/f3ab148c2f5bc562133711998ac30d5fb31be460..1dfd2cd6e4b2b02f19f7b3d418f8a31e634d88ce:/mac/mac.c diff --git a/mac/mac.c b/mac/mac.c index b3df4838..76d202af 100644 --- a/mac/mac.c +++ b/mac/mac.c @@ -1,4 +1,4 @@ -/* $Id: mac.c,v 1.17 2003/01/04 12:45:11 ben Exp $ */ +/* $Id: mac.c,v 1.36 2003/01/24 00:25:33 ben Exp $ */ /* * Copyright (c) 1999 Ben Harris * All rights reserved. @@ -29,6 +29,8 @@ */ #include +#include +#include #include #include #include @@ -57,11 +59,15 @@ #include "macresid.h" #include "putty.h" +#include "ssh.h" #include "mac.h" QDGlobals qd; +Session *sesslist; + static int cold = 1; +static int borednow = FALSE; struct mac_gestalts mac_gestalts; static void mac_startup(void); @@ -83,8 +89,7 @@ static void mac_adjustcursor(RgnHandle); static void mac_adjustmenus(void); static void mac_closewindow(WindowPtr); static void mac_zoomwindow(WindowPtr, short); -static void mac_shutdown(void); -#pragma noreturn (mac_shutdown) +#pragma noreturn (cleanup_exit) struct mac_windows { WindowPtr about; @@ -167,6 +172,8 @@ static void mac_startup(void) { DisposeHandle((Handle)ti); } + sk_init(); + /* We've been tested with the Appearance Manager */ if (mac_gestalts.apprvers != 0) RegisterAppearanceClient(); @@ -182,6 +189,19 @@ static void mac_startup(void) { windows.about = NULL; windows.licence = NULL; + default_protocol = be_default_protocol; + /* Find the appropriate default port. */ + { + int i; + default_port = 0; /* illegal */ + for (i = 0; backends[i].backend != NULL; i++) + if (backends[i].protocol == default_protocol) { + default_port = backends[i].backend->default_port; + break; + } + } + flags = FLAG_INTERACTIVE; + { short vol; long dirid; @@ -193,7 +213,16 @@ static void mac_startup(void) { LMSetCurDirStore(dirid); } } - init_ucs(); + + /* Install Apple Event handlers. */ + AEInstallEventHandler(kCoreEventClass, kAEOpenApplication, + NewAEEventHandlerUPP(&mac_aevt_oapp), 0, FALSE); + AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, + NewAEEventHandlerUPP(&mac_aevt_odoc), 0, FALSE); + AEInstallEventHandler(kCoreEventClass, kAEPrintDocuments, + NewAEEventHandlerUPP(&mac_aevt_pdoc), 0, FALSE); + AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, + NewAEEventHandlerUPP(&mac_aevt_quit), 0, FALSE); } static void mac_eventloop(void) { @@ -208,6 +237,10 @@ static void mac_eventloop(void) { mac_adjustcursor(cursrgn); if (gotevent) mac_event(&event); + if (borednow) + cleanup_exit(0); + sk_poll(); + mac_pollterm(); } DisposeRgn(cursrgn); } @@ -269,6 +302,9 @@ static void mac_event(EventRecord *event) { DIBadMount(pt, event->message); } break; + case kHighLevelEvent: + AEProcessAppleEvent(event); /* errors? */ + break; } } @@ -450,8 +486,14 @@ static void mac_menucommand(long result) { case iClose: mac_closewindow(window); goto done; + case iSave: + mac_savesession(); + goto done; + case iSaveAs: + mac_savesessionas(); + goto done; case iQuit: - mac_shutdown(); + cleanup_exit(0); goto done; } break; @@ -506,18 +548,15 @@ static void mac_closewindow(WindowPtr window) { CloseDeskAcc(((WindowPeek)window)->windowKind); break; case wTerminal: - /* FIXME: end session and stuff */ + mac_closeterm(window); break; case wAbout: windows.about = NULL; - CloseWindow(window); + DisposeDialog(window); break; case wLicence: windows.licence = NULL; - CloseWindow(window); - break; - default: - CloseWindow(window); + DisposeWindow(window); break; } } @@ -549,10 +588,18 @@ static void mac_adjustmenus(void) { EnableItem(menu, iQuit); switch (mac_windowtype(window)) { + case wSettings: + DisableItem(menu, iSave); /* XXX enable if modified */ + EnableItem(menu, iSaveAs); + menu = GetMenuHandle(mEdit); + DisableItem(menu, 0); + break; case wTerminal: mac_adjusttermmenus(window); break; default: + DisableItem(menu, iSave); + DisableItem(menu, iSaveAs); menu = GetMenuHandle(mEdit); DisableItem(menu, 0); break; @@ -591,13 +638,29 @@ static void mac_adjustcursor(RgnHandle cursrgn) { } } -static void mac_shutdown(void) { +pascal OSErr mac_aevt_quit(const AppleEvent *req, AppleEvent *reply, + long refcon) +{ + DescType type; + Size size; + + if (AEGetAttributePtr(req, keyMissedKeywordAttr, typeWildCard, + &type, NULL, 0, &size) == noErr) + return errAEParamMissed; + + borednow = 1; + return noErr; +} + +void cleanup_exit(int status) +{ #if !TARGET_RT_MAC_CFM if (mac_gestalts.encvvers != 0) TerminateUnicodeConverter(); #endif - exit(0); + sk_cleanup(); + exit(status); } void fatalbox(char *fmt, ...) { @@ -610,7 +673,7 @@ void fatalbox(char *fmt, ...) { va_end(ap); ParamText(stuff, NULL, NULL, NULL); StopAlert(128, NULL); - exit(1); + cleanup_exit(1); } void modalfatalbox(char *fmt, ...) { @@ -623,7 +686,106 @@ void modalfatalbox(char *fmt, ...) { va_end(ap); ParamText(stuff, NULL, NULL, NULL); StopAlert(128, NULL); - exit(1); + cleanup_exit(1); +} + +/* This should only kill the current session, not the whole application. */ +void connection_fatal(void *fontend, char *fmt, ...) { + va_list ap; + Str255 stuff; + + va_start(ap, fmt); + /* We'd like stuff to be a Pascal string */ + stuff[0] = vsprintf((char *)(&stuff[1]), fmt, ap); + va_end(ap); + ParamText(stuff, NULL, NULL, NULL); + StopAlert(128, NULL); + cleanup_exit(1); +} + +/* Null SSH agent client -- never finds an agent. */ + +int agent_exists(void) +{ + + return FALSE; +} + +void agent_query(void *in, int inlen, void **out, int *outlen) +{ + + *out = NULL; + *outlen = 0; +} + +/* Temporary null routines for testing. */ + +void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype, + char *keystr, char *fingerprint) +{ + +} + +void askcipher(void *frontend, char *ciphername, int cs) +{ + +} + +void old_keyfile_warning(void) +{ + +} + +char *platform_default_s(char const *name) +{ + 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 const *name, int def) +{ + 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 + * that the failure mode isn't quite so drastically horrid. + * When Unicode comes in, this can all be put right. */ + if (!strcmp(name, "RawCNP")) + return 1; + 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. */ } /*