projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Stop plink losing data at start of session
[u/mdw/putty]
/
putty.h
diff --git
a/putty.h
b/putty.h
index
c2d6362
..
f89aeac
100644
(file)
--- a/
putty.h
+++ b/
putty.h
@@
-21,6
+21,12
@@
GLOBAL HINSTANCE putty_inst;
#define ATTR_INVALID 0x20000000UL
#define ATTR_WRAPPED 0x10000000UL
#define ATTR_INVALID 0x20000000UL
#define ATTR_WRAPPED 0x10000000UL
+#define LATTR_NORM 0x00000000UL
+#define LATTR_WIDE 0x01000000UL
+#define LATTR_TOP 0x02000000UL
+#define LATTR_BOT 0x03000000UL
+#define LATTR_MODE 0x03000000UL
+
#define ATTR_ASCII 0x00000000UL /* normal ASCII charset ESC ( B */
#define ATTR_GBCHR 0x00100000UL /* UK variant charset ESC ( A */
#define ATTR_LINEDRW 0x00200000UL /* line drawing charset ESC ( 0 */
#define ATTR_ASCII 0x00000000UL /* normal ASCII charset ESC ( B */
#define ATTR_GBCHR 0x00100000UL /* UK variant charset ESC ( A */
#define ATTR_LINEDRW 0x00200000UL /* line drawing charset ESC ( 0 */
@@
-28,6
+34,7
@@
GLOBAL HINSTANCE putty_inst;
#define ATTR_BOLD 0x00000100UL
#define ATTR_UNDER 0x00000200UL
#define ATTR_REVERSE 0x00000400UL
#define ATTR_BOLD 0x00000100UL
#define ATTR_UNDER 0x00000200UL
#define ATTR_REVERSE 0x00000400UL
+#define ATTR_BLINK 0x00000800UL
#define ATTR_FGMASK 0x0000F000UL
#define ATTR_BGMASK 0x000F0000UL
#define ATTR_FGSHIFT 12
#define ATTR_FGMASK 0x0000F000UL
#define ATTR_BGMASK 0x000F0000UL
#define ATTR_FGSHIFT 12
@@
-48,10
+55,11
@@
GLOBAL int rows, cols, savelines;
GLOBAL int font_width, font_height;
GLOBAL int font_width, font_height;
+#define c_write1(_C) do { if (inbuf_head >= INBUF_SIZE) term_out(); \
+ inbuf[inbuf_head++] = (_C) ; } while(0)
#define INBUF_SIZE 2048
#define INBUF_SIZE 2048
-#define INBUF_MASK (INBUF_SIZE-1)
GLOBAL unsigned char inbuf[INBUF_SIZE];
GLOBAL unsigned char inbuf[INBUF_SIZE];
-GLOBAL int inbuf_head
, inbuf_reap
;
+GLOBAL int inbuf_head;
#define OUTBUF_SIZE 2048
#define OUTBUF_MASK (OUTBUF_SIZE-1)
#define OUTBUF_SIZE 2048
#define OUTBUF_MASK (OUTBUF_SIZE-1)
@@
-60,13
+68,27
@@
GLOBAL int outbuf_head, outbuf_reap;
GLOBAL int has_focus;
GLOBAL int has_focus;
-GLOBAL int app_cursor_keys, app_keypad_keys;
+GLOBAL int app_cursor_keys, app_keypad_keys, vt52_mode;
+GLOBAL int repeat_off, cr_lf_return;
+
+GLOBAL int seen_key_event;
+GLOBAL int seen_disp_event;
+
+GLOBAL int session_closed;
+
+GLOBAL char *logfile;
-#define WM_NETEVENT (WM_USER + 1)
+/*
+ * I've just looked in the windows standard headr files for WM_USER, there
+ * are hundreds of flags defined using the form WM_USER+123 so I've
+ * renumbered this NETEVENT value and the two in window.c
+ */
+#define WM_XUSER (WM_USER + 0x2000)
+#define WM_NETEVENT (WM_XUSER + 5)
typedef enum {
TS_AYT, TS_BRK, TS_SYNCH, TS_EC, TS_EL, TS_GA, TS_NOP, TS_ABORT,
typedef enum {
TS_AYT, TS_BRK, TS_SYNCH, TS_EC, TS_EL, TS_GA, TS_NOP, TS_ABORT,
- TS_AO, TS_IP, TS_SUSP, TS_EOR, TS_EOF
+ TS_AO, TS_IP, TS_SUSP, TS_EOR, TS_EOF
, TS_LECHO, TS_RECHO
} Telnet_Special;
typedef enum {
} Telnet_Special;
typedef enum {
@@
-87,10
+109,18
@@
typedef struct {
void (*send) (char *buf, int len);
void (*size) (void);
void (*special) (Telnet_Special code);
void (*send) (char *buf, int len);
void (*size) (void);
void (*special) (Telnet_Special code);
+ SOCKET (*socket) (void);
+ int (*sendok) (void);
} Backend;
GLOBAL Backend *back;
} Backend;
GLOBAL Backend *back;
+extern struct backend_list {
+ int protocol;
+ char *name;
+ Backend *backend;
+} backends[];
+
typedef struct {
void (*send) (char *buf, int len);
} Ldisc;
typedef struct {
void (*send) (char *buf, int len);
} Ldisc;
@@
-105,8
+135,10
@@
typedef struct {
int close_on_exit;
int warn_on_close;
/* SSH options */
int close_on_exit;
int warn_on_close;
/* SSH options */
+ char remote_cmd[512];
int nopty;
enum { CIPHER_3DES, CIPHER_BLOWFISH, CIPHER_DES } cipher;
int nopty;
enum { CIPHER_3DES, CIPHER_BLOWFISH, CIPHER_DES } cipher;
+ char keyfile[FILENAME_MAX];
int try_tis_auth;
/* Telnet options */
char termtype[32];
int try_tis_auth;
/* Telnet options */
char termtype[32];
@@
-117,25
+149,31
@@
typedef struct {
/* Keyboard options */
int bksp_is_delete;
int rxvt_homeend;
/* Keyboard options */
int bksp_is_delete;
int rxvt_homeend;
- int
linux_funkeys
;
+ int
funky_type
;
int app_cursor;
int app_keypad;
int nethack_keypad;
int alt_f4; /* is it special? */
int alt_space; /* is it special? */
int ldisc_term;
int app_cursor;
int app_keypad;
int nethack_keypad;
int alt_f4; /* is it special? */
int alt_space; /* is it special? */
int ldisc_term;
+ int scroll_on_key;
/* Terminal options */
int savelines;
int dec_om;
int wrap_mode;
int lfhascr;
/* Terminal options */
int savelines;
int dec_om;
int wrap_mode;
int lfhascr;
+ int blink_cur;
+ int beep;
+ int scrollbar;
+ int locksize;
+ int bce;
+ int blinktext;
int win_name_always;
int width, height;
char font[64];
int fontisbold;
int fontheight;
int fontcharset;
int win_name_always;
int width, height;
char font[64];
int fontisbold;
int fontheight;
int fontcharset;
- VT_Mode vtmode;
/* Colour options */
int try_palette;
int bold_colour;
/* Colour options */
int try_palette;
int bold_colour;
@@
-143,8
+181,10
@@
typedef struct {
/* Selection options */
int mouse_is_xterm;
short wordness[256];
/* Selection options */
int mouse_is_xterm;
short wordness[256];
- /* russian language translation */
+ /* translations */
+ VT_Mode vtmode;
int xlat_enablekoiwin;
int xlat_enablekoiwin;
+ int xlat_88592w1250;
int xlat_capslockcyr;
} Config;
int xlat_capslockcyr;
} Config;
@@
-159,6
+199,14
@@
typedef struct {
#define DEFAULT_PORT 22
#endif
#define DEFAULT_PORT 22
#endif
+/*
+ * Some global flags denoting the type of application.
+ */
+#define FLAG_VERBOSE 0x0001
+#define FLAG_WINDOWED 0x0002
+#define FLAG_CONNECTION 0x0004
+GLOBAL int flags;
+
GLOBAL Config cfg;
GLOBAL int default_protocol;
GLOBAL int default_port;
GLOBAL Config cfg;
GLOBAL int default_protocol;
GLOBAL int default_port;
@@
-168,8
+216,8
@@
struct RSAKey; /* be a little careful of scope */
/*
* Exports from window.c.
*/
/*
* Exports from window.c.
*/
-void request_resize (int, int);
-void do_text (Context, int, int, char *, int, unsigned long);
+void request_resize (int, int
, int
);
+void do_text (Context, int, int, char *, int, unsigned long
, int
);
void set_title (char *);
void set_icon (char *);
void set_sbar (int, int, int);
void set_title (char *);
void set_icon (char *);
void set_sbar (int, int, int);
@@
-181,7
+229,7
@@
void write_clip (void *, int);
void get_clip (void **, int *);
void optimised_move (int, int, int);
void fatalbox (char *, ...);
void get_clip (void **, int *);
void optimised_move (int, int, int);
void fatalbox (char *, ...);
-void beep (
void
);
+void beep (
int
);
#define OPTIMISE_IS_SCROLL 1
/*
#define OPTIMISE_IS_SCROLL 1
/*
@@
-201,7
+249,7
@@
void do_defaults (char *);
void logevent (char *);
void showeventlog (HWND);
void showabout (HWND);
void logevent (char *);
void showeventlog (HWND);
void showabout (HWND);
-void verify_ssh_host_key(char *host,
struct RSAKey *key
);
+void verify_ssh_host_key(char *host,
char *keystr
);
void get_sesslist(int allocate);
GLOBAL int nsessions;
void get_sesslist(int allocate);
GLOBAL int nsessions;
@@
-222,6
+270,9
@@
void term_mouse (Mouse_Button, Mouse_Action, int, int);
void term_deselect (void);
void term_update (void);
void term_invalidate(void);
void term_deselect (void);
void term_update (void);
void term_invalidate(void);
+void term_blink(int set_cursor);
+void term_paste(void);
+void term_nopaste(void);
/*
* Exports from raw.c.
/*
* Exports from raw.c.
@@
-295,6
+346,14
@@
unsigned char xlat_tty2scr(unsigned char c);
unsigned char xlat_latkbd2win(unsigned char c);
/*
unsigned char xlat_latkbd2win(unsigned char c);
/*
+ * Exports from mscrypto.c
+ */
+#ifdef MSCRYPTOAPI
+int crypto_startup();
+void crypto_wrapup();
+#endif
+
+/*
* A debug system.
*/
#ifdef DEBUG
* A debug system.
*/
#ifdef DEBUG