X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/181a7e4b8e98f7fbd15b0998b9d26f8e5fc2e353..ab2c86b9e339e4c0a7d824b1f7ec4efcce985d79:/putty.h?ds=sidebyside

diff --git a/putty.h b/putty.h
index e7bb859a..3594ceb3 100644
--- a/putty.h
+++ b/putty.h
@@ -17,6 +17,8 @@
 #endif
 
 typedef struct config_tag Config;
+typedef struct backend_tag Backend;
+typedef struct terminal_tag Terminal;
 
 #include "puttyps.h"
 #include "network.h"
@@ -98,29 +100,16 @@ typedef struct config_tag Config;
 #define ATTR_CUR_AND (~(ATTR_BOLD|ATTR_REVERSE|ATTR_BLINK|ATTR_COLOURS))
 #define ATTR_CUR_XOR 0x00BA0000UL
 
-#define SEL_NL { 13, 10 }
-
-GLOBAL int rows, cols, savelines;
-
-GLOBAL int has_focus;
-
-GLOBAL int in_vbell;
-GLOBAL unsigned long vbell_startpoint;
-
-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 alt_pressed;
 
 GLOBAL int session_closed;
 
-GLOBAL int big_cursor;
-
 GLOBAL char *help_path;
 GLOBAL int help_has_contents;
 
+GLOBAL int nsessions;
+GLOBAL char **sessions;
+
 GLOBAL int utf;
 GLOBAL int dbcs_screenfont;
 GLOBAL int font_codepage;
@@ -132,7 +121,6 @@ GLOBAL wchar_t unitab_font[256];
 GLOBAL wchar_t unitab_xterm[256];
 GLOBAL wchar_t unitab_oemcp[256];
 GLOBAL unsigned char unitab_ctrl[256];
-#define in_utf (utf || line_codepage==CP_UTF8)
 
 #define LGXF_OVR  1		       /* existing logfile overwrite */
 #define LGXF_APN  0		       /* existing logfile append */
@@ -199,13 +187,14 @@ enum {
     COE_ALWAYS			       /* Always close the window */
 };
 
-typedef struct {
-    char *(*init) (char *host, int port, char **realhost, int nodelay);
+struct backend_tag {
+    char *(*init) (void *frontend_handle,
+		   char *host, int port, char **realhost, int nodelay);
     /* back->send() returns the current amount of buffered data. */
     int (*send) (char *buf, int len);
     /* back->sendbuffer() does the same thing but without attempting a send */
     int (*sendbuffer) (void);
-    void (*size) (void);
+    void (*size) (int width, int height);
     void (*special) (Telnet_Special code);
     Socket(*socket) (void);
     int (*exitcode) (void);
@@ -217,7 +206,7 @@ typedef struct {
      */
     void (*unthrottle) (int);
     int default_port;
-} Backend;
+};
 
 GLOBAL Backend *back;
 
@@ -367,6 +356,12 @@ struct config_tag {
     } sshbug_ignore1, sshbug_plainpw1, sshbug_rsa1,
 	sshbug_hmac2, sshbug_derivekey2, sshbug_rsapad2,
 	sshbug_dhgex2;
+    /* Options for pterm. Should split out into platform-dependent part. */
+    int stamp_utmp;
+    int login_shell;
+    int scrollbar_on_left;
+    char boldfont[64];
+    int shadowboldoffset;
 };
 
 /*
@@ -403,6 +398,8 @@ GLOBAL Config cfg;
 GLOBAL int default_protocol;
 GLOBAL int default_port;
 
+GLOBAL Terminal *term;		       /* temporary while changes are made */
+
 struct RSAKey;			       /* be a little careful of scope */
 
 /*
@@ -427,9 +424,12 @@ void set_raw_mouse_mode(int);
 Mouse_Button translate_button(Mouse_Button b);
 void connection_fatal(char *, ...);
 void fatalbox(char *, ...);
+void modalfatalbox(char *, ...);
 void beep(int);
 void begin_session(void);
 void sys_cursor(int x, int y);
+void request_paste(void);
+void frontend_keypress(void);
 #define OPTIMISE_IS_SCROLL 1
 
 void set_iconic(int iconic);
@@ -460,36 +460,40 @@ void random_destroy_seed(void);
 void save_settings(char *section, int do_host, Config * cfg);
 void load_settings(char *section, int do_host, Config * cfg);
 void get_sesslist(int allocate);
+void do_defaults(char *, Config *);
+void registry_cleanup(void);
 
 /*
  * Exports from terminal.c.
  */
 
-void term_init(void);
-void term_size(int, int, int);
-void term_out(void);
-void term_paint(Context, int, int, int, int);
-void term_scroll(int, int);
-void term_pwron(void);
-void term_clrsb(void);
-void term_mouse(Mouse_Button, Mouse_Action, int, int, int, int, int);
-void term_deselect(void);
-void term_update(void);
-void term_invalidate(void);
-void term_blink(int set_cursor);
-void term_do_paste(void);
-void term_paste(void);
-void term_nopaste(void);
-int term_ldisc(int option);
-int from_backend(int is_stderr, char *data, int len);
-void logfopen(void);
-void logfclose(void);
-void term_copyall(void);
-void term_reconfig(void);
+Terminal *term_init(void);
+void term_size(Terminal *, int, int, int);
+void term_out(Terminal *);
+void term_paint(Terminal *, Context, int, int, int, int);
+void term_scroll(Terminal *, int, int);
+void term_pwron(Terminal *);
+void term_clrsb(Terminal *);
+void term_mouse(Terminal *, Mouse_Button, Mouse_Action, int,int,int,int,int);
+void term_deselect(Terminal *);
+void term_update(Terminal *);
+void term_invalidate(Terminal *);
+void term_blink(Terminal *, int set_cursor);
+void term_do_paste(Terminal *);
+int term_paste_pending(Terminal *);
+void term_paste(Terminal *);
+void term_nopaste(Terminal *);
+int term_ldisc(Terminal *, int option);
+void term_copyall(Terminal *);
+void term_reconfig(Terminal *);
+void term_seen_key_event(Terminal *); 
+int from_backend(void *, int is_stderr, char *data, int len);
 
 /*
  * Exports from logging.c.
  */
+void logfopen();
+void logfclose();
 void logtraffic(unsigned char c, int logmode);
 enum { PKT_INCOMING, PKT_OUTGOING };
 void log_eventlog(char *string);
@@ -589,6 +593,15 @@ int wc_match(const char *wildcard, const char *target);
 int wc_unescape(char *output, const char *wildcard);
 
 /*
+ * Exports from windlg.c
+ */
+void logevent(char *);
+void verify_ssh_host_key(char *host, int port, char *keytype,
+			 char *keystr, char *fingerprint);
+void askcipher(char *ciphername, int cs);
+int askappend(char *filename);
+
+/*
  * Exports from console.c (that aren't equivalents to things in
  * windlg.c).
  */