I think the Carbon build now works well enough to be worth turning on by

[u/mdw/putty] / mac / mac_res.r

diff --git a/mac/mac_res.r b/mac/mac_res.r
index 2668b3f..965b715 100644 (file)
--- a/mac/mac_res.r
+++ b/mac/mac_res.r
@@ -1,4 +1,4 @@
-/* $Id: mac_res.r,v 1.22 2003/01/25 14:09:47 ben Exp $ */
+/* $Id: mac_res.r,v 1.28 2003/02/23 11:58:59 ben Exp $ */

 /*
  * Copyright (c) 1999, 2002 Ben Harris
  * All rights reserved.
 /*
  * Copyright (c) 1999, 2002 Ben Harris
  * All rights reserved.


@@ -41,11 +41,7 @@
 /* Get resource IDs we share with C code */
 #include "macresid.h"
 
 /* Get resource IDs we share with C code */
 #include "macresid.h"
 

-/*
- * Current PuTTY version number.  Minor is in BCD
- */
-#define VERSION_MAJOR 0x00
-#define VERSION_MINOR 0x53
+#include "version.r"

 
 /*
  * Finder-related resources
 
 /*
  * Finder-related resources


@@ -61,10 +57,10 @@ resource 'pTTY' (0, purgeable) {
 
 resource 'SIZE' (-1) {
     reserved,
 
 resource 'SIZE' (-1) {
     reserved,

-    ignoreSuspendResumeEvents,
+    acceptSuspendResumeEvents,

     reserved,
     canBackground,
     reserved,
     canBackground,

-    needsActivateOnFGSwitch,
+    doesActivateOnFGSwitch,

     backgroundAndForeground,
     dontGetFrontClicks,
     ignoreAppDiedEvents,
     backgroundAndForeground,
     dontGetFrontClicks,
     ignoreAppDiedEvents,


@@ -142,6 +138,30 @@ resource 'BNDL' (129, purgeable) {
     };
 };
 
     };
 };
 

+/* Open resource, for the Translation Manager and Navigation Services */
+resource 'open' (open_pTTY) {
+    'pTTY',
+    { 'Sess' }
+};
+
+/* Kind resources, for Navigation services etc. */
+resource 'kind' (128) {
+    'pTTY',
+    verBritain,
+    {
+       'Sess', "PuTTY saved session",
+    }
+};
+
+resource 'kind' (129) {
+    'pTTI',
+    verBritain,
+    {
+       'HKey', "PuTTY host key database",
+       'Seed', "PuTTY random number seed",
+    }
+};
+

 /* Icons, courtesy of DeRez */
 
 /* Application icon */
 /* Icons, courtesy of DeRez */
 
 /* Application icon */


@@ -790,54 +810,6 @@ resource 'ics8' (FREF_Seed) {
        $"00FFFFFFFFFFFFFFFFFFFFFFFFFF"
 };
 
        $"00FFFFFFFFFFFFFFFFFFFFFFFFFF"
 };
 

-resource 'vers' (1, purgeable) {
-#ifdef RELEASE
-    VERSION_MAJOR, VERSION_MINOR,
-    beta,
-#else
-    VERSION_MAJOR, VERSION_MINOR + 1,
-    development,
-#endif
-    0, /* No prerelease version */
-    verBritain,
-#ifdef RELEASESTR
-    RELEASESTR,
-    "Release " RELEASESTR,
-#else
-#ifdef SNAPSHOTSTR
-    SNAPSHOTSTR,
-    "Development snapshot " SNAPSHOTSTR,
-#else
-    "unknown",
-    "Unidentified build, " $$Date " " $$Time,
-#endif
-#endif
-};
-
-resource 'vers' (2, purgeable) {
-#ifdef RELEASE
-    VERSION_MAJOR, VERSION_MINOR,
-    beta,
-#else
-    VERSION_MAJOR, VERSION_MINOR + 1,
-    development,
-#endif
-    0, /* No prerelease version */
-    verBritain,
-#ifdef RELEASESTR
-    RELEASESTR,
-    "PuTTY " RELEASESTR,
-#else
-#ifdef SNAPSHOTSTR
-    SNAPSHOTSTR,
-    "PuTTY snapshot " SNAPSHOTSTR,
-#else
-    "unknown",
-    "PuTTY",
-#endif
-#endif
-};
-

 /*
  * Resources to copy into created files
  */
 /*
  * Resources to copy into created files
  */


@@ -875,7 +847,7 @@ resource 'TMPL' (TMPL_Int, "Int ", purgeable) {
 /* Menu bar */
 
 resource 'MBAR' (MBAR_Main, preload) {
 /* Menu bar */
 
 resource 'MBAR' (MBAR_Main, preload) {

-    { mApple, mFile, mEdit }
+    { mApple, mFile, mEdit, mWindow }

 };
 
 resource 'MENU' (mApple, preload) {
 };
 
 resource 'MENU' (mApple, preload) {


@@ -893,15 +865,17 @@ resource 'MENU' (mApple, preload) {
 resource 'MENU' (mFile, preload) {
     mFile,
     textMenuProc,
 resource 'MENU' (mFile, preload) {
     mFile,
     textMenuProc,

-    0b11111111111111111111111111011111,
+    0b11111111111111111111111101111011,

     enabled,
     "Session",
     {
        "New",                  noicon, "N",   nomark, plain,
        "Open\0xc9",            noicon, "O",   nomark, plain,
     enabled,
     "Session",
     {
        "New",                  noicon, "N",   nomark, plain,
        "Open\0xc9",            noicon, "O",   nomark, plain,

+       "-",                    noicon, nokey, nomark, plain,

        "Close",                noicon, "W",   nomark, plain,
        "Save",                 noicon, "S",   nomark, plain,
        "Save As\0xc9",         noicon, nokey, nomark, plain,
        "Close",                noicon, "W",   nomark, plain,
        "Save",                 noicon, "S",   nomark, plain,
        "Save As\0xc9",         noicon, nokey, nomark, plain,

+       "Duplicate",            noicon, "D",   nomark, plain,

        "-",                    noicon, nokey, nomark, plain,
        "Quit",                 noicon, "Q",   nomark, plain,
     }
        "-",                    noicon, nokey, nomark, plain,
        "Quit",                 noicon, "Q",   nomark, plain,
     }


@@ -924,6 +898,17 @@ resource 'MENU' (mEdit, preload) {
     }
 };
 
     }
 };
 

+resource 'MENU' (mWindow, preload) {
+    mWindow,
+    textMenuProc,
+    0b11111111111111111111111111111111,
+    enabled,
+    "Window",
+    {
+       "Show Event Log",       noicon, nokey, nomark, plain,
+    }
+};
+

 /* Fatal error box.  Stolen from the Finder. */
 
 resource 'ALRT' (wFatal, "fatalbox", purgeable) {
 /* Fatal error box.  Stolen from the Finder. */
 
 resource 'ALRT' (wFatal, "fatalbox", purgeable) {


@@ -1000,6 +985,17 @@ resource 'DITL' (wSettings, "settings", purgeable) {
     }
 };        
 
     }
 };        
 

+/* Event log */
+resource 'WIND' (wEventLog, "event log", purgeable) {
+    { 0, 0, 200, 200 },
+    zoomDocProc,
+    invisible,
+    goAway,
+    0x0,
+    "PuTTY Event Log",
+    staggerParentWindowScreen
+};
+

 /* "About" box */
 
 resource 'DLOG' (wAbout, "about", purgeable) {
 /* "About" box */
 
 resource 'DLOG' (wAbout, "about", purgeable) {


@@ -1052,7 +1048,7 @@ resource 'TEXT' (wLicence, "licence", purgeable) {
     "\n"
     "Portions copyright Robert de Bath, Joris van Rantwijk, Delian"
     "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,"
     "\n"
     "Portions copyright Robert de Bath, Joris van Rantwijk, Delian"
     "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,"

-    "Justin Bradford, and CORE SDI S.A.\n"
+    "Justin Bradford, Ben Harris, and CORE SDI S.A.\n"

     "\n"    
     "Permission is hereby granted, free of charge, to any person "
     "obtaining a copy of this software and associated documentation "
     "\n"    
     "Permission is hereby granted, free of charge, to any person "
     "obtaining a copy of this software and associated documentation "