X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/1adaeb2ee2c574fa3d06cf14f4aad0b6192a0aea..1dfd2cd6e4b2b02f19f7b3d418f8a31e634d88ce:/mac/mac.c

diff --git a/mac/mac.c b/mac/mac.c
index ace079ca..76d202af 100644
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.31 2003/01/15 22:37:58 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 <MacTypes.h>
+#include <AEDataModel.h>
+#include <AppleEvents.h>
 #include <Quickdraw.h>
 #include <Fonts.h>
 #include <MacWindows.h>
@@ -65,6 +67,7 @@ QDGlobals qd;
 Session *sesslist;
 
 static int cold = 1;
+static int borednow = FALSE;
 struct mac_gestalts mac_gestalts;
 
 static void mac_startup(void);
@@ -86,7 +89,6 @@ 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 (cleanup_exit)
 
 struct mac_windows {
@@ -169,21 +171,8 @@ static void mac_startup(void) {
 	mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
 	DisposeHandle((Handle)ti);
     }
-    /* OpenTransport? */
-    if (Gestalt(gestaltOpenTpt, &mac_gestalts.otptattr) != noErr ||
-	(mac_gestalts.otptattr & gestaltOpenTptTCPPresentMask) == 0 ||
-	ot_init() != noErr)
-	mac_gestalts.otptattr = 0;
-    if (mac_gestalts.otptattr == 0) {
-	/* 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;
-	}
-    } else
-	mac_gestalts.mtcpvers = 0;
+
+    sk_init();
 
     /* We've been tested with the Appearance Manager */
     if (mac_gestalts.apprvers != 0)
@@ -224,6 +213,16 @@ static void mac_startup(void) {
 	    LMSetCurDirStore(dirid);
 	}
     }
+
+    /* 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) {
@@ -238,10 +237,9 @@ static void mac_eventloop(void) {
 	mac_adjustcursor(cursrgn);
 	if (gotevent)
 	    mac_event(&event);
-	if (mac_gestalts.mtcpvers != 0)
-	    mactcp_poll();
-	if (mac_gestalts.otptattr != 0)
-	    ot_poll();
+	if (borednow)
+	    cleanup_exit(0);
+	sk_poll();
 	mac_pollterm();
     }
     DisposeRgn(cursrgn);
@@ -304,6 +302,9 @@ static void mac_event(EventRecord *event) {
 	    DIBadMount(pt, event->message);
         }
         break;
+      case kHighLevelEvent:
+	AEProcessAppleEvent(event); /* errors? */
+	break;
     }
 }
 
@@ -485,6 +486,12 @@ 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:
             cleanup_exit(0);
             goto done;
@@ -541,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;
     }
 }
@@ -584,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;
@@ -626,6 +638,20 @@ static void mac_adjustcursor(RgnHandle cursrgn) {
     }
 }
 
+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)
 {