projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Jacob correctly points out that I accidentally lost a clearing of
[u/mdw/putty]
/
macosx
/
osxwin.m
diff --git
a/macosx/osxwin.m
b/macosx/osxwin.m
index
ba3a08e
..
f61e6bf
100644
(file)
--- a/
macosx/osxwin.m
+++ b/
macosx/osxwin.m
@@
-232,15
+232,9
@@
/*
* Set up a backend.
*/
/*
* Set up a backend.
*/
- {
- int i;
+ back = backend_from_proto(cfg.protocol);
+ if (!back)
back = &pty_backend;
back = &pty_backend;
- for (i = 0; backends[i].backend != NULL; i++)
- if (backends[i].protocol == cfg.protocol) {
- back = backends[i].backend;
- break;
- }
- }
{
const char *error;
{
const char *error;
@@
-794,6
+788,11
@@
return term_data(term, is_stderr, data, len);
}
return term_data(term, is_stderr, data, len);
}
+- (int)fromBackendUntrusted:(const char *)data len:(int)len
+{
+ return term_data_untrusted(term, data, len);
+}
+
- (void)startAlert:(NSAlert *)alert
withCallback:(void (*)(void *, int))callback andCtx:(void *)ctx
{
- (void)startAlert:(NSAlert *)alert
withCallback:(void (*)(void *, int))callback andCtx:(void *)ctx
{
@@
-885,6
+884,11
@@
// FIXME: else show restart menu item
}
// FIXME: else show restart menu item
}
+- (Terminal *)term
+{
+ return term;
+}
+
@end
int from_backend(void *frontend, int is_stderr, const char *data, int len)
@end
int from_backend(void *frontend, int is_stderr, const char *data, int len)
@@
-893,6
+897,12
@@
int from_backend(void *frontend, int is_stderr, const char *data, int len)
return [win fromBackend:data len:len isStderr:is_stderr];
}
return [win fromBackend:data len:len isStderr:is_stderr];
}
+int from_backend_untrusted(void *frontend, const char *data, int len)
+{
+ SessionWindow *win = (SessionWindow *)frontend;
+ return [win fromBackendUntrusted:data len:len];
+}
+
int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
{
SessionWindow *win = (SessionWindow *)p->frontend;
int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
{
SessionWindow *win = (SessionWindow *)p->frontend;
@@
-922,7
+932,7
@@
void ldisc_update(void *frontend, int echo, int edit)
char *get_ttymode(void *frontend, const char *mode)
{
char *get_ttymode(void *frontend, const char *mode)
{
- SessionWindow *win = (SessionWindow *)
ctx
;
+ SessionWindow *win = (SessionWindow *)
frontend
;
Terminal *term = [win term];
return term_get_ttymode(term, mode);
}
Terminal *term = [win term];
return term_get_ttymode(term, mode);
}
@@
-939,7
+949,7
@@
void update_specials_menu(void *frontend)
* 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)
{
//SessionWindow *win = (SessionWindow *)frontend;
if (mode != BELL_VISUAL)
{
//SessionWindow *win = (SessionWindow *)frontend;
if (mode != BELL_VISUAL)
@@
-1176,7
+1186,7
@@
void get_clip(void *frontend, wchar_t ** p, int *len)
/* FIXME */
}
/* FIXME */
}
-void write_clip(void *frontend, wchar_t *
data
, int len, int must_deselect)
+void write_clip(void *frontend, wchar_t *
data, int *attr
, int len, int must_deselect)
{
//SessionWindow *win = (SessionWindow *)frontend;
/* FIXME */
{
//SessionWindow *win = (SessionWindow *)frontend;
/* FIXME */