X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/00c0aa61c2cf2a9f1ce0787e73dd88a874519f25..f89c329410c18fe1f09d843747fad77babb9f89c:/mac/macdlg.c diff --git a/mac/macdlg.c b/mac/macdlg.c index 2606f0b0..544d9a19 100644 --- a/mac/macdlg.c +++ b/mac/macdlg.c @@ -1,4 +1,4 @@ -/* $Id: macdlg.c,v 1.7 2003/01/25 14:04:47 ben Exp $ */ +/* $Id$ */ /* * Copyright (c) 2002 Ben Harris * All rights reserved. @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,36 +41,97 @@ #include #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->back = &loop_backend; s->hasfile = FALSE; - s->settings_window = 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 = snew(Session); + memset(s2, 0, sizeof(*s2)); + s2->cfg = s1->cfg; + s2->hasfile = s1->hasfile; + s2->savefile = s1->savefile; + + mac_startsession(s2); +} + static OSErr mac_opensessionfrom(FSSpec *fss) { FInfo fi; Session *s; void *sesshandle; - int i; OSErr err; - s = smalloc(sizeof(*s)); + s = snew(Session); memset(s, 0, sizeof(*s)); err = FSpGetFInfo(fss, &fi); @@ -91,19 +152,6 @@ static OSErr mac_opensessionfrom(FSSpec *fss) load_open_settings(sesshandle, TRUE, &s->cfg); close_settings_r(sesshandle); - /* - * Select protocol. This is farmed out into a table in a - * separate file to enable an ssh-free variant. - */ - s->back = NULL; - for (i = 0; backends[i].backend != NULL; i++) - if (backends[i].protocol == s->cfg.protocol) { - s->back = backends[i].backend; - break; - } - if (s->back == NULL) { - fatalbox("Unsupported protocol number found"); - } mac_startsession(s); return noErr; @@ -112,20 +160,74 @@ static OSErr mac_opensessionfrom(FSSpec *fss) return err; } -void mac_opensession(void) { - StandardFileReply sfr; - static const OSType sftypes[] = { 'Sess', 0, 0, 0 }; +static OSErr mac_openlist(AEDesc docs) +{ + OSErr err; + long ndocs, i; + FSSpec fss; + AEKeyword keywd; + DescType type; + Size size; - StandardGetFile(NULL, 1, sftypes, &sfr); - if (!sfr.sfGood) return; + err = AECountItems(&docs, &ndocs); + if (err != noErr) return err; - mac_opensessionfrom(&sfr.sfFile); - /* XXX handle error */ + for (i = 0; i < ndocs; i++) { + err = AEGetNthPtr(&docs, i + 1, typeFSS, + &keywd, &type, &fss, sizeof(fss), &size); + if (err != noErr) return err;; + err = mac_opensessionfrom(&fss); + if (err != noErr) return err; + } + return noErr; +} + +void mac_opensession(void) +{ + + if (mac_gestalts.navsvers > 0) { + NavReplyRecord navr; + NavDialogOptions navopts; + NavTypeListHandle navtypes; + AEDesc defaultloc = { 'null', NULL }; + AEDesc *navdefault = NULL; + short vol; + long dirid; + FSSpec fss; + + if (NavGetDefaultDialogOptions(&navopts) != noErr) return; + /* XXX should we create sessions dir? */ + if (get_session_dir(FALSE, &vol, &dirid) == noErr && + FSMakeFSSpec(vol, dirid, NULL, &fss) == noErr && + AECreateDesc(typeFSS, &fss, sizeof(fss), &defaultloc) == noErr) + navdefault = &defaultloc; + /* Can't meaningfully preview a saved session yet */ + navopts.dialogOptionFlags &= ~kNavAllowPreviews; + navtypes = (NavTypeListHandle)GetResource('open', open_pTTY); + if (NavGetFile(navdefault, &navr, &navopts, NULL, NULL, NULL, navtypes, + NULL) == noErr && navr.validRecord) + mac_openlist(navr.selection); + NavDisposeReply(&navr); + if (navtypes != NULL) + ReleaseResource((Handle)navtypes); + } +#if !TARGET_API_MAC_CARBON /* XXX Navigation Services */ + else { + StandardFileReply sfr; + static const OSType sftypes[] = { 'Sess', 0, 0, 0 }; + + StandardGetFile(NULL, 1, sftypes, &sfr); + if (!sfr.sfGood) return; + + mac_opensessionfrom(&sfr.sfFile); + /* XXX handle error */ + } +#endif } void mac_savesession(void) { - Session *s = (Session *)GetWRefCon(FrontWindow()); + Session *s = mac_windowsession(FrontWindow()); void *sesshandle; assert(s->hasfile); @@ -137,7 +239,8 @@ void mac_savesession(void) void mac_savesessionas(void) { - Session *s = (Session *)GetWRefCon(FrontWindow()); +#if !TARGET_API_MAC_CARBON /* XXX Navigation Services */ + Session *s = mac_windowsession(FrontWindow()); StandardFileReply sfr; void *sesshandle; @@ -155,6 +258,7 @@ void mac_savesessionas(void) close_settings_w(sesshandle); s->hasfile = TRUE; s->savefile = sfr.sfFile; +#endif } pascal OSErr mac_aevt_oapp(const AppleEvent *req, AppleEvent *reply, @@ -175,12 +279,9 @@ pascal OSErr mac_aevt_odoc(const AppleEvent *req, AppleEvent *reply, long refcon) { DescType type; - AEKeyword keywd; Size size; AEDescList docs = { typeNull, NULL }; OSErr err; - long ndocs, i; - FSSpec fss; err = AEGetParamDesc(req, keyDirectObject, typeAEList, &docs); if (err != noErr) goto out; @@ -191,16 +292,7 @@ pascal OSErr mac_aevt_odoc(const AppleEvent *req, AppleEvent *reply, goto out; } - err = AECountItems(&docs, &ndocs); - if (err != noErr) goto out; - - for (i = 0; i < ndocs; i++) { - err = AEGetNthPtr(&docs, i + 1, typeFSS, - &keywd, &type, &fss, sizeof(fss), &size); - if (err != noErr) goto out; - err = mac_opensessionfrom(&fss); - if (err != noErr) goto out; - } + err = mac_openlist(docs); out: AEDisposeDesc(&docs); @@ -221,34 +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; - - active = (event->modifiers & activeFlag) != 0; - GetDialogItem(window, wiSettingsOpen, &itemtype, &itemhandle, &itemrect); - HiliteControl((ControlHandle)itemhandle, active ? 0 : 255); - DialogSelect(event, &window, &item); -} - -void mac_clickdlg(WindowPtr window, EventRecord *event) -{ - short item; - Session *s = (Session *)GetWRefCon(window); - - if (DialogSelect(event, &window, &item)) - switch (item) { - case wiSettingsOpen: - CloseWindow(window); - mac_startsession(s); - break; - } -} - /* * Local Variables: * c-file-style: "simon"