Use c2pstrcpy() rather than silly sprintf() tricks.

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

diff --git a/mac/mac_res.r b/mac/mac_res.r
index c19aeda..ee34fe1 100644 (file)
--- a/mac/mac_res.r
+++ b/mac/mac_res.r
@@ -1,6 +1,6 @@
-/* $Id: mac_res.r,v 1.3 2002/12/08 22:09:47 ben Exp $ */
+/* $Id: mac_res.r,v 1.11 2003/01/09 19:27:29 ben Exp $ */

 /*
 /*

- * Copyright (c) 1999 Ben Harris
+ * Copyright (c) 1999, 2002 Ben Harris

  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person
  * All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person


@@ -27,9 +27,16 @@
 
 /* PuTTY resources */
 
 
 /* PuTTY resources */
 

-#include "Types.r"
-#include "Dialogs.r"
-#include "Palettes.r"
+/*
+ * The space after the # for system includes is to stop mkfiles.pl
+ * trying to chase them (Rez doesn't support the angle-bracket
+ * syntax).
+ */
+
+# include "Types.r"
+# include "Dialogs.r"
+# include "Palettes.r"
+# include "Script.r"

 
 /* Get resource IDs we share with C code */
 #include "macresid.h"
 
 /* Get resource IDs we share with C code */
 #include "macresid.h"


@@ -50,7 +57,7 @@ resource 'SIZE' (-1) {
     reserved,
     ignoreSuspendResumeEvents,
     reserved,
     reserved,
     ignoreSuspendResumeEvents,
     reserved,

-    cannotBackground,
+    canBackground,

     needsActivateOnFGSwitch,
     backgroundAndForeground,
     dontGetFrontClicks,
     needsActivateOnFGSwitch,
     backgroundAndForeground,
     dontGetFrontClicks,


@@ -193,17 +200,56 @@ resource 'icl8' (128, purgeable) {
        $"00FF2BF7F8F9FAFAFBFBFCFCFDFF000000000000000000000000000000000000"
        $"00FFFFFFFFFFFFFFFFFFFFFFFFFF"
 };
        $"00FF2BF7F8F9FAFAFBFBFCFCFDFF000000000000000000000000000000000000"
        $"00FFFFFFFFFFFFFFFFFFFFFFFFFF"
 };

+

 resource 'ics#' (128, purgeable) {
        {       /* array: 2 elements */
                /* [1] */
 resource 'ics#' (128, purgeable) {
        {       /* array: 2 elements */
                /* [1] */

-               $"00FF 0081 00BD 00A5 00A5 00BD FF81 818D"
-               $"BD81 A57E A500 BD00 8100 8D00 8100 7E",
+               $"00FF 0081 008D 0035 00D5 0325 F441 822D"
+               $"B4C1 AB3E AC00 B100 8100 8D00 8100 7E",

                /* [2] */
                /* [2] */

-               $"00FF 00FF 00FF 00FF 00FF 00FF FFFF FFFF"
+               $"00FF 00FF 00FF 00FF 00FF 03FF FFFF FFFF"

                $"FFFF FF7E FF00 FF00 FF00 FF00 FF00 7E"
        }
 };
 
                $"FFFF FF7E FF00 FF00 FF00 FF00 FF00 7E"
        }
 };
 

+resource 'ics4' (128) {
+       $"00000000FFFFFFFF"
+       $"00000000FCCCCCCF"
+       $"00000000FCEEEECF"
+       $"00000000FCFFC0CF"
+       $"00000000FF1FC0CF"
+       $"000000FF11F000CF"
+       $"FFFFFF111FCCCCCF"
+       $"FCCCCCF111FCFFCF"
+       $"FCEEEF11FFCCCCCF"
+       $"FCECF1FF0FFFFFF0"
+       $"FCECFFCF00000000"
+       $"FCE000CF00000000"
+       $"FCCCCCCF00000000"
+       $"FCCCFFCF00000000"
+       $"FCCCCCCF00000000"
+       $"0FFFFFF0"
+};
+
+resource 'ics8' (128) {
+       $"0000000000000000FFFFFFFFFFFFFFFF"
+       $"0000000000000000FF2B2B2B2B2B2BFF"
+       $"0000000000000000FF2BFCFCFCFC2BFF"
+       $"0000000000000000FF2BFFFF2A002BFF"
+       $"0000000000000000FFFF05FF2A002BFF"
+       $"000000000000FFFF0505FF0000002BFF"
+       $"FFFFFFFFFFFF050505FF2B2B2B2B2BFF"
+       $"FF2B2B2B2B2BFF050505FF2BFFFF2BFF"
+       $"FF2BFCFCFCFF0505FFFF2B2B2B2B2BFF"
+       $"FF2BFC2AFF05FFFF00FFFFFFFFFFFF00"
+       $"FF2BFC2AFFFF2BFF0000000000000000"
+       $"FF2BFC0000002BFF0000000000000000"
+       $"FF2B2B2B2B2B2BFF0000000000000000"
+       $"FF2B2B2BFFFF2BFF0000000000000000"
+       $"FF2B2B2B2B2B2BFF0000000000000000"
+       $"00FFFFFFFFFFFF"
+};
+

 /* Known hosts icon */
 resource 'ICN#' (130, purgeable) {
        {       /* array: 2 elements */
 /* Known hosts icon */
 resource 'ICN#' (130, purgeable) {
        {       /* array: 2 elements */


@@ -297,6 +343,53 @@ resource 'icl8' (130, purgeable) {
        $"000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 };
 
        $"000000FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFF"
 };
 

+resource 'vers' (1, purgeable) {
+    /* XXX This needs to be updated for each new version */
+    0x00, 0x53,
+#ifdef RELEASE
+    beta,
+#else
+    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) {
+    /* XXX This needs to be updated for each new version */
+    0x00, 0x53,
+#ifdef RELEASE
+    beta,
+#else
+    development,
+#endif
+    0, /* No prerelease version */
+    verBritain,
+#ifdef RELEASESTR
+    RELEASESTR,
+    "PuTTY " RELEASESTR,
+#else
+#ifdef SNAPSHOTSTR
+    SNAPSHOTSTR,
+    "PuTTY snapshot " SNAPSHOTSTR,
+#else
+    "unknown",
+    "PuTTY",
+#endif
+#endif
+};

 
 /*
  * Internal resources
 
 /*
  * Internal resources


@@ -315,7 +408,7 @@ resource 'MENU' (mApple, preload) {
     enabled,
     apple,
     {
     enabled,
     apple,
     {

-       "About PuTTYÉ",         noicon, nokey, nomark, plain,
+       "About PuTTY\0xc9",     noicon, nokey, nomark, plain,

        "-",                    noicon, nokey, nomark, plain,
     }
 };
        "-",                    noicon, nokey, nomark, plain,
     }
 };


@@ -323,11 +416,12 @@ resource 'MENU' (mApple, preload) {
 resource 'MENU' (mFile, preload) {
     mFile,
     textMenuProc,
 resource 'MENU' (mFile, preload) {
     mFile,
     textMenuProc,

-    0b11111111111111111111111111111011,
+    0b11111111111111111111111111110111,

     enabled,
     enabled,

-    "File",
+    "Session",

     {
     {

-       "New Session",          noicon, "N",   nomark, plain,
+       "New",                  noicon, "N",   nomark, plain,
+       "Open\0xc9",            noicon, "O",   nomark, plain,

        "Close",                noicon, "W",   nomark, plain,
        "-",                    noicon, nokey, nomark, plain,
        "Quit",                 noicon, "Q",   nomark, plain,
        "Close",                noicon, "W",   nomark, plain,
        "-",                    noicon, nokey, nomark, plain,
        "Quit",                 noicon, "Q",   nomark, plain,


@@ -401,6 +495,32 @@ resource 'CNTL' (cVScroll, "vscroll", purgeable) {
     scrollBarProc, 0, ""
 };
 
     scrollBarProc, 0, ""
 };
 

+/* Settings dialogue */
+
+resource 'DLOG' (wSettings, "settings", purgeable) {
+    { 0, 0, 46, 240 },
+    noGrowDocProc,
+    invisible,
+    goAway,
+    wSettings,
+    wSettings,
+    "Settings",
+    staggerParentWindowScreen
+};
+
+resource 'dlgx' (wSettings, "settings", purgeable) {
+    versionZero {
+       kDialogFlagsUseThemeBackground | kDialogFlagsUseThemeControls
+    }
+};
+
+resource 'DITL' (wSettings, "settings", purgeable) {
+    {
+       { 13, 13, 33, 227 },
+       Button { enabled, "Open" },
+    }
+};        
+

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


@@ -449,7 +569,7 @@ type 'TEXT' {
 };
 
 resource 'TEXT' (wLicence, "licence", purgeable) {
 };
 
 resource 'TEXT' (wLicence, "licence", purgeable) {

-    "PuTTY is copyright 1997-2001 Simon Tatham.\n"
+    "PuTTY is copyright 1997-2003 Simon Tatham.\n"

     "\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,"