projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move the Mac port over to using snew/snewn/sresize.
[u/mdw/putty]
/
mac
/
macdlg.c
diff --git
a/mac/macdlg.c
b/mac/macdlg.c
index
d293811
..
ec18aea
100644
(file)
--- a/
mac/macdlg.c
+++ b/
mac/macdlg.c
@@
-1,4
+1,4
@@
-/* $Id: macdlg.c,v 1.1
3 2003/03/17 21:40:37
ben Exp $ */
+/* $Id: macdlg.c,v 1.1
7 2003/03/29 23:07:55
ben Exp $ */
/*
* Copyright (c) 2002 Ben Harris
* All rights reserved.
/*
* Copyright (c) 2002 Ben Harris
* All rights reserved.
@@
-46,10
+46,6
@@
#include "macresid.h"
#include "storage.h"
#include "macresid.h"
#include "storage.h"
-static void mac_clickdlg(WindowPtr, EventRecord *);
-static void mac_activatedlg(WindowPtr, EventRecord *);
-static void mac_updatedlg(WindowPtr);
-static void mac_adjustdlgmenus(WindowPtr);
static void mac_closedlg(WindowPtr);
void mac_newsession(void)
static void mac_closedlg(WindowPtr);
void mac_newsession(void)
@@
-58,7
+54,7
@@
void mac_newsession(void)
WinInfo *wi;
static struct sesslist sesslist;
WinInfo *wi;
static struct sesslist sesslist;
- s = s
malloc(sizeof(*s)
);
+ s = s
new(Session
);
memset(s, 0, sizeof(*s));
do_defaults(NULL, &s->cfg);
s->hasfile = FALSE;
memset(s, 0, sizeof(*s));
do_defaults(NULL, &s->cfg);
s->hasfile = FALSE;
@@
-75,26
+71,38
@@
void mac_newsession(void)
s->settings_ctrls.data = &s->cfg;
macctrl_layoutbox(s->ctrlbox, s->settings_window, &s->settings_ctrls);
s->settings_ctrls.data = &s->cfg;
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;
memset(wi, 0, sizeof(*wi));
wi->s = s;
- wi->mcs = s->settings_ctrls;
+ wi->mcs =
&
s->settings_ctrls;
wi->wtype = wSettings;
wi->update = &macctrl_update;
wi->click = &macctrl_click;
wi->wtype = wSettings;
wi->update = &macctrl_update;
wi->click = &macctrl_click;
+ wi->key = &macctrl_key;
wi->activate = &macctrl_activate;
wi->adjustmenus = &macctrl_adjustmenus;
wi->activate = &macctrl_activate;
wi->adjustmenus = &macctrl_adjustmenus;
- wi->close = &mac
ctrl_close
;
+ wi->close = &mac
_closedlg
;
SetWRefCon(s->settings_window, (long)wi);
ShowWindow(s->settings_window);
}
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);
+}
+
+
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;
@@
-110,7
+118,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);