Loose end from r5031: the Kex panel should only be displayed in

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

diff --git a/mac/macdlg.c b/mac/macdlg.c
index 4f18bdd..544d9a1 100644 (file)
--- a/mac/macdlg.c
+++ b/mac/macdlg.c
@@ -1,4 +1,4 @@
-/* $Id: macdlg.c,v 1.11 2003/02/04 23:39:26 ben Exp $ */
+/* $Id$ */
 /*
  * Copyright (c) 2002 Ben Harris
  * All rights reserved.
@@ -32,7 +32,6 @@
 #include <MacTypes.h>
 #include <AEDataModel.h>
 #include <AppleEvents.h>
-#include <Dialogs.h>
 #include <Navigation.h>
 #include <Resources.h>
 #include <StandardFile.h>
@@ -42,33 +41,81 @@
 #include <string.h>
 
 #include "putty.h"
+#include "dialog.h"
 #include "mac.h"
 #include "macresid.h"
 #include "storage.h"
 
+static void mac_closedlg(WindowPtr);
+static void mac_enddlg(WindowPtr, int);
+
 void mac_newsession(void)
 {
     Session *s;
+    WinInfo *wi;
+    static struct sesslist sesslist;
 
-    /* This should obviously be initialised by other means */
-    s = smalloc(sizeof(*s));
+    s = snew(Session);
     memset(s, 0, sizeof(*s));
     do_defaults(NULL, &s->cfg);
     s->hasfile = FALSE;
 
-    s->settings_window =
-       GetDialogWindow(GetNewDialog(wSettings, NULL, (WindowPtr)-1));
-
-    SetWRefCon(s->settings_window, (long)s);
+    if (HAVE_COLOR_QD())
+       s->settings_window = GetNewCWindow(wSettings, NULL, (WindowPtr)-1);
+    else
+       s->settings_window = GetNewWindow(wSettings, NULL, (WindowPtr)-1);
+
+    get_sesslist(&sesslist, TRUE);
+    s->ctrlbox = ctrl_new_box();
+    setup_config_box(s->ctrlbox, &sesslist, FALSE, 0, 0);
+
+    s->settings_ctrls.data = &s->cfg;
+    s->settings_ctrls.end = &mac_enddlg;
+    macctrl_layoutbox(s->ctrlbox, s->settings_window, &s->settings_ctrls);
+
+    wi = snew(WinInfo);
+    memset(wi, 0, sizeof(*wi));
+    wi->s = s;
+    wi->mcs = &s->settings_ctrls;
+    wi->wtype = wSettings;
+    wi->update = &macctrl_update;
+    wi->click = &macctrl_click;
+    wi->key = &macctrl_key;
+    wi->activate = &macctrl_activate;
+    wi->adjustmenus = &macctrl_adjustmenus;
+    wi->close = &mac_closedlg;
+    SetWRefCon(s->settings_window, (long)wi);
     ShowWindow(s->settings_window);
 }
 
+static void mac_closedlg(WindowPtr window)
+{
+    Session *s = mac_windowsession(window);
+
+    macctrl_close(window);
+    DisposeWindow(window);
+    if (s->window == NULL)
+       sfree(s);
+}
+
+static void mac_enddlg(WindowPtr window, int value)
+{
+    Session *s = mac_windowsession(window);
+
+    if (value == 0)
+       mac_closedlg(window);
+    else {
+       mac_startsession(s);
+       mac_closedlg(window);
+    }
+}
+
 void mac_dupsession(void)
 {
     Session *s1 = mac_windowsession(FrontWindow());
     Session *s2;
 
-    s2 = smalloc(sizeof(*s2));
+    s2 = snew(Session);
     memset(s2, 0, sizeof(*s2));
     s2->cfg = s1->cfg;
     s2->hasfile = s1->hasfile;
@@ -84,7 +131,7 @@ static OSErr mac_opensessionfrom(FSSpec *fss)
     void *sesshandle;
     OSErr err;
 
-    s = smalloc(sizeof(*s));
+    s = snew(Session);
     memset(s, 0, sizeof(*s));
 
     err = FSpGetFInfo(fss, &fi);
@@ -266,36 +313,6 @@ pascal OSErr mac_aevt_pdoc(const AppleEvent *req, AppleEvent *reply,
     return errAEEventNotHandled;
 }
 
-void mac_activatedlg(WindowPtr window, EventRecord *event)
-{
-    DialogItemType itemtype;
-    Handle itemhandle;
-    short item;
-    Rect itemrect;
-    int active;
-    DialogRef dialog = GetDialogFromWindow(window);
-
-    active = (event->modifiers & activeFlag) != 0;
-    GetDialogItem(dialog, wiSettingsOpen, &itemtype, &itemhandle, &itemrect);
-    HiliteControl((ControlHandle)itemhandle, active ? 0 : 255);
-    DialogSelect(event, &dialog, &item);
-}
-
-void mac_clickdlg(WindowPtr window, EventRecord *event)
-{
-    short item;
-    Session *s = mac_windowsession(window);
-    DialogRef dialog = GetDialogFromWindow(window);
-
-    if (DialogSelect(event, &dialog, &item))
-       switch (item) {
-         case wiSettingsOpen:
-           HideWindow(window);
-           mac_startsession(s);
-           break;
-       }
-}
-
 /*
  * Local Variables:
  * c-file-style: "simon"