X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/0c5c7f5c1841d6e3d1897e77ea9ee07943f401bf..875e0b16f64f7b97171d58fe34ebcd57314eb739:/mac/mac.c

diff --git a/mac/mac.c b/mac/mac.c
index d8b9b2fa..91fa2fc2 100644
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.51 2003/02/23 11:58:59 ben Exp $ */
+/* $Id: mac.c,v 1.55 2003/03/17 19:00:36 ben Exp $ */
 /*
  * Copyright (c) 1999, 2003 Ben Harris
  * All rights reserved.
@@ -61,6 +61,7 @@
 #include "macresid.h"
 #include "putty.h"
 #include "ssh.h"
+#include "terminal.h"
 #include "mac.h"
 
 Session *sesslist;
@@ -68,6 +69,7 @@ Session *sesslist;
 static int cold = 1;
 static int borednow = FALSE;
 struct mac_gestalts mac_gestalts;
+UInt32 sleeptime;
 
 static void mac_startup(void);
 static void mac_eventloop(void);
@@ -157,6 +159,9 @@ static void mac_startup(void) {
     if (Gestalt(gestaltWindowMgrAttr, &mac_gestalts.windattr) != noErr ||
 	&SetWindowContentColor == kUnresolvedCFragSymbolAddress)
 	mac_gestalts.windattr = 0;
+    /* Mac OS 8.5 Menu Manager? */
+    if (Gestalt(gestaltMenuMgrAttr, &mac_gestalts.menuattr) != noErr)
+	mac_gestalts.menuattr = 0;
 #endif
     /* Text Encoding Conversion Manager? */
     if (
@@ -189,6 +194,11 @@ static void mac_startup(void) {
 	fatalbox("Unable to create menu bar.");
     SetMenuBar(menuBar);
     AppendResMenu(GetMenuHandle(mApple), 'DRVR');
+    if (mac_gestalts.menuattr & gestaltMenuMgrAquaLayoutMask) {
+	DeleteMenuItem(GetMenuHandle(mFile), iQuit);
+	/* Also delete the separator above the Quit item. */
+	DeleteMenuItem(GetMenuHandle(mFile), iQuit - 1);
+    }
     mac_adjustmenus();
     DrawMenuBar();
     InitCursor();
@@ -239,16 +249,26 @@ static void mac_eventloop(void) {
     RgnHandle cursrgn;
 
     cursrgn = NewRgn();
+    sleeptime = 0;
     for (;;) {
     	mac_adjustcursor(cursrgn);
-	gotevent = WaitNextEvent(everyEvent, &event, LONG_MAX, cursrgn);
+	gotevent = WaitNextEvent(everyEvent, &event, sleeptime, cursrgn);
+	/*
+	 * XXX For now, limit sleep time to 1/10 s to work around
+	 * wake-before-sleep race in MacTCP code.
+	 */
+	sleeptime = 6;
 	mac_adjustcursor(cursrgn);
-	if (gotevent)
+	if (gotevent) {
+	    /* Ensure we get a null event when the real ones run out. */
+	    sleeptime = 0;
 	    mac_event(&event);
-	if (borednow)
-	    cleanup_exit(0);
+	    if (borednow)
+		cleanup_exit(0);
+	}
 	sk_poll();
-	mac_pollterm();
+	if (!gotevent)
+	    mac_pollterm();
     }
     DisposeRgn(cursrgn);
 }
@@ -647,10 +667,43 @@ void agent_query(void *in, int inlen, void **out, int *outlen)
 
 /* Temporary null routines for testing. */
 
+/*
+ * FIXME: verify_ssh_host_key() should be passed a frontend handle,
+ * but backends have to have a terminal handle instead, because they
+ * pass it to from_backend(), so we accept a terminal handle here as
+ * well, and hope no-one tries to call us with sensible arguments.
+ */
 void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 			 char *keystr, char *fingerprint)
 {
+    Str255 stuff;
+    Terminal *term = frontend;
+    Session *s = term->frontend;
 
+    /*
+     * This function is horribly wrong.  For one thing, the alert
+     * shouldn't be modal, it should be movable modal, or a sheet in
+     * Aqua.  Also, PuTTY might be in the background, in which case we
+     * should use the Notification Manager to wake up the user.  In
+     * any case, we shouldn't hold up processing of other connections'
+     * data just because this one's waiting for the user.  It should
+     * also handle a host key cache, of course, and see the note above
+     * about the "frontend" argument and the one below about closing
+     * the connection.  All in all, a bit of a mess really.
+     */
+
+    stuff[0] = sprintf((char *)(&stuff[1]),
+		       "The server's key fingerprint is: %s\n"
+		       "Continue connecting?", fingerprint);
+    ParamText(stuff, NULL, NULL, NULL);
+    if (CautionAlert(wQuestion, NULL) == 2) {
+	/*
+	 * User chose "Cancel".  Unfortunately, if I tear the
+	 * connection down here, Bad Things happen when I return.  I
+	 * think this function should actually return something
+	 * telling the SSH code to abandon the connection.
+	 */
+    }
 }
 
 void askcipher(void *frontend, char *ciphername, int cs)