Create settings.c and move the load/save session code out of

[u/mdw/putty] / putty.h

diff --git a/putty.h b/putty.h
index 6143643..48e9d2e 100644 (file)
--- a/putty.h
+++ b/putty.h
@@ -2,6 +2,10 @@
 #define PUTTY_PUTTY_H
 
 #define PUTTY_REG_POS "Software\\SimonTatham\\PuTTY"
+#define PUTTY_REG_PARENT "Software\\SimonTatham"
+#define PUTTY_REG_PARENT_CHILD "PuTTY"
+#define PUTTY_REG_GPARENT "Software"
+#define PUTTY_REG_GPARENT_CHILD "SimonTatham"
 
 /*
  * Global variables. Most modules declare these `extern', but
@@ -111,6 +115,7 @@ typedef struct {
     void (*special) (Telnet_Special code);
     SOCKET (*socket) (void);
     int (*sendok) (void);
+    int default_port;
 } Backend;
 
 GLOBAL Backend *back;
@@ -137,6 +142,7 @@ typedef struct {
     /* SSH options */
     char remote_cmd[512];
     int nopty;
+    int agentfwd;
     enum { CIPHER_3DES, CIPHER_BLOWFISH, CIPHER_DES } cipher;
     char keyfile[FILENAME_MAX];
     int sshprot;                       /* use v1 or v2 when both available */
@@ -158,6 +164,7 @@ typedef struct {
     int alt_space;                    /* is it special? */
     int ldisc_term;
     int scroll_on_key;
+    char wintitle[256];                /* initial window title */
     /* Terminal options */
     int savelines;
     int dec_om;
@@ -202,10 +209,21 @@ typedef struct {
 
 /*
  * Some global flags denoting the type of application.
+ * 
+ * FLAG_VERBOSE is set when the user requests verbose details.
+ * 
+ * FLAG_STDERR is set in command-line applications (which have a
+ * functioning stderr that it makes sense to write to) and not in
+ * GUI applications (which don't).
+ * 
+ * FLAG_INTERACTIVE is set when a full interactive shell session is
+ * being run, _either_ because no remote command has been provided
+ * _or_ because the application is GUI and can't run non-
+ * interactively.
  */
-#define FLAG_VERBOSE  0x0001
-#define FLAG_WINDOWED 0x0002
-#define FLAG_CONNECTION 0x0004
+#define FLAG_VERBOSE     0x0001
+#define FLAG_STDERR      0x0002
+#define FLAG_INTERACTIVE 0x0004
 GLOBAL int flags;
 
 GLOBAL Config cfg;
@@ -226,11 +244,14 @@ Context get_ctx(void);
 void free_ctx (Context);
 void palette_set (int, int, int, int);
 void palette_reset (void);
-void write_clip (void *, int);
+void write_clip (void *, int, int);
 void get_clip (void **, int *);
 void optimised_move (int, int, int);
+void connection_fatal(char *, ...);
 void fatalbox (char *, ...);
 void beep (int);
+void begin_session(void);
+void sys_cursor(int x, int y);
 #define OPTIMISE_IS_SCROLL 1
 
 /*
@@ -240,23 +261,32 @@ void noise_get_heavy(void (*func) (void *, int));
 void noise_get_light(void (*func) (void *, int));
 void noise_ultralight(DWORD data);
 void random_save_seed(void);
+void random_destroy_seed(void);
 
 /*
  * Exports from windlg.c.
  */
 int do_config (void);
 int do_reconfig (HWND);
-void do_defaults (char *);
+void do_defaults (char *, Config *);
 void logevent (char *);
 void showeventlog (HWND);
 void showabout (HWND);
-void verify_ssh_host_key(char *host, char *keystr);
-void get_sesslist(int allocate);
+void verify_ssh_host_key(char *host, int port, char *keytype,
+                         char *keystr, char *fingerprint);
+void registry_cleanup(void);
 
 GLOBAL int nsessions;
 GLOBAL char **sessions;
 
 /*
+ * Exports from settings.c.
+ */
+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);
+
+/*
  * Exports from terminal.c.
  */
 
@@ -291,6 +321,7 @@ extern Backend telnet_backend;
  * Exports from ssh.c.
  */
 
+extern int (*ssh_get_password)(const char *prompt, char *str, int maxlen);
 extern Backend ssh_backend;
 
 /*