Add the ability to close sessions. This adds *_free() functions to most

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

diff --git a/mac/mac.c b/mac/mac.c
index 8aac2ad..52258c3 100644 (file)
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.18 2003/01/05 10:52:56 ben Exp $ */
+/* $Id: mac.c,v 1.32 2003/01/15 23:30:21 ben Exp $ */
 /*
  * Copyright (c) 1999 Ben Harris
  * All rights reserved.
@@ -57,10 +57,13 @@
 
 #include "macresid.h"
 #include "putty.h"
+#include "ssh.h"
 #include "mac.h"
 
 QDGlobals qd;
 
+Session *sesslist;
+
 static int cold = 1;
 struct mac_gestalts mac_gestalts;
 
@@ -84,7 +87,7 @@ 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;
@@ -166,8 +169,21 @@ static void mac_startup(void) {
        mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
        DisposeHandle((Handle)ti);
     }
-
-    mactcp_init();
+    /* 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;
 
     /* We've been tested with the Appearance Manager */
     if (mac_gestalts.apprvers != 0)
@@ -184,8 +200,18 @@ 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;
 
     {
        short vol;
@@ -198,7 +224,6 @@ static void mac_startup(void) {
            LMSetCurDirStore(dirid);
        }
     }
-    init_ucs();
 }
 
 static void mac_eventloop(void) {
@@ -213,6 +238,11 @@ 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();
+       mac_pollterm();
     }
     DisposeRgn(cursrgn);
 }
@@ -456,7 +486,7 @@ static void mac_menucommand(long result) {
             mac_closewindow(window);
             goto done;
           case iQuit:
-            mac_shutdown();
+            cleanup_exit(0);
             goto done;
         }
         break;
@@ -511,18 +541,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;
     }
 }
@@ -596,14 +623,15 @@ static void mac_adjustcursor(RgnHandle cursrgn) {
     }
 }
 
-static void mac_shutdown(void) {
+void cleanup_exit(int status)
+{
 
 #if !TARGET_RT_MAC_CFM
     if (mac_gestalts.encvvers != 0)
        TerminateUnicodeConverter();
 #endif
-    mactcp_shutdown();
-    exit(0);
+    sk_cleanup();
+    exit(status);
 }
 
 void fatalbox(char *fmt, ...) {
@@ -616,7 +644,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, ...) {
@@ -629,7 +657,7 @@ 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. */
@@ -643,7 +671,92 @@ void connection_fatal(void *fontend, char *fmt, ...) {
     va_end(ap);
     ParamText(stuff, NULL, NULL, NULL);
     StopAlert(128, NULL);
-    exit(1);
+    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. */
 }
 
 /*