X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=mac_res.r;h=d6183a122b676d7b8c3f7bc571f6c7a965206e21;hb=3b6d5dcf1af4c22ea6f77f3563cf9abfb7be4fcd;hp=a4133c3d81ad3358df7e8676951cb6bb1fc6cb0f;hpb=8ac1a08339a490b8f0c7614bc8b930272914a79e;p=PuTTY.git

diff --git a/mac_res.r b/mac_res.r
index a4133c3d..d6183a12 100644
--- a/mac_res.r
+++ b/mac_res.r
@@ -1,9 +1,35 @@
-/* $Id: mac_res.r,v 1.1.2.2 1999/02/21 18:09:41 ben Exp $ */
-/* PuTTY resources */
+/* $Id: mac_res.r,v 1.1.2.17 1999/04/02 12:58:02 ben Exp $ */
+/*
+ * Copyright (c) 1999 Ben Harris
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ * 
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ * 
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR
+ * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
 
-#define PICT_RezTemplateVersion 1
+/* PuTTY resources */
 
 #include "Types.r"
+#include "Dialogs.r"
+#include "Palettes.r"
 
 /* Get resource IDs we share with C code */
 #include "macresid.h"
@@ -12,7 +38,7 @@
  * Finder-related resources
  */
 
-/* For now, PuTTY uses the signature "pTTY" */
+/* 'pTTY' is now registered with Apple as PuTTY's signature */
 
 type 'pTTY' as 'STR ';
 
@@ -20,14 +46,6 @@ resource 'pTTY' (0, purgeable) {
     "PuTTY experimental Mac port"
 };
 
-resource 'vers' (1, purgeable) {
-    0x00, 0x45,		/* Major and minor (BCD) */
-    development, 0,	/* Status and pre-release */
-    2,			/* Region code (2 = UK) */
-    "Mac exp",		/* Short version (list views) */
-    "Mac experimental",	/* Long version (get info) */
-};
-
 resource 'SIZE' (-1) {
     reserved,
     ignoreSuspendResumeEvents,
@@ -86,26 +104,95 @@ resource 'BNDL' (128, purgeable) {
 resource 'ICN#' (128, purgeable) {
 	{	/* array: 2 elements */
 		/* [1] */
-		$"0000 3FFE 0000 4001 0000 4FF9 0000 5005"
-		$"0000 5545 0000 5005 0000 5405 0000 5005"
-		$"0000 5505 0000 5005 0000 4FF9 0000 4001"
-		$"0000 4001 7FFC 407D 8002 4001 9FF2 4001"
-		$"A00A 3FFE AA8A 2002 A00A 3FFE A80A 0000"
-		$"A00A 0000 AA0A 0000 A00A 0000 9FF2 0000"
-		$"8002 0000 8002 0000 80FA 0000 8002 0000"
-		$"8002 0000 7FFC 0000 4004 0000 7FFC",
+		$"00003FFE 00004001 00004FF9 00005005"
+		$"00005355 00004505 00005A05 00002405"
+		$"00004A85 00019005 000223F9 00047C01"
+		$"00180201 7FA00C7D 801F1001 9FE22001"
+		$"A00CDFFE AA892002 A0123FFE A82C0000"
+		$"A0520000 AA6A0000 A00A0000 9FF20000"
+		$"80020000 80020000 90FA0000 80020000"
+		$"80020000 7FFC0000 40040000 7FFC",
 		/* [2] */
-		$"0000 3FFE 0000 7FFF 0000 7FFF 0000 7FFF"
-		$"0000 7FFF 0000 7FFF 0000 7FFF 0000 7FFF"
-		$"0000 7FFF 0000 7FFF 0000 7FFF 0000 7FFF"
-		$"0000 7FFF 7FFC 7FFF FFFE 7FFF FFFE 7FFF"
-		$"FFFE 3FFE FFFE 3FFE FFFE 3FFE FFFE 0000"
-		$"FFFE 0000 FFFE 0000 FFFE 0000 FFFE 0000"
-		$"FFFE 0000 FFFE 0000 FFFE 0000 FFFE 0000"
-		$"FFFE 0000 7FFC 0000 7FFC 0000 7FFC"
+		$"00003FFE 00007FFF 00007FFF 00007FFF"
+		$"00007FFF 00007FFF 00007FFF 00007FFF"
+		$"00007FFF 0001FFFF 0003FFFF 0007FFFF"
+		$"001FFFFF 7FFFFFFF FFFFFFFF FFFFFFFF"
+		$"FFFFFFFE FFFF3FFE FFFE3FFE FFFE0000"
+		$"FFFE0000 FFFE0000 FFFE0000 FFFE0000"
+		$"FFFE0000 FFFE0000 FFFE0000 FFFE0000"
+		$"FFFE0000 7FFC0000 7FFC0000 7FFC"
 	}
 };
 
+resource 'icl4' (128, purgeable) {
+	$"000000000000000000FFFFFFFFFFFFF0"
+	$"00000000000000000FCCCCCCCCCCCCCF"
+	$"00000000000000000FCEEEEEEEEEEECF"
+	$"00000000000000000FCE0D0D0D0D0CCF"
+	$"00000000000000000FCED0FFD0D0D0CF"
+	$"00000000000000000FCE0F1F0D0D0CCF"
+	$"00000000000000000FCFF1F0D0D0D0CF"
+	$"00000000000000000FF11F0D0D0D0CCF"
+	$"00000000000000000F11F0D0D0D0D0CF"
+	$"000000000000000FF11F0D0D0D0D0CCF"
+	$"00000000000000F111FEC0C0C0C0C0CF"
+	$"0000000000000F111FFFFFCCCCCCCCCF"
+	$"00000000000FF111111111FCCCCCCCCF"
+	$"0FFFFFFFFFF111111111FFCCCFFFFFCF"
+	$"FCCCCCCCCCCFFFFF111F3CCCCCCCCCCF"
+	$"FCEEEEEEEEEEECF111FCCCCCCCCCCCCF"
+	$"FCE0D0D0D0D0FF11FFFFFFFFFFFFFFF0"
+	$"FCED0D0D0D0DF11F00FCCCDDDEEEEAF0"
+	$"FCE0D0D0D0DF11F000FFFFFFFFFFFFF0"
+	$"FCED0D0D0DF1FFF00000000000000000"
+	$"FCE0D0D0DF1FCCF00000000000000000"
+	$"FCED0D0D0FFD0CF00000000000000000"
+	$"FCE0D0D0D0D0CCF00000000000000000"
+	$"FCEC0C0C0C0C0CF00000000000000000"
+	$"FCCCCCCCCCCCCCF00000000000000000"
+	$"FCCCCCCCCCCCCCF00000000000000000"
+	$"FC88CCCCFFFFFCF00000000000000000"
+	$"FC33CCCCCCCCCCF00000000000000000"
+	$"FCCCCCCCCCCCCCF00000000000000000"
+	$"0FFFFFFFFFFFFF000000000000000000"
+	$"0FCCCDDDEEEEAF000000000000000000"
+	$"0FFFFFFFFFFFFF"
+};
+
+resource 'icl8' (128, purgeable) {
+	$"000000000000000000000000000000000000FFFFFFFFFFFFFFFFFFFFFFFFFF00"
+	$"0000000000000000000000000000000000FF2B2B2B2B2B2B2B2B2B2B2B2B2BFF"
+	$"0000000000000000000000000000000000FF2BFCFCFCFCFCFCFCFCFCFCFC2BFF"
+	$"0000000000000000000000000000000000FF2BFC2A2A2A2A2A2A2A2A2A002BFF"
+	$"0000000000000000000000000000000000FF2BFC2A2AFFFF2A2A2A2A2A002BFF"
+	$"0000000000000000000000000000000000FF2BFC2AFF05FF2A2A2A2A2A002BFF"
+	$"0000000000000000000000000000000000FF2BFFFF05FF2A2A2A2A2A2A002BFF"
+	$"0000000000000000000000000000000000FFFF0505FF2A2A2A2A2A2A2A002BFF"
+	$"0000000000000000000000000000000000FF0505FF2A2A2A2A2A2A2A2A002BFF"
+	$"000000000000000000000000000000FFFF0505FF2A2A2A2A2A2A2A2A2A002BFF"
+	$"0000000000000000000000000000FF050505FFFC000000000000000000002BFF"
+	$"00000000000000000000000000FF050505FFFFFFFFFF2B2B2B2B2B2B2B2B2BFF"
+	$"0000000000000000000000FFFF050505050505050505FF2B2B2B2B2B2B2B2BFF"
+	$"00FFFFFFFFFFFFFFFFFFFF050505050505050505FFFF2B2B2BFFFFFFFFFF2BFF"
+	$"FF2B2B2B2B2B2B2B2B2B2BFFFFFFFFFF050505FFD82B2B2B2B2B2B2B2B2B2BFF"
+	$"FF2BFCFCFCFCFCFCFCFCFCFCFC2BFF050505FF2B2B2B2B2B2B2B2B2B2B2B2BFF"
+	$"FF2BFC2A2A2A2A2A2A2A2A2AFFFF0505FFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00"
+	$"FF2BFC2A2A2A2A2A2A2A2A2AFF0505FF0000FF2BF7F8F9FAFAFBFBFCFCFDFF00"
+	$"FF2BFC2A2A2A2A2A2A2A2AFF0505FF000000FFFFFFFFFFFFFFFFFFFFFFFFFF00"
+	$"FF2BFC2A2A2A2A2A2A2AFF05FFFFFF0000000000000000000000000000000000"
+	$"FF2BFC2A2A2A2A2A2AFF05FF002BFF0000000000000000000000000000000000"
+	$"FF2BFC2A2A2A2A2A2AFFFF2A002BFF0000000000000000000000000000000000"
+	$"FF2BFC2A2A2A2A2A2A2A2A2A002BFF0000000000000000000000000000000000"
+	$"FF2BFC000000000000000000002BFF0000000000000000000000000000000000"
+	$"FF2B2B2B2B2B2B2B2B2B2B2B2B2BFF0000000000000000000000000000000000"
+	$"FF2B2B2B2B2B2B2B2B2B2B2B2B2BFF0000000000000000000000000000000000"
+	$"FF2BE3E32B2B2B2BFFFFFFFFFF2BFF0000000000000000000000000000000000"
+	$"FF2BD8D82B2B2B2B2B2B2B2B2B2BFF0000000000000000000000000000000000"
+	$"FF2B2B2B2B2B2B2B2B2B2B2B2B2BFF0000000000000000000000000000000000"
+	$"00FFFFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000"
+	$"00FF2BF7F8F9FAFAFBFBFCFCFDFF000000000000000000000000000000000000"
+	$"00FFFFFFFFFFFFFFFFFFFFFFFFFF"
+};
 resource 'ics#' (128, purgeable) {
 	{	/* array: 2 elements */
 		/* [1] */
@@ -121,124 +208,93 @@ resource 'ics#' (128, purgeable) {
 resource 'ICN#' (130, purgeable) {
 	{	/* array: 2 elements */
 		/* [1] */
-		$"1FFF FC00 1000 0600 1000 0500 1FFF FC80"
-		$"1000 0440 1000 0420 1FFF FFF0 1000 0010"
-		$"13FC 0F90 1C03 F0F0 15FA 8090 150A 8090"
-		$"1D0B 80F0 150A 8050 15FA 8050 1C03 8070"
-		$"143A 8050 1402 8050 1FFF ABF0 1204 8110"
-		$"13FC FF10 1AAA AAB0 1000 0010 17FF FFD0"
-		$"1400 0050 1525 2250 1555 5550 1525 2250"
-		$"1400 0050 17FF FFD0 1000 0010 1FFF FFF0",
+		$"1FFFFC00 10000600 10000500 1FFFFC80"
+		$"10000440 10000420 1FFFFFF0 10000010"
+		$"13FC0F90 1C03F0F0 15FA8090 150A8090"
+		$"1D0B80F0 150A8050 15FA8050 1C038070"
+		$"143A8050 14028050 1FFFABF0 12048110"
+		$"13FCFF10 1AAAAAB0 10000010 17FFFFD0"
+		$"14000050 15252250 15555550 15252250"
+		$"14000050 17FFFFD0 10000010 1FFFFFF0",
 		/* [2] */
-		$"1FFF FC00 1FFF FE00 1FFF FF00 1FFF FF80"
-		$"1FFF FFC0 1FFF FFE0 1FFF FFF0 1FFF FFF0"
-		$"1FFF FFF0 1FFF FFF0 1FFF FFF0 1FFF FFF0"
-		$"1FFF FFF0 1FFF FFF0 1FFF FFF0 1FFF FFF0"
-		$"1FFF FFF0 1FFF FFF0 1FFF FFF0 1FFF FFF0"
-		$"1FFF FFF0 1FFF FFF0 1FFF FFF0 1FFF FFF0"
-		$"1FFF FFF0 1FFF FFF0 1FFF FFF0 1FFF FFF0"
-		$"1FFF FFF0 1FFF FFF0 1FFF FFF0 1FFF FFF0"
+		$"1FFFFC00 1FFFFE00 1FFFFF00 1FFFFF80"
+		$"1FFFFFC0 1FFFFFE0 1FFFFFF0 1FFFFFF0"
+		$"1FFFFFF0 1FFFFFF0 1FFFFFF0 1FFFFFF0"
+		$"1FFFFFF0 1FFFFFF0 1FFFFFF0 1FFFFFF0"
+		$"1FFFFFF0 1FFFFFF0 1FFFFFF0 1FFFFFF0"
+		$"1FFFFFF0 1FFFFFF0 1FFFFFF0 1FFFFFF0"
+		$"1FFFFFF0 1FFFFFF0 1FFFFFF0 1FFFFFF0"
+		$"1FFFFFF0 1FFFFFF0 1FFFFFF0 1FFFFFF0"
 	}
 };
+
 resource 'icl4' (130, purgeable) {
-	$"000F FFFF FFFF FFFF FFFF FF00 0000 0000"
-	$"000F 0000 0000 0000 0000 0FF0 0000 0000"
-	$"000F 0000 0000 0000 0000 0FCF 0000 0000"
-	$"000F FFFF FFFF FFFF FFFF FFCC F000 0000"
-	$"000F 0000 0000 0000 0000 0FCC CF00 0000"
-	$"000F 0000 0000 0000 0000 0FCC CCF0 0000"
-	$"000F FFFF FFFF FFFF FFFF FFFF FFFF 0000"
-	$"000F 0000 0000 0000 0000 0000 000F 0000"
-	$"000F 00FF FFFF FF00 0000 FFFF F00F 0000"
-	$"000F FFCC CCCC CCFF FFFF CCCC FFFF 0000"
-	$"000F 0FCE EEEE CCF0 FCCC CCCC F00F 0000"
-	$"000F 0FCE 0D0D 0CF0 FCCC CCCC F00F 0000"
-	$"000F FFCE D0D0 CCFF FCCC CCCC FFFF 0000"
-	$"000F 0FCE 0D0D 0CF0 FCCC CCCC CF0F 0000"
-	$"000F 0FCC C0C0 CCF0 FCCC CCCC CF0F 0000"
-	$"000F FFCC CCCC CCFF FCCC CCCC CFFF 0000"
-	$"000F 0FCC CCFF FCF0 FCCC CCCC CF0F 0000"
-	$"000F 0FCC CCCC CCF0 FCCC CCCC CF0F 0000"
-	$"000F FFFF FFFF FFFF FDDD DDDF FFFF 0000"
-	$"000F 00FC CDDE EF00 FDDD DDDF 000F 0000"
-	$"000F 00FF FFFF FF00 FFFF FFFF 000F 0000"
-	$"000F 0C0C 0C0C 0C0C 0C0C 0C0C 0C0F 0000"
-	$"000F C0C0 C0C0 C0C0 C0C0 C0C0 C0CF 0000"
-	$"000F 0FFF FFFF FFFF FFFF FFFF FF0F 0000"
-	$"000F CF00 0000 0000 0000 0000 0FCF 0000"
-	$"000F 0F0F 00F0 0F0F 00F0 00F0 0F0F 0000"
-	$"000F CF0F 0F0F 0F0F 0F0F 0F0F 0FCF 0000"
-	$"000F 0F0F 00F0 0F0F 00F0 00F0 0F0F 0000"
-	$"000F CF00 0000 0000 0000 0000 0FCF 0000"
-	$"000F 0FFF FFFF FFFF FFFF FFFF FF0F 0000"
-	$"000F C0C0 C0C0 C0C0 C0C0 C0C0 C0CF 0000"
-	$"000F FFFF FFFF FFFF FFFF FFFF FFFF"
+	$"000FFFFFFFFFFFFFFFFFFF0000000000"
+	$"000F00000000000000000FF000000000"
+	$"000F00000000000000000FCF00000000"
+	$"000FFFFFFFFFFFFFFFFFFFCCF0000000"
+	$"000F00000000000000000FCCCF000000"
+	$"000F00000000000000000FCCCCF00000"
+	$"000FFFFFFFFFFFFFFFFFFFFFFFFF0000"
+	$"000F00000000000000000000000F0000"
+	$"000F00FFFFFFFF000000FFFFF00F0000"
+	$"000FFFCCCCCCCCFFFFFFCCCCFFFF0000"
+	$"000F0FCEEEEECCF0FCCCCCCCF00F0000"
+	$"000F0FCE0D0D0CF0FCCCCCCCF00F0000"
+	$"000FFFCED0D0CCFFFCCCCCCCFFFF0000"
+	$"000F0FCE0D0D0CF0FCCCCCCCCF0F0000"
+	$"000F0FCCC0C0CCF0FCCCCCCCCF0F0000"
+	$"000FFFCCCCCCCCFFFCCCCCCCCFFF0000"
+	$"000F0FCCCCFFFCF0FCCCCCCCCF0F0000"
+	$"000F0FCCCCCCCCF0FCCCCCCCCF0F0000"
+	$"000FFFFFFFFFFFFFFDDDDDDFFFFF0000"
+	$"000F00FCCDDEEF00FDDDDDDF000F0000"
+	$"000F00FFFFFFFF00FFFFFFFF000F0000"
+	$"000F0C0C0C0C0C0C0C0C0C0C0C0F0000"
+	$"000FC0C0C0C0C0C0C0C0C0C0C0CF0000"
+	$"000F0FFFFFFFFFFFFFFFFFFFFF0F0000"
+	$"000FCF0000000000000000000FCF0000"
+	$"000F0F0F00F00F0F00F000F00F0F0000"
+	$"000FCF0F0F0F0F0F0F0F0F0F0FCF0000"
+	$"000F0F0F00F00F0F00F000F00F0F0000"
+	$"000FCF0000000000000000000FCF0000"
+	$"000F0FFFFFFFFFFFFFFFFFFFFF0F0000"
+	$"000FC0C0C0C0C0C0C0C0C0C0C0CF0000"
+	$"000FFFFFFFFFFFFFFFFFFFFFFFFF"
 };
 resource 'icl8' (130, purgeable) {
-	$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
-	$"FFFF FFFF FFFF 0000 0000 0000 0000 0000"
-	$"0000 00FF 0000 0000 0000 0000 0000 0000"
-	$"0000 0000 00FF FF00 0000 0000 0000 0000"
-	$"0000 00FF 0000 0000 0000 0000 0000 0000"
-	$"0000 0000 00FF F6FF 0000 0000 0000 0000"
-	$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
-	$"FFFF FFFF FFFF F6F6 FF00 0000 0000 0000"
-	$"0000 00FF 0000 0000 0000 0000 0000 0000"
-	$"0000 0000 00FF F6F6 F6FF 0000 0000 0000"
-	$"0000 00FF 0000 0000 0000 0000 0000 0000"
-	$"0000 0000 00FF F6F6 F6F6 FF00 0000 0000"
-	$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
-	$"FFFF FFFF FFFF FFFF FFFF FFFF 0000 0000"
-	$"0000 00FF 0000 0000 0000 0000 0000 0000"
-	$"0000 0000 0000 0000 0000 00FF 0000 0000"
-	$"0000 00FF 0000 FFFF FFFF FFFF FFFF 0000"
-	$"0000 0000 FFFF FFFF FF00 00FF 0000 0000"
-	$"0000 00FF FFFF 2B2B 2B2B 2B2B 2B2B FFFF"
-	$"FFFF FFFF 2B2B 2B2B FFFF FFFF 0000 0000"
-	$"0000 00FF 00FF 2BFC FCFC FCFC F82B FF00"
-	$"FF2B 2B2B 2B2B 2B2B FF00 00FF 0000 0000"
-	$"0000 00FF 00FF 2BFC 2A2A 2A2A 002B FF00"
-	$"FF2B 2B2B 2B2B 2B2B FF00 00FF 0000 0000"
-	$"0000 00FF FFFF 2BFC 2A2A 2A2A 002B FFFF"
-	$"FF2B 2B2B 2B2B 2B2B FFFF FFFF 0000 0000"
-	$"0000 00FF 00FF 2BFC 2A2A 2A2A 002B FF00"
-	$"FF2B 2B2B 2B2B 2B2B 2BFF 00FF 0000 0000"
-	$"0000 00FF 00FF 2BF8 0000 0000 002B FF00"
-	$"FF2B 2B2B 2B2B 2B2B 2BFF 00FF 0000 0000"
-	$"0000 00FF FFFF 2B2B 2B2B 2B2B 2B2B FFFF"
-	$"FF2B 2B2B 2B2B 2B2B 2BFF FFFF 0000 0000"
-	$"0000 00FF 00FF 2B2B 2B2B FFFF FF2B FF00"
-	$"FF2B 2B2B 2B2B 2B2B 2BFF 00FF 0000 0000"
-	$"0000 00FF 00FF 2B2B 2B2B 2B2B 2B2B FF00"
-	$"FF2B 2B2B 2B2B 2B2B 2BFF 00FF 0000 0000"
-	$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
-	$"FFF9 F9F9 F9F9 F9FF FFFF FFFF 0000 0000"
-	$"0000 00FF 0000 FFF7 F8F9 FAFB FCFF 0000"
-	$"FFF9 F9F9 F9F9 F9FF 0000 00FF 0000 0000"
-	$"0000 00FF 0000 FFFF FFFF FFFF FFFF 0000"
-	$"FFFF FFFF FFFF FFFF 0000 00FF 0000 0000"
-	$"0000 00FF F5F5 F5F5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 00FF F5F5 F5F5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 00FF F5FF FFFF FFFF FFFF FFFF FFFF"
-	$"FFFF FFFF FFFF FFFF FFFF F5FF 0000 0000"
-	$"0000 00FF F5FF 0000 0000 0000 0000 0000"
-	$"0000 0000 0000 0000 00FF F5FF 0000 0000"
-	$"0000 00FF F5FF 00FF 0000 FF00 00FF 00FF"
-	$"0000 FF00 0000 FF00 00FF F5FF 0000 0000"
-	$"0000 00FF F5FF 00FF 00FF 00FF 00FF 00FF"
-	$"00FF 00FF 00FF 00FF 00FF F5FF 0000 0000"
-	$"0000 00FF F5FF 00FF 0000 FF00 00FF 00FF"
-	$"0000 FF00 0000 FF00 00FF F5FF 0000 0000"
-	$"0000 00FF F5FF 0000 0000 0000 0000 0000"
-	$"0000 0000 0000 0000 00FF F5FF 0000 0000"
-	$"0000 00FF F5FF FFFF FFFF FFFF FFFF FFFF"
-	$"FFFF FFFF FFFF FFFF FFFF F5FF 0000 0000"
-	$"0000 00FF F5F5 F5F5 F5F5 F5F5 F5F5 F5F5"
-	$"F5F5 F5F5 F5F5 F5F5 F5F5 F5FF 0000 0000"
-	$"0000 00FF FFFF FFFF FFFF FFFF FFFF FFFF"
-	$"FFFF FFFF FFFF FFFF FFFF FFFF"
+	$"000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000"
+	$"000000FF0000000000000000000000000000000000FFFF000000000000000000"
+	$"000000FF0000000000000000000000000000000000FFF6FF0000000000000000"
+	$"000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF6F6FF00000000000000"
+	$"000000FF0000000000000000000000000000000000FFF6F6F6FF000000000000"
+	$"000000FF0000000000000000000000000000000000FFF6F6F6F6FF0000000000"
+	$"000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF00000000"
+	$"000000FF0000000000000000000000000000000000000000000000FF00000000"
+	$"000000FF0000FFFFFFFFFFFFFFFF000000000000FFFFFFFFFF0000FF00000000"
+	$"000000FFFFFF2B2B2B2B2B2B2B2BFFFFFFFFFFFF2B2B2B2BFFFFFFFF00000000"
+	$"000000FF00FF2BFCFCFCFCFCF82BFF00FF2B2B2B2B2B2B2BFF0000FF00000000"
+	$"000000FF00FF2BFC2A2A2A2A002BFF00FF2B2B2B2B2B2B2BFF0000FF00000000"
+	$"000000FFFFFF2BFC2A2A2A2A002BFFFFFF2B2B2B2B2B2B2BFFFFFFFF00000000"
+	$"000000FF00FF2BFC2A2A2A2A002BFF00FF2B2B2B2B2B2B2B2BFF00FF00000000"
+	$"000000FF00FF2BF800000000002BFF00FF2B2B2B2B2B2B2B2BFF00FF00000000"
+	$"000000FFFFFF2B2B2B2B2B2B2B2BFFFFFF2B2B2B2B2B2B2B2BFFFFFF00000000"
+	$"000000FF00FF2B2B2B2BFFFFFF2BFF00FF2B2B2B2B2B2B2B2BFF00FF00000000"
+	$"000000FF00FF2B2B2B2B2B2B2B2BFF00FF2B2B2B2B2B2B2B2BFF00FF00000000"
+	$"000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFF9F9F9F9F9F9FFFFFFFFFF00000000"
+	$"000000FF0000FFF7F8F9FAFBFCFF0000FFF9F9F9F9F9F9FF000000FF00000000"
+	$"000000FF0000FFFFFFFFFFFFFFFF0000FFFFFFFFFFFFFFFF000000FF00000000"
+	$"000000FFF5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5FF00000000"
+	$"000000FFF5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5FF00000000"
+	$"000000FFF5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5FF00000000"
+	$"000000FFF5FF00000000000000000000000000000000000000FFF5FF00000000"
+	$"000000FFF5FF00FF0000FF0000FF00FF0000FF000000FF0000FFF5FF00000000"
+	$"000000FFF5FF00FF00FF00FF00FF00FF00FF00FF00FF00FF00FFF5FF00000000"
+	$"000000FFF5FF00FF0000FF0000FF00FF0000FF000000FF0000FFF5FF00000000"
+	$"000000FFF5FF00000000000000000000000000000000000000FFF5FF00000000"
+	$"000000FFF5FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF5FF00000000"
+	$"000000FFF5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5F5FF00000000"
+	$"000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 };
 
 
@@ -249,7 +305,7 @@ resource 'icl8' (130, purgeable) {
 /* Menu bar */
 
 resource 'MBAR' (MBAR_Main, preload) {
-    { mApple, mFile }
+    { mApple, mFile, mEdit }
 };
 
 resource 'MENU' (mApple, preload) {
@@ -278,6 +334,23 @@ resource 'MENU' (mFile, preload) {
     }
 };
 
+resource 'MENU' (mEdit, preload) {
+    mEdit,
+    textMenuProc,
+    0b11111111111111111111111111111101,
+    enabled,
+    "Edit",
+    {
+	"Undo",			noicon, "Z",   nomark, plain,
+	"-",			noicon, nokey, nomark, plain,
+	"Cut",			noicon, "X",   nomark, plain,
+	"Copy",			noicon, "C",   nomark, plain,
+	"Paste",		noicon, "V",   nomark, plain,
+	"Clear",		noicon, nokey, nomark, plain,
+	"Select All",		noicon, "A",   nomark, plain,
+    }
+};
+
 /* Fatal error box.  Stolen from the Finder. */
 
 resource 'ALRT' (wFatal, "fatalbox", purgeable) {
@@ -322,12 +395,18 @@ resource 'WIND' (wTerminal, "terminal", purgeable) {
     staggerParentWindowScreen
 };
 
+resource 'CNTL' (cVScroll, "vscroll", purgeable) {
+    { 0, 0, 48, 16 },
+    0, invisible, 0, 0,
+    scrollBarProc, 0, ""
+};
+
 /* "About" box */
 
 resource 'DLOG' (wAbout, "about", purgeable) {
-    { 0, 0, 120, 186 },
+    { 0, 0, 120, 240 },
     noGrowDocProc,
-    visible,
+    invisible,
     goAway,
     wAbout,		/* RefCon -- identifies the window to PuTTY */
     wAbout,		/* DITL ID */
@@ -335,28 +414,32 @@ resource 'DLOG' (wAbout, "about", purgeable) {
     alertPositionMainScreen
 };
 
+resource 'dlgx' (wAbout, "about", purgeable) {
+    versionZero {
+	kDialogFlagsUseThemeBackground | kDialogFlagsUseThemeControls
+    }
+};
+
 resource 'DITL' (wAbout, "about", purgeable) {
     {
-	{ 87, 116, 107, 173 },
-	Button { enabled, "Close" },
-	{ 87, 13, 107, 103 },
+	{ 87, 13, 107, 227 },
 	Button { enabled, "View Licence" },
-	{ 13, 13, 29, 173 },
+	{ 13, 13, 29, 227 },
 	StaticText { disabled, "PuTTY"},
-	{ 42, 13, 74, 173 },
-	StaticText { disabled,"Experimantal Mac Port\n© 1997-9 Simon Tatham"},
+	{ 42, 13, 74, 227 },
+	StaticText { disabled, "Some version or other\n"
+			       "Copyright © 1997-9 Simon Tatham"},
     }
 };
 
 /* Licence box */
 
-resource 'DLOG' (wLicence, "licence", purgeable) {
+resource 'WIND' (wLicence, "licence", purgeable) {
     { 0, 0, 300, 300 },
     noGrowDocProc,
     visible,
     goAway,
     wLicence,
-    wLicence,
     "PuTTY Licence",
     alertPositionParentWindowScreen
 };
@@ -367,8 +450,10 @@ type 'TEXT' {
 
 resource 'TEXT' (wLicence, "licence", purgeable) {
     "Copyright © 1997-9 Simon Tatham\n"
-    "Portions copyright Gary S. Brown and Eric Young\n\n"
-    
+    "Portions copyright © 1999 Ben Harris\n"
+    "Portions copyright © 1993 Eric Young\n"
+    "Portions copyright © 1986 Gary S. Brown\n"
+    "\n"    
     "Permission is hereby granted, free of charge, to any person "
     "obtaining a copy of this software and associated documentation "
     "files (the \"Software\"), to deal in the Software without "
@@ -391,21 +476,283 @@ resource 'TEXT' (wLicence, "licence", purgeable) {
     "SOFTWARE."
 };
 
-#if 0
-resource 'DITL' (wLicence, "licence", purgeable) {
+/* Default Preferences */
+
+type PREF_wordness_type {
+    wide array [256] {
+        integer;
+    };
+};
+
+/*
+ * This resource collects together the various short settings we need.
+ * Each area of the system gets its own longword for flags, and then
+ * we have the other settings.  Strings are stored as two shorts --
+ * the id of a STR# or STR resource, and the index if it's a STR# (0
+ * for STR).
+ */
+
+type 'pSET' {
+    /* Basic boolean options */
+    boolean dont_close_on_exit, close_on_exit;
+    align long;
+    /* SSH options */
+    boolean use_pty, no_pty;
+    align long;
+    /* Telnet options */
+    boolean bsd_environ, rfc_environ;
+    align long;
+    /* Keyboard options */
+    boolean backspace, delete;
+    boolean std_home_end, rxvt_home_end;
+    boolean std_funkeys, linux_funkeys;
+    boolean normal_cursor, app_cursor;
+    boolean normal_keypad, app_keypad;
+    align long;
+    /* Terminal options */
+    boolean no_dec_om, dec_om;
+    boolean no_auto_wrap, auto_wrap;
+    boolean no_auto_cr, auto_cr;
+    boolean use_icon_name, win_name_always;
+    align long;
+    /* Colour options */
+    boolean bold_font, bold_colour;
+    align long;
+    /* Selection options */
+    boolean no_implicit_copy, implicit_copy;
+    align long;
+    /* Non-boolean options */
+    integer; integer;		/* host */
+    longint;			/* port */
+    longint prot_telnet = 0, prot_ssh = 1; /* protocol */
+    integer; integer;		/* termtype */
+    integer; integer;		/* termspeed */
+    integer; integer;		/* environmt */
+    integer; integer;		/* username */
+    longint;			/* width */
+    longint;			/* height */
+    longint;			/* save_lines */
+    integer; unsigned integer;	/* font */
+    longint;			/* font_height */
+    integer;			/* 'pltt' for colours */
+    integer;			/* 'wORD' for wordness */
+    integer;			/* meta modifiers */
+};
+
+resource 'pSET' (PREF_settings, "settings", purgeable) {
+    close_on_exit,
+    use_pty,
+    rfc_environ,
+    delete,
+    std_home_end,
+    std_funkeys,
+    normal_cursor,
+    normal_keypad,
+    no_dec_om,
+    auto_wrap,
+    no_auto_cr,
+    use_icon_name,
+    bold_font,
+    no_implicit_copy,
+#define PREF_strings 1024
+    PREF_strings, 1,		/* host 'STR#' */
+    23, prot_telnet,		/* port, protocol */
+    PREF_strings, 2,		/* termtype 'STR#' */
+    PREF_strings, 3,		/* termspeed 'STR#' */
+    PREF_strings, 4,		/* environmt 'STR#' */
+    PREF_strings, 5,		/* username */
+    80, 24, 200,    		/* width, height, save_lines */
+    PREF_strings, 6,		/* font 'STR#' */
+    9,				/* font_height */
+#define PREF_pltt 1024
+    PREF_pltt,			/* colours 'pltt' */
+#define PREF_wordness 1024
+    PREF_wordness,		/* wordness 'wORD */
+    0x900,			/* meta modifiers (cmd+option) */
+};
+
+resource 'STR#' (PREF_strings, "strings", purgeable) {
     {
-	{ 13, 23, 287, 277 },
-	Picture { enabled, wLicence }
+	"nowhere.loopback.edu",
+	"xterm",
+	"38400,38400",
+	"\000",
+	"",
+	"Monaco",
     }
 };
 
-resource 'PICT' (wLicence, "licence", purgeable) {
-    { 0, 0, 274, 254 },
-     VersionTwo {
- 	{
-	    LongText { { 16, 0 }, "Copyright © 1997-9 Simon Tatham" },
- 	    LongText { { 32, 0 }, "Portions copyright Gary S. Brown and Eric Young" },
- 	}
+resource PREF_wordness_type (PREF_wordness, "wordness", purgeable) {
+    {
+	0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+	0,1,2,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,
+	1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,2,
+	1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,
+	1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+	1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+	2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,2,2,2,
+	2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,2,2,2,2,2,2,2,2
     }
 };
-#endif
+
+/*
+ * and _why_ isn't this provided for us?
+ */
+type 'TMPL' {
+    array {
+	pstring;		/* Item name */
+	literal longint;	/* Item type */
+    };
+};
+
+resource 'TMPL' (128, "pSET") {
+    {
+	"Close on exit", 'BBIT',
+	"", 'BBIT', /* Must pad to a multiple of 8 */
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'ALNG',
+	"No PTY", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'ALNG',
+	"RFC OLD-ENVIRON", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'ALNG',
+	"Delete key sends delete", 'BBIT',
+	"rxvt home/end", 'BBIT',
+	"Linux function keys", 'BBIT',
+	"Application cursor keys", 'BBIT',
+	"Application keypad", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'ALNG',
+	"Use colour for bold", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'ALNG',
+	"Implicit copy", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'BBIT',
+	"", 'ALNG',
+	"Host STR# ID", 'DWRD',
+	"Host STR# index", 'DWRD',
+	"Port", 'DLNG',
+	"Protocol", 'DLNG',
+	"Termtype STR# ID", 'DWRD',
+	"Termtype STR# index", 'DWRD',
+	"Termspeed STR# ID", 'DWRD',
+	"Termspeed STR# index", 'DWRD',
+	"Environ STR# ID", 'DWRD',
+	"Environ STR# index", 'DWRD',
+	"Username STR# ID", 'DWRD',
+	"Username STR# index", 'DWRD',
+	"Terminal width", 'DLNG',
+	"Terminal height", 'DLNG',
+	"Save lines", 'DLNG',
+	"Font STR# ID", 'DWRD',
+	"Font STR# index", 'DWRD',
+	"Font size", 'DLNG',
+	"pltt ID", 'DWRD',
+	"wORD ID", 'DWRD',
+	"meta modifiers", 'HWRD',
+    };
+};
+
+
+/*
+ * *mutter*  It might be nice if Apple could actually put all the flags in
+ * Palettes.r.
+ */
+
+#define pmCourteous	0x0000
+#define pmDithered	0x0001
+#define pmTolerant	0x0002
+#define pmAnimated	0x0004
+#define pmExplicit	0x0008
+#define pmWhite		0x0010
+#define pmBlack		0x0020
+#define pmInhibitG2	0x0100
+#define pmInhibitC2	0x0200
+#define pmInhibitG4	0x0400
+#define pmInhibitC4	0x0800
+#define pmInhibitG8	0x1000
+#define pmInhibitC8	0x2000
+
+#define PM_BASIC (pmTolerant | pmInhibitG4 | pmInhibitG8)
+#define PM_NORMAL (PM_BASIC | pmInhibitG2 | pmInhibitC2)
+
+resource 'pltt' (PREF_pltt, purgeable) {
+    {
+	0x0000, 0x0000, 0x0000, PM_NORMAL, 0x2000,	/* black */
+	0x5555, 0x5555, 0x5555, PM_NORMAL, 0x2000,	/* bright black */
+	0xbbbb, 0x0000, 0x0000, PM_NORMAL, 0x2000,	/* red */
+	0xffff, 0x5555, 0x5555, PM_NORMAL, 0x2000,	/* bright red */
+	0x0000, 0xbbbb, 0x0000, PM_NORMAL, 0x2000,	/* green */
+	0x5555, 0xffff, 0x5555, PM_NORMAL, 0x2000,	/* bright green */
+	0xbbbb, 0xbbbb, 0x0000, PM_NORMAL, 0x2000,	/* yellow */
+	0xffff, 0xffff, 0x0000, PM_NORMAL, 0x2000,	/* bright yellow */
+	0x0000, 0x0000, 0xbbbb, PM_NORMAL, 0x2000,	/* blue */
+	0x5555, 0x5555, 0xffff, PM_NORMAL, 0x2000,	/* bright blue */
+	0xbbbb, 0x0000, 0xbbbb, PM_NORMAL, 0x2000,	/* magenta */
+	0xffff, 0x5555, 0xffff, PM_NORMAL, 0x2000,	/* bright magenta */
+	0x0000, 0xbbbb, 0xbbbb, PM_NORMAL, 0x2000,	/* cyan */
+	0x5555, 0xffff, 0xffff, PM_NORMAL, 0x2000,	/* bright cyan */
+	0xbbbb, 0xbbbb, 0xbbbb, PM_NORMAL, 0x2000,	/* white */
+	0xffff, 0xffff, 0xffff, PM_NORMAL, 0x2000,	/* bright white */
+	0xbbbb, 0xbbbb, 0xbbbb, PM_BASIC,  0x2000,	/* default fg */
+	0xffff, 0xffff, 0xffff, PM_BASIC,  0x2000,	/* default bold fg */
+	0x0000, 0x0000, 0x0000, PM_BASIC,  0x2000,	/* default bg */
+	0x5555, 0x5555, 0x5555, PM_NORMAL, 0x2000,	/* default bold bg */
+	0x0000, 0x0000, 0x0000, PM_NORMAL, 0x2000,	/* cursor bg */
+	0x0000, 0x0000, 0x0000, PM_NORMAL, 0x2000,	/* bold cursor bg */
+	0x0000, 0xffff, 0x0000, PM_BASIC,  0x2000,	/* cursor fg */
+	0x0000, 0xffff, 0x0000, PM_NORMAL, 0x2000,	/* bold cursor fg */
+    }
+};
+
+read 'pTST' (128, "test data", purgeable) "fragment";
+
+type 'pMAP' {
+    hex string;
+};
+
+resource 'pMAP' (128, "Latin-1 G1 -> Mac OS Roman") {
+    $"20 c1 a2 a3 db b4 00 a4 ac a9 bb c7 c2 00 a8 f8"
+    $"a1 b1 00 00 ab b5 a6 e1 fc 00 bc c8 00 00 00 c0"
+    $"cb e7 e5 cc 80 81 ae 82 e9 83 e6 e8 ed ea eb ec"
+    $"00 84 f1 ee ef cd 85 00 af f4 f2 f3 86 00 00 a7"
+    $"88 87 89 8b 8a 8c be 8d 8f 8e 90 91 93 92 94 95"
+    $"00 96 98 97 99 9b 9a d6 bf 9d 9c 9e 9f 00 00 D8"
+};
+
+resource 'pMAP' (129, "DEC line drawing -> Mac OS VT100") {
+    $"d7 bd 09 0c 0d 0a a1 b1 00 0b d2 d3 d4 d5 da e2"
+    $"e3 e4 f5 f6 f7 f8 f9 fa fb b2 b3 b9 ad a3 e1"
+};
\ No newline at end of file