projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix what looks like a cut-and-paste error which was stopping Unix
[u/mdw/putty]
/
putty.h
diff --git
a/putty.h
b/putty.h
index
430fd96
..
d8a778e
100644
(file)
--- a/
putty.h
+++ b/
putty.h
@@
-261,6
+261,7
@@
enum {
CIPHER_BLOWFISH,
CIPHER_AES, /* (SSH-2 only) */
CIPHER_DES,
CIPHER_BLOWFISH,
CIPHER_AES, /* (SSH-2 only) */
CIPHER_DES,
+ CIPHER_ARCFOUR,
CIPHER_MAX /* no. ciphers (inc warn) */
};
CIPHER_MAX /* no. ciphers (inc warn) */
};
@@
-323,6
+324,8
@@
enum {
FUNKY_SCO
};
FUNKY_SCO
};
+extern const char *const ttymodes[];
+
enum {
/*
* Network address types. Used for specifying choice of IPv4/v6
enum {
/*
* Network address types. Used for specifying choice of IPv4/v6
@@
-429,6
+432,7
@@
struct config_tag {
Filename keyfile;
int sshprot; /* use v1 or v2 when both available */
int ssh2_des_cbc; /* "des-cbc" unrecommended SSH-2 cipher */
Filename keyfile;
int sshprot; /* use v1 or v2 when both available */
int ssh2_des_cbc; /* "des-cbc" unrecommended SSH-2 cipher */
+ int ssh_no_userauth; /* bypass "ssh-userauth" (SSH-2 only) */
int try_tis_auth;
int try_ki_auth;
int ssh_subsys; /* run a subsystem rather than a command */
int try_tis_auth;
int try_ki_auth;
int ssh_subsys; /* run a subsystem rather than a command */
@@
-437,6
+441,7
@@
struct config_tag {
/* Telnet options */
char termtype[32];
char termspeed[32];
/* Telnet options */
char termtype[32];
char termspeed[32];
+ char ttymodes[768]; /* MODE\tVvalue\0MODE\tA\0\0 */
char environmt[1024]; /* VAR\tvalue\0VAR\tvalue\0\0 */
char username[100];
char localusername[100];
char environmt[1024]; /* VAR\tvalue\0VAR\tvalue\0\0 */
char username[100];
char localusername[100];
@@
-525,6
+530,7
@@
struct config_tag {
/* translations */
int vtmode;
char line_codepage[128];
/* translations */
int vtmode;
char line_codepage[128];
+ int cjk_ambig_wide;
int utf8_override;
int xlat_capslockcyr;
/* X11 forwarding */
int utf8_override;
int xlat_capslockcyr;
/* X11 forwarding */
@@
-604,7
+610,7
@@
GLOBAL int loaded_session;
struct RSAKey; /* be a little careful of scope */
/*
struct RSAKey; /* be a little careful of scope */
/*
- * Exports from
window.c
.
+ * Exports from
the front end
.
*/
void request_resize(void *frontend, int, int);
void do_text(Context, int, int, wchar_t *, int, unsigned long, int);
*/
void request_resize(void *frontend, int, int);
void do_text(Context, int, int, wchar_t *, int, unsigned long, int);
@@
-645,6
+651,9
@@
void ldisc_update(void *frontend, int echo, int edit);
void update_specials_menu(void *frontend);
int from_backend(void *frontend, int is_stderr, const char *data, int len);
void notify_remote_exit(void *frontend);
void update_specials_menu(void *frontend);
int from_backend(void *frontend, int is_stderr, const char *data, int len);
void notify_remote_exit(void *frontend);
+/* Get a sensible value for a tty mode. NULL return = don't set.
+ * Otherwise, returned value should be freed by caller. */
+char *get_ttymode(void *frontend, const char *mode);
#define OPTIMISE_IS_SCROLL 1
void set_iconic(void *frontend, int iconic);
#define OPTIMISE_IS_SCROLL 1
void set_iconic(void *frontend, int iconic);
@@
-739,6
+748,7
@@
void term_provide_resize_fn(Terminal *term,
void *resize_ctx);
void term_provide_logctx(Terminal *term, void *logctx);
void term_set_focus(Terminal *term, int has_focus);
void *resize_ctx);
void term_provide_logctx(Terminal *term, void *logctx);
void term_set_focus(Terminal *term, int has_focus);
+char *term_get_ttymode(Terminal *term, const char *mode);
/*
* Exports from logging.c.
/*
* Exports from logging.c.
@@
-867,8
+877,10
@@
void get_unitab(int codepage, wchar_t * unitab, int ftype);
/*
* Exports from wcwidth.c
*/
/*
* Exports from wcwidth.c
*/
-int wcwidth(wchar_t ucs);
-int wcswidth(const wchar_t *pwcs, size_t n);
+int mk_wcwidth(wchar_t ucs);
+int mk_wcswidth(const wchar_t *pwcs, size_t n);
+int mk_wcwidth_cjk(wchar_t ucs);
+int mk_wcswidth_cjk(const wchar_t *pwcs, size_t n);
/*
* Exports from mscrypto.c
/*
* Exports from mscrypto.c
@@
-977,8
+989,8
@@
void cmdline_error(char *, ...);
* Exports from config.c.
*/
struct controlbox;
* Exports from config.c.
*/
struct controlbox;
-void setup_config_box(struct controlbox *b,
struct sesslist *sesslist
,
- int
midsession, int
protocol, int protcfginfo);
+void setup_config_box(struct controlbox *b,
int midsession
,
+ int protocol, int protcfginfo);
/*
* Exports from minibidi.c.
/*
* Exports from minibidi.c.