Add a level of indirection to make it rather easier to work out which of a

[u/mdw/putty] / mac / mac.c

diff --git a/mac/mac.c b/mac/mac.c
index 34a1d2b..2c4794d 100644 (file)
--- a/mac/mac.c
+++ b/mac/mac.c
@@ -1,4 +1,4 @@
-/* $Id: mac.c,v 1.42 2003/02/01 23:42:30 ben Exp $ */
+/* $Id: mac.c,v 1.45 2003/02/04 23:39:26 ben Exp $ */
 /*
  * Copyright (c) 1999 Ben Harris
  * All rights reserved.
@@ -43,6 +43,7 @@
 #include <DiskInit.h>
 #include <Gestalt.h>
 #include <LowMem.h>
+#include <Navigation.h>
 #include <Resources.h>
 #include <Script.h>
 #include <TextCommon.h>
@@ -175,6 +176,11 @@ static void mac_startup(void) {
        mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
        DisposeHandle((Handle)ti);
     }
+    /* Navigation Services? */
+    if (NavServicesAvailable())
+       mac_gestalts.navsvers = NavLibraryVersion();
+    else
+       mac_gestalts.navsvers = 0;
 
     sk_init();
 
@@ -450,24 +456,15 @@ static void mac_updatelicence(WindowPtr window)
 
 /*
  * Work out what kind of window we're dealing with.
- * Concept shamelessly nicked from SurfWriter.
  */
-static int mac_windowtype(WindowPtr window) {
-    int kind;
-    long refcon;
-
-    if (window == NULL)
-       return wNone;
-    kind = GetWindowKind(window);
-    if (kind < 0)
+static int mac_windowtype(WindowPtr window)
+{
+
+#if !TARGET_API_MAC_CARBON
+    if (GetWindowKind(window) < 0)
        return wDA;
-    if (GetWVariant(window) == zoomDocProc)
-       return wTerminal;
-    refcon = GetWRefCon(window);
-    if (refcon < 1024)
-       return refcon;
-    else
-       return wSettings;
+#endif
+    return ((WinInfo *)GetWRefCon(window))->wtype;
 }
 
 /*
@@ -507,19 +504,19 @@ static void mac_menucommand(long result) {
     window = FrontWindow();
     /* Things which do the same whatever window we're in. */
     switch (menu) {
-#if !TARGET_API_MAC_CARBON
       case mApple:
         switch (item) {
           case iAbout:
            mac_openabout();
             goto done;
+#if !TARGET_API_MAC_CARBON
           default:
             GetMenuItemText(GetMenuHandle(mApple), item, da);
             OpenDeskAcc(da);
             goto done;
+#endif
         }
         break;
-#endif
       case mFile:
         switch (item) {
           case iNew:
@@ -562,12 +559,17 @@ static void mac_openabout(void) {
     VersRecHndl vers;
     Rect box;
     StringPtr longvers;
+    WinInfo *wi;
 
     if (windows.about)
        SelectWindow(windows.about);
     else {
        windows.about =
            GetDialogWindow(GetNewDialog(wAbout, NULL, (WindowPtr)-1));
+       wi = smalloc(sizeof(*wi));
+       wi->s = NULL;
+       wi->wtype = wAbout;
+       SetWRefCon(windows.about, (long)wi);
        vers = (VersRecHndl)Get1Resource('vers', 1);
        if (vers != NULL && *vers != NULL) {
            longvers = (*vers)->shortVersion + (*vers)->shortVersion[0] + 1;
@@ -581,11 +583,16 @@ static void mac_openabout(void) {
 }
 
 static void mac_openlicence(void) {
+    WinInfo *wi;
 
     if (windows.licence)
        SelectWindow(windows.licence);
     else {
        windows.licence = GetNewWindow(wLicence, NULL, (WindowPtr)-1);
+       wi = smalloc(sizeof(*wi));
+       wi->s = NULL;
+       wi->wtype = wLicence;
+       SetWRefCon(windows.licence, (long)wi);
        ShowWindow(windows.licence);
     }
 }
@@ -595,7 +602,7 @@ static void mac_closewindow(WindowPtr window) {
     switch (mac_windowtype(window)) {
 #if !TARGET_API_MAC_CARBON
       case wDA:
-       CloseDeskAcc(((WindowPeek)window)->windowKind);
+       CloseDeskAcc(GetWindowKind(window));
        break;
 #endif
       case wTerminal:
@@ -621,7 +628,6 @@ static void mac_zoomwindow(WindowPtr window, short part) {
  * Make the menus look right before the user gets to see them.
  */
 #if TARGET_API_MAC_CARBON
-/* XXX Is this good enough?  What about Carbon on OS 8.1? */
 #define EnableItem EnableMenuItem
 #define DisableItem DisableMenuItem
 #endif