~mdw
/
sgt
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Enable the Open Transport networking implementation unless NO_OT is defined.
[sgt/putty]
/
mac
/
macdlg.c
diff --git
a/mac/macdlg.c
b/mac/macdlg.c
index
8f47788
..
28201d9
100644
(file)
--- a/
mac/macdlg.c
+++ b/
mac/macdlg.c
@@
-1,4
+1,4
@@
-/* $Id
: macdlg.c,v 1.15 2003/03/21 00:24:17 ben Exp
$ */
+/* $Id$ */
/*
* Copyright (c) 2002 Ben Harris
* All rights reserved.
/*
* Copyright (c) 2002 Ben Harris
* All rights reserved.
@@
-35,6
+35,7
@@
#include <Navigation.h>
#include <Resources.h>
#include <StandardFile.h>
#include <Navigation.h>
#include <Resources.h>
#include <StandardFile.h>
+#include <TextUtils.h>
#include <Windows.h>
#include <assert.h>
#include <Windows.h>
#include <assert.h>
@@
-46,18
+47,37
@@
#include "macresid.h"
#include "storage.h"
#include "macresid.h"
#include "storage.h"
+static void mac_config(int);
static void mac_closedlg(WindowPtr);
static void mac_closedlg(WindowPtr);
+static void mac_enddlg_config(WindowPtr, int);
+static void mac_enddlg_reconfig(WindowPtr, int);
void mac_newsession(void)
{
void mac_newsession(void)
{
+ mac_config(FALSE);
+}
+
+void mac_reconfig(void)
+{
+ mac_config(TRUE);
+}
+
+static void mac_config(int midsession)
+{
Session *s;
WinInfo *wi;
static struct sesslist sesslist;
Session *s;
WinInfo *wi;
static struct sesslist sesslist;
-
- s = smalloc(sizeof(*s));
- memset(s, 0, sizeof(*s));
- do_defaults(NULL, &s->cfg);
- s->hasfile = FALSE;
+ Str255 mactitle;
+ char *str;
+
+ if (midsession) {
+ s = mac_windowsession(FrontWindow());
+ } else {
+ s = snew(Session);
+ memset(s, 0, sizeof(*s));
+ do_defaults(NULL, &s->cfg);
+ s->hasfile = FALSE;
+ }
if (HAVE_COLOR_QD())
s->settings_window = GetNewCWindow(wSettings, NULL, (WindowPtr)-1);
if (HAVE_COLOR_QD())
s->settings_window = GetNewCWindow(wSettings, NULL, (WindowPtr)-1);
@@
-66,22
+86,35
@@
void mac_newsession(void)
get_sesslist(&sesslist, TRUE);
s->ctrlbox = ctrl_new_box();
get_sesslist(&sesslist, TRUE);
s->ctrlbox = ctrl_new_box();
- setup_config_box(s->ctrlbox, &sesslist,
FALSE
, 0);
+ setup_config_box(s->ctrlbox, &sesslist,
midsession, 0
, 0);
s->settings_ctrls.data = &s->cfg;
s->settings_ctrls.data = &s->cfg;
+ if (midsession)
+ s->settings_ctrls.end = &mac_enddlg_reconfig;
+ else
+ s->settings_ctrls.end = &mac_enddlg_config;
+
macctrl_layoutbox(s->ctrlbox, s->settings_window, &s->settings_ctrls);
macctrl_layoutbox(s->ctrlbox, s->settings_window, &s->settings_ctrls);
- wi = s
malloc(sizeof(*wi)
);
+ wi = s
new(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;
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);
wi->activate = &macctrl_activate;
wi->adjustmenus = &macctrl_adjustmenus;
wi->close = &mac_closedlg;
SetWRefCon(s->settings_window, (long)wi);
+ if (midsession)
+ str = dupprintf("%s Reconfiguration", appname);
+ else
+ str = dupprintf("%s Configuration", appname);
+ c2pstrcpy(mactitle, str);
+ sfree(str);
+ SetWTitle(s->settings_window, mactitle);
ShowWindow(s->settings_window);
}
ShowWindow(s->settings_window);
}
@@
-95,13
+128,35
@@
static void mac_closedlg(WindowPtr window)
sfree(s);
}
sfree(s);
}
+static void mac_enddlg_config(WindowPtr window, int value)
+{
+ Session *s = mac_windowsession(window);
+
+ if (value == 0)
+ mac_closedlg(window);
+ else {
+ mac_startsession(s);
+ mac_closedlg(window);
+ }
+}
+
+static void mac_enddlg_reconfig(WindowPtr window, int value)
+{
+ Session *s = mac_windowsession(window);
+
+ if (value == 0)
+ mac_closedlg(window);
+ else {
+ mac_closedlg(window);
+ }
+}
void mac_dupsession(void)
{
Session *s1 = mac_windowsession(FrontWindow());
Session *s2;
void mac_dupsession(void)
{
Session *s1 = mac_windowsession(FrontWindow());
Session *s2;
- s2 = s
malloc(sizeof(*s2)
);
+ s2 = s
new(Session
);
memset(s2, 0, sizeof(*s2));
s2->cfg = s1->cfg;
s2->hasfile = s1->hasfile;
memset(s2, 0, sizeof(*s2));
s2->cfg = s1->cfg;
s2->hasfile = s1->hasfile;
@@
-117,7
+172,7
@@
static OSErr mac_opensessionfrom(FSSpec *fss)
void *sesshandle;
OSErr err;
void *sesshandle;
OSErr err;
- s = s
malloc(sizeof(*s)
);
+ s = s
new(Session
);
memset(s, 0, sizeof(*s));
err = FSpGetFInfo(fss, &fi);
memset(s, 0, sizeof(*s));
err = FSpGetFInfo(fss, &fi);