The "about" box now behaves approximately as it should (though we still don't

have a licence box).

[originally from svn r154]

diff --git a/mac.c b/mac.c
index 882746036d8e57302356255ce288feaf62661837..d90fc37558bd7f8b4a1081dace4f5f1caf057cd2 100644 (file)
--- a/mac.c
+++ b/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.1.2.22 1999/04/01 21:26:44 ben Exp $ */
+/* $Id: mac.c,v 1.1.2.23 1999/04/02 12:58:02 ben Exp $ */
 /*
  * Copyright (c) 1999 Ben Harris
  * All rights reserved.
@@ -40,8 +40,10 @@
 #include <Devices.h>
 #include <DiskInit.h>
 #include <Gestalt.h>
+#include <Resources.h>
 #include <ToolUtils.h>
 
+#include <assert.h>
 #include <limits.h>
 #include <stdarg.h>
 #include <stdlib.h>            /* putty.h needs size_t */
@@ -64,11 +66,13 @@ static void mac_eventloop(void);
 static void mac_event(EventRecord *);
 static void mac_contentclick(WindowPtr, EventRecord *);
 static void mac_growwindow(WindowPtr, EventRecord *);
-static void mac_activatewindow(WindowPtr, Boolean);
+static void mac_activatewindow(WindowPtr, EventRecord *);
+static void mac_activateabout(WindowPtr, EventRecord *);
 static void mac_updatewindow(WindowPtr);
 static void mac_keypress(EventRecord *);
 static int mac_windowtype(WindowPtr);
 static void mac_menucommand(long);
+static void mac_openabout(void);
 static void mac_adjustcursor(RgnHandle);
 static void mac_adjustmenus(void);
 static void mac_closewindow(WindowPtr);
@@ -205,8 +209,7 @@ static void mac_event(EventRecord *event) {
         mac_keypress(event);
         break;
       case activateEvt:
-       mac_activatewindow((WindowPtr)event->message,
-                          (event->modifiers & activeFlag) != 0);
+       mac_activatewindow((WindowPtr)event->message, event);
         break;
       case updateEvt:
         mac_updatewindow((WindowPtr)event->message);
@@ -246,16 +249,34 @@ static void mac_growwindow(WindowPtr window, EventRecord *event) {
     }
 }
 
-static void mac_activatewindow(WindowPtr window, Boolean active) {
+static void mac_activatewindow(WindowPtr window, EventRecord *event) {
+    int active;
 
+    active = (event->modifiers & activeFlag) != 0;
     mac_adjustmenus();
     switch (mac_windowtype(window)) {
       case wTerminal:
        mac_activateterm(window, active);
        break;
+      case wAbout:
+       mac_activateabout(window, event);
+       break;
     }
 }
 
+static void mac_activateabout(WindowPtr window, EventRecord *event) {
+    DialogItemType itemtype;
+    Handle itemhandle;
+    short item;
+    Rect itemrect;
+    int active;
+
+    active = (event->modifiers & activeFlag) != 0;
+    GetDialogItem(window, wiAboutLicence, &itemtype, &itemhandle, &itemrect);
+    HiliteControl((ControlHandle)itemhandle, active ? 0 : 255);
+    DialogSelect(event, &window, &item);
+}
+
 static void mac_updatewindow(WindowPtr window) {
 
     switch (mac_windowtype(window)) {
@@ -328,10 +349,7 @@ static void mac_menucommand(long result) {
       case mApple:
         switch (item) {
           case iAbout:
-           if (windows.about)
-               SelectWindow(windows.about);
-           else
-               windows.about = GetNewDialog(wAbout, NULL, (WindowPtr)-1);
+           mac_openabout();
             goto done;
           default:
             GetMenuItemText(GetMenuHandle(mApple), item, da);
@@ -363,6 +381,28 @@ static void mac_menucommand(long result) {
     HiliteMenu(0);
 }
 
+static void mac_openabout(void) {
+    DialogItemType itemtype;
+    Handle item;
+    VersRecHndl vers;
+    Rect box;
+    StringPtr longvers;
+
+    if (windows.about)
+       SelectWindow(windows.about);
+    else {
+       windows.about = GetNewDialog(wAbout, NULL, (WindowPtr)-1);
+       /* XXX check we're using the right resource file? */
+       vers = (VersRecHndl)GetResource('vers', 1);
+       assert(vers != NULL && *vers != NULL);
+       longvers = (*vers)->shortVersion + (*vers)->shortVersion[0] + 1;
+       GetDialogItem(windows.about, wiAboutVersion, &itemtype, &item, &box);
+       assert(itemtype & kStaticTextDialogItem);
+       SetDialogItemText(item, longvers);
+       ShowWindow(windows.about);
+    }
+}
+
 static void mac_closewindow(WindowPtr window) {
 
     switch (mac_windowtype(window)) {

diff --git a/mac_res.r b/mac_res.r
index 8699f9cdc8194c1001e7c8e9f7d11b515b57dd74..d6183a122b676d7b8c3f7bc571f6c7a965206e21 100644 (file)
--- a/mac_res.r
+++ b/mac_res.r
@@ -1,4 +1,4 @@
-/* $Id: mac_res.r,v 1.1.2.16 1999/04/01 21:27:36 ben Exp $ */
+/* $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.
@@ -404,9 +404,9 @@ resource 'CNTL' (cVScroll, "vscroll", purgeable) {
 /* "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 */
@@ -422,13 +422,13 @@ resource 'dlgx' (wAbout, "about", purgeable) {
 
 resource 'DITL' (wAbout, "about", purgeable) {
     {
-       { 87, 13, 107, 173 },
+       { 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, "Dev 0.45 Mac 0\n"
-                              "© 1997-9 Simon Tatham"},
+       { 42, 13, 74, 227 },
+       StaticText { disabled, "Some version or other\n"
+                              "Copyright © 1997-9 Simon Tatham"},
     }
 };
 

diff --git a/macresid.h b/macresid.h
index dc1ce2a678268b940361053be9c97cc64062f85a..b2a8a2abbe56fe33c8b96ab915ed5db2015a3936 100644 (file)
--- a/macresid.h
+++ b/macresid.h
@@ -1,4 +1,4 @@
-/* $Id: macresid.h,v 1.1.2.5 1999/03/11 21:40:32 ben Exp $ */
+/* $Id: macresid.h,v 1.1.2.6 1999/04/02 12:58:03 ben Exp $ */
 
 /*
  * macresid.h -- Mac resource IDs
@@ -36,6 +36,7 @@
 #define wFatal         128
 #define wAbout         129
 #define wiAboutLicence         1
+#define wiAboutVersion         3
 #define wTerminal      130
 #define wLicence       131
 

diff --git a/version.r b/version.r
index 56e033f1dbf904789530d1e8bab79f253536151a..164830aa900877d50530d376e0e3256e593bf318 100644 (file)
--- a/version.r
+++ b/version.r
@@ -19,6 +19,6 @@ resource 'vers' (1, purgeable) {
     PUTTY_VERS_SHORT_STR,
 
     PUTTY_VERS_LONG_STR " (" BUILD_ARCH ")\n"
-    "Copyright \$a9 Simon Tatham 1997-9",
+    "Copyright \$a9 Simon Tatham 1999",
 };