Add {Question} to faq-psftp-slow

[u/mdw/putty] / mac / mac.c

diff --git a/mac/mac.c b/mac/mac.c
index 330cac7..d7ac91f 100644 (file)
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.28 2003/01/14 19:09:24 ben Exp $ */
+/* $Id: mac.c,v 1.34 2003/01/20 22:55:08 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,8 +89,8 @@ 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)
+static pascal OSErr mac_aevt_quit(const AppleEvent *, AppleEvent *, long);
 
 struct mac_windows {
     WindowPtr about;
@@ -169,10 +172,12 @@ static void mac_startup(void) {
        mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
        DisposeHandle((Handle)ti);
     }
-    /* OpenTransport? */
+
+#if 0    /* OpenTransport? */
     if (Gestalt(gestaltOpenTpt, &mac_gestalts.otptattr) != noErr ||
        (mac_gestalts.otptattr & gestaltOpenTptTCPPresentMask) == 0 ||
        ot_init() != noErr)
+#endif
        mac_gestalts.otptattr = 0;
     if (mac_gestalts.otptattr == 0) {
        /* MacTCP? */
@@ -200,8 +205,17 @@ static void mac_startup(void) {
     windows.about = NULL;
     windows.licence = NULL;
 
-    default_protocol = DEFAULT_PROTOCOL;
-    default_port = DEFAULT_PORT;
+    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;
 
     {
@@ -215,7 +229,10 @@ static void mac_startup(void) {
            LMSetCurDirStore(dirid);
        }
     }
-    init_ucs();
+
+    /* Install Apple Event handlers. */
+    AEInstallEventHandler(kCoreEventClass, kAEQuitApplication,
+                         NewAEEventHandlerUPP(&mac_aevt_quit), 0, FALSE);
 }
 
 static void mac_eventloop(void) {
@@ -230,6 +247,8 @@ static void mac_eventloop(void) {
        mac_adjustcursor(cursrgn);
        if (gotevent)
            mac_event(&event);
+       if (borednow)
+           cleanup_exit(0);
        if (mac_gestalts.mtcpvers != 0)
            mactcp_poll();
        if (mac_gestalts.otptattr != 0)
@@ -296,6 +315,9 @@ static void mac_event(EventRecord *event) {
            DIBadMount(pt, event->message);
         }
         break;
+      case kHighLevelEvent:
+       AEProcessAppleEvent(event); /* errors? */
+       break;
     }
 }
 
@@ -477,6 +499,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;
@@ -533,18 +561,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;
     }
 }
@@ -576,10 +601,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;
@@ -618,6 +651,14 @@ static void mac_adjustcursor(RgnHandle cursrgn) {
     }
 }
 
+static pascal OSErr mac_aevt_quit(const AppleEvent *req, AppleEvent *reply,
+                                 long refcon)
+{
+
+    borednow = 1;
+    return noErr;
+}
+
 void cleanup_exit(int status)
 {