X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/6b78788aeda49ad942a13e736cda2cf282432d78..ecc0ba5b2e559a13cae7d4b515841ffe24624bbb:/winstuff.h

diff --git a/winstuff.h b/winstuff.h
index d55fc0f5..e2d700ee 100644
--- a/winstuff.h
+++ b/winstuff.h
@@ -18,6 +18,13 @@
 #endif
 #endif
 
+#ifndef DONE_TYPEDEFS
+#define DONE_TYPEDEFS
+typedef struct config_tag Config;
+typedef struct backend_tag Backend;
+typedef struct terminal_tag Terminal;
+#endif
+
 #define PUTTY_REG_POS "Software\\SimonTatham\\PuTTY"
 #define PUTTY_REG_PARENT "Software\\SimonTatham"
 #define PUTTY_REG_PARENT_CHILD "PuTTY"
@@ -50,6 +57,14 @@ GLOBAL char *help_path;
 GLOBAL int help_has_contents;
 
 /*
+ * The terminal and logging context are notionally local to the
+ * Windows front end, but they must be shared between window.c and
+ * windlg.c. Likewise the saved-sessions list.
+ */
+GLOBAL Terminal *term;
+GLOBAL void *logctx;
+
+/*
  * 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
@@ -155,7 +170,8 @@ void progressbar(struct ctlpos *cp, int id);
 void fwdsetter(struct ctlpos *cp, int listid, char *stext, int sid,
 	       char *e1stext, int e1sid, int e1id,
 	       char *e2stext, int e2sid, int e2id,
-	       char *btext, int bid);
+	       char *btext, int bid,
+	       char *r1text, int r1id, char *r2text, int r2id);
 
 /*
  * Exports from windlg.c.
@@ -174,12 +190,8 @@ void UpdateSizeTip(HWND src, int cx, int cy);
 void EnableSizeTip(int bEnable);
 
 /*
- * Unicode and multi-byte character handling stuff.
+ * Exports from unicode.c.
  */
-#define is_dbcs_leadbyte(cp, c) IsDBCSLeadByteEx(cp, c)
-#define mb_to_wc(cp, flags, mbstr, mblen, wcstr, wclen) \
-	MultiByteToWideChar(cp, flags, mbstr, mblen, wcstr, wclen)
-#define wc_to_mb(cp, flags, wcstr, wclen, mbstr, mblen, def, defused) \
-	WideCharToMultiByte(cp, flags, wcstr, wclen, mbstr, mblen, def,defused)
+void init_ucs(void);
 
 #endif