* ATTR_INVALID is an illegal colour combination.
*/
-#define TATTR_ACTCURS 0x4UL /* active cursor (block) */
-#define TATTR_PASCURS 0x2UL /* passive cursor (box) */
-#define TATTR_RIGHTCURS 0x1UL /* cursor-on-RHS */
+#define TATTR_ACTCURS 0x40000000UL /* active cursor (block) */
+#define TATTR_PASCURS 0x20000000UL /* passive cursor (box) */
+#define TATTR_RIGHTCURS 0x10000000UL /* cursor-on-RHS */
#define LATTR_NORM 0x00000000UL
-#define LATTR_WIDE 0x01000000UL
-#define LATTR_TOP 0x02000000UL
-#define LATTR_BOT 0x03000000UL
-#define LATTR_MODE 0x03000000UL
-#define LATTR_WRAPPED 0x10000000UL
-#define LATTR_WRAPPED2 0x20000000UL
+#define LATTR_WIDE 0x00000001UL
+#define LATTR_TOP 0x00000002UL
+#define LATTR_BOT 0x00000003UL
+#define LATTR_MODE 0x00000003UL
+#define LATTR_WRAPPED 0x00000010UL
+#define LATTR_WRAPPED2 0x00000020UL
-#define ATTR_INVALID 0x03FF0000UL
+#define ATTR_INVALID 0x03FFU
/* Like Linux use the F000 page for direct to font. */
-#define ATTR_OEMCP 0x0000F000UL /* OEM Codepage DTF */
-#define ATTR_ACP 0x0000F100UL /* Ansi Codepage DTF */
+#define CSET_OEMCP 0x0000F000UL /* OEM Codepage DTF */
+#define CSET_ACP 0x0000F100UL /* Ansi Codepage DTF */
/* These are internal use overlapping with the UTF-16 surrogates */
-#define ATTR_ASCII 0x0000D800UL /* normal ASCII charset ESC ( B */
-#define ATTR_LINEDRW 0x0000D900UL /* line drawing charset ESC ( 0 */
-#define ATTR_SCOACS 0x0000DA00UL /* SCO Alternate charset */
-#define ATTR_GBCHR 0x0000DB00UL /* UK variant charset ESC ( A */
-#define CSET_MASK 0x0000FF00UL /* Character set mask; MUST be 0xFF00 */
+#define CSET_ASCII 0x0000D800UL /* normal ASCII charset ESC ( B */
+#define CSET_LINEDRW 0x0000D900UL /* line drawing charset ESC ( 0 */
+#define CSET_SCOACS 0x0000DA00UL /* SCO Alternate charset */
+#define CSET_GBCHR 0x0000DB00UL /* UK variant charset ESC ( A */
+#define CSET_MASK 0xFFFFFF00UL /* Character set mask */
-#define DIRECT_CHAR(c) ((c&0xFC00)==0xD800)
-#define DIRECT_FONT(c) ((c&0xFE00)==0xF000)
+#define DIRECT_CHAR(c) ((c&0xFFFFFC00)==0xD800)
+#define DIRECT_FONT(c) ((c&0xFFFFFE00)==0xF000)
-#define UCSERR (ATTR_LINEDRW|'a') /* UCS Format error character. */
+#define UCSERR (CSET_LINEDRW|'a') /* UCS Format error character. */
/*
* UCSWIDE is a special value used in the terminal data to signify
* the character cell containing the right-hand half of a CJK wide
*/
#define UCSWIDE 0xDFFF
-#define ATTR_NARROW 0x80000000UL
-#define ATTR_WIDE 0x40000000UL
-#define ATTR_BOLD 0x04000000UL
-#define ATTR_UNDER 0x08000000UL
-#define ATTR_REVERSE 0x10000000UL
-#define ATTR_BLINK 0x20000000UL
-#define ATTR_FGMASK 0x001F0000UL
-#define ATTR_BGMASK 0x03E00000UL
-#define ATTR_COLOURS 0x03FF0000UL
-#define ATTR_FGSHIFT 16
-#define ATTR_BGSHIFT 21
-
-#define ATTR_DEFAULT 0x01280000UL /* bg 9, fg 8 */
-#define ATTR_DEFFG 0x00080000UL
-#define ATTR_DEFBG 0x01200000UL
-#define ERASE_CHAR (ATTR_DEFAULT | ATTR_ASCII | ' ')
-#define ATTR_MASK 0xFFFFFF00UL
-#define CHAR_MASK 0x000000FFUL
+#define ATTR_NARROW 0x8000U
+#define ATTR_WIDE 0x4000U
+#define ATTR_BOLD 0x0400U
+#define ATTR_UNDER 0x0800U
+#define ATTR_REVERSE 0x1000U
+#define ATTR_BLINK 0x2000U
+#define ATTR_FGMASK 0x001FU
+#define ATTR_BGMASK 0x03E0U
+#define ATTR_COLOURS 0x03FFU
+#define ATTR_FGSHIFT 0
+#define ATTR_BGSHIFT 5
+
+#define ATTR_DEFAULT 0x0128U /* bg 9, fg 8 */
+#define ATTR_DEFFG 0x0008U
+#define ATTR_DEFBG 0x0120U
#define ATTR_CUR_AND (~(ATTR_BOLD|ATTR_REVERSE|ATTR_BLINK|ATTR_COLOURS))
-#define ATTR_CUR_XOR 0x016A0000UL
+#define ATTR_CUR_XOR 0x016AU
struct sesslist {
int nsessions;
/*
* Proxy types.
*/
- PROXY_NONE, PROXY_HTTP, PROXY_SOCKS, PROXY_TELNET
+ PROXY_NONE, PROXY_SOCKS4, PROXY_SOCKS5,
+ PROXY_HTTP, PROXY_TELNET, PROXY_CMD
};
enum {
enum {
/* Bell settings (cfg.beep) */
- BELL_DISABLED, BELL_DEFAULT, BELL_VISUAL, BELL_WAVEFILE
+ BELL_DISABLED, BELL_DEFAULT, BELL_VISUAL, BELL_WAVEFILE, BELL_PCSPEAKER
};
enum {
};
struct backend_tag {
- char *(*init) (void *frontend_handle, void **backend_handle, Config *cfg,
- char *host, int port, char **realhost, int nodelay);
+ const char *(*init) (void *frontend_handle, void **backend_handle,
+ Config *cfg,
+ char *host, int port, char **realhost, int nodelay,
+ int keepalive);
void (*free) (void *handle);
/* back->reconfig() passes in a replacement configuration. */
void (*reconfig) (void *handle, Config *cfg);
int warn_on_close;
int ping_interval; /* in seconds */
int tcp_nodelay;
+ int tcp_keepalives;
/* Proxy options */
char proxy_exclude_list[512];
int proxy_dns;
int proxy_type;
char proxy_host[512];
int proxy_port;
- char proxy_username[32];
- char proxy_password[32];
+ char proxy_username[128];
+ char proxy_password[128];
char proxy_telnet_command[512];
- int proxy_socks_version;
/* SSH options */
char remote_cmd[512];
char remote_cmd2[512]; /* fallback if the first fails
int try_ki_auth;
int ssh_subsys; /* run a subsystem rather than a command */
int ssh_subsys2; /* fallback to go with remote_cmd2 */
+ int ssh_no_shell; /* avoid running a shell */
/* Telnet options */
char termtype[32];
char termspeed[32];
Filename logfilename;
int logtype;
int logxfovr;
+ int logomitpass;
+ int logomitdata;
int hide_mouseptr;
int sunken_edge;
int window_border;
char answerback[256];
char printer[128];
+ int arabicshaping;
+ int bidi;
/* Colour options */
+ int system_colour;
int try_palette;
int bold_colour;
unsigned char colours[22][3];
int stamp_utmp;
int login_shell;
int scrollbar_on_left;
+ int shadowbold;
FontSpec boldfont;
FontSpec widefont;
FontSpec wideboldfont;
* These flags describe the type of _application_ - they wouldn't
* vary between individual sessions - and so it's OK to have this
* variable be GLOBAL.
+ *
+ * Note that additional flags may be defined in platform-specific
+ * headers. It's probably best if those ones start from 0x1000, to
+ * avoid collision.
*/
#define FLAG_VERBOSE 0x0001
#define FLAG_STDERR 0x0002
GLOBAL int default_protocol;
GLOBAL int default_port;
+/*
+ * This is set TRUE by cmdline.c iff a session is loaded with "-load".
+ */
+GLOBAL int loaded_session;
+
struct RSAKey; /* be a little careful of scope */
/*
* Exports from window.c.
*/
void request_resize(void *frontend, int, int);
-void do_text(Context, int, int, char *, int, unsigned long, int);
-void do_cursor(Context, int, int, char *, int, unsigned long, int);
+void do_text(Context, int, int, wchar_t *, int, unsigned long, int);
+void do_cursor(Context, int, int, wchar_t *, int, unsigned long, int);
int char_width(Context ctx, int uc);
#ifdef OPTIMISE_SCROLL
void do_scroll(Context, int, int, int);
void logfopen(void *logctx);
void logfclose(void *logctx);
void logtraffic(void *logctx, unsigned char c, int logmode);
-void log_eventlog(void *logctx, char *string);
+void logflush(void *logctx);
+void log_eventlog(void *logctx, const char *string);
enum { PKT_INCOMING, PKT_OUTGOING };
+enum { PKTLOG_EMIT, PKTLOG_BLANK, PKTLOG_OMIT };
+struct logblank_t {
+ int offset;
+ int len;
+ int type;
+};
void log_packet(void *logctx, int direction, int type,
- char *texttype, void *data, int len);
+ char *texttype, void *data, int len,
+ int n_blanks, const struct logblank_t *blanks);
/*
* Exports from testback.c
#endif
/*
- * Exports from pageantc.c
+ * Exports from pageantc.c.
+ *
+ * agent_query returns 1 for here's-a-response, and 0 for query-in-
+ * progress. In the latter case there will be a call to `callback'
+ * at some future point, passing callback_ctx as the first
+ * parameter and the actual reply data as the second and third.
+ *
+ * The response may be a NULL pointer (in either of the synchronous
+ * or asynchronous cases), which indicates failure to receive a
+ * response.
*/
-void agent_query(void *in, int inlen, void **out, int *outlen);
+int agent_query(void *in, int inlen, void **out, int *outlen,
+ void (*callback)(void *, void *, int), void *callback_ctx);
int agent_exists(void);
/*
/*
* Exports from windlg.c
*/
-void logevent(void *frontend, char *);
+void logevent(void *frontend, const char *);
void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
char *keystr, char *fingerprint);
void askcipher(void *frontend, char *ciphername, int cs);
extern int console_batch_mode;
int console_get_line(const char *prompt, char *str, int maxlen, int is_pw);
void console_provide_logctx(void *logctx);
+int is_interactive(void);
/*
* Exports from printing.c.
*/
int cmdline_process_param(char *, char *, int, Config *);
void cmdline_run_saved(Config *);
+void cmdline_cleanup(void);
extern char *cmdline_password;
#define TOOLTYPE_FILETRANSFER 1
#define TOOLTYPE_NONNETWORK 2
int midsession, int protocol);
/*
+ * Exports from minibidi.c.
+ */
+typedef struct bidi_char {
+ wchar_t origwc, wc;
+ unsigned short index;
+} bidi_char;
+int do_bidi(bidi_char *line, int count);
+int do_shape(bidi_char *line, bidi_char *to, int count);
+
+/*
* X11 auth mechanisms we know about.
*/
enum {
const char *filename_to_str(const Filename *fn);
int filename_equal(Filename f1, Filename f2);
int filename_is_null(Filename fn);
+char *get_username(void); /* return value needs freeing */
+char *get_random_data(int bytes); /* used in cmdgen.c */
#endif
projects / u / mdw / putty / blobdiff