projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Slight change to password expiry UI for the benefit of Cisco servers, which
[u/mdw/putty]
/
mac
/
macterm.c
diff --git
a/mac/macterm.c
b/mac/macterm.c
index
22360e1
..
dad2688
100644
(file)
--- a/
mac/macterm.c
+++ b/
mac/macterm.c
@@
-595,7
+595,7
@@
static void text_click(Session *s, EventRecord *event)
lastwhen = TickCount();
}
lastwhen = TickCount();
}
-void write_clip(void *cookie, wchar_t *data, int len, int must_deselect)
+void write_clip(void *cookie, wchar_t *data, int
*attr, int
len, int must_deselect)
{
#if !TARGET_API_MAC_CARBON
Session *s = cookie;
{
#if !TARGET_API_MAC_CARBON
Session *s = cookie;
@@
-1015,7
+1015,7
@@
void mac_closeterm(WindowPtr window)
int alertret;
Session *s = mac_windowsession(window);
int alertret;
Session *s = mac_windowsession(window);
- if (s->cfg.warn_on_close) {
+ if (s->cfg.warn_on_close
&& !s->session_closed
) {
ParamText("\pAre you sure you want to close this session?",
NULL, NULL, NULL);
alertret=CautionAlert(wQuestion, NULL);
ParamText("\pAre you sure you want to close this session?",
NULL, NULL, NULL);
alertret=CautionAlert(wQuestion, NULL);
@@
-1028,8
+1028,10
@@
void mac_closeterm(WindowPtr window)
HideWindow(s->window);
*s->prev = s->next;
s->next->prev = s->prev;
HideWindow(s->window);
*s->prev = s->next;
s->next->prev = s->prev;
- ldisc_free(s->ldisc);
- s->back->free(s->backhandle);
+ if (s->ldisc)
+ ldisc_free(s->ldisc);
+ if (s->back)
+ s->back->free(s->backhandle);
log_free(s->logctx);
if (s->uni_to_font != NULL)
DisposeUnicodeToTextInfo(&s->uni_to_font);
log_free(s->logctx);
if (s->uni_to_font != NULL)
DisposeUnicodeToTextInfo(&s->uni_to_font);
@@
-1486,7
+1488,7
@@
void sys_cursor(void *frontend, int x, int y)
* may want to perform additional actions on any kind of bell (for
* example, taskbar flashing in Windows).
*/
* may want to perform additional actions on any kind of bell (for
* example, taskbar flashing in Windows).
*/
-void beep(void *frontend, int mode)
+void
do_
beep(void *frontend, int mode)
{
if (mode != BELL_VISUAL)
SysBeep(30);
{
if (mode != BELL_VISUAL)
SysBeep(30);
@@
-1843,6
+1845,12
@@
void ldisc_update(void *frontend, int echo, int edit)
{
}
{
}
+char *get_ttymode(void *frontend, const char *mode)
+{
+ Session *s = frontend;
+ return term_get_ttymode(s->term, mode);
+}
+
/*
* Mac PuTTY doesn't support printing yet.
*/
/*
* Mac PuTTY doesn't support printing yet.
*/
@@
-1890,6
+1898,12
@@
int from_backend(void *frontend, int is_stderr, const char *data, int len)
return term_data(s->term, is_stderr, data, len);
}
return term_data(s->term, is_stderr, data, len);
}
+int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
+{
+ Session *s = p->frontend;
+ return term_get_userpass_input(s->term, p, in, inlen);
+}
+
/*
* Emacs magic:
* Local Variables:
/*
* Emacs magic:
* Local Variables: