Further deglobalisation: settings.c now has a more sensible interface.

[u/mdw/putty] / winstuff.h

diff --git a/winstuff.h b/winstuff.h
index 3bf43bc..9e62664 100644 (file)
--- a/winstuff.h
+++ b/winstuff.h
@@ -18,7 +18,12 @@
 #endif
 #endif
 
-typedef struct config_tag Config;      /* duplicated from putty.h */
+#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"
@@ -46,6 +51,20 @@ GLOBAL HWND logbox;
 GLOBAL HINSTANCE hinst;
 
 /*
+ * Details of the help file.
+ */
+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
@@ -54,6 +73,22 @@ GLOBAL HINSTANCE hinst;
 #define WM_NETEVENT  (WM_XUSER + 5)
 
 /*
+ * On Windows, we send MA_2CLK as the only event marking the second
+ * press of a mouse button. Compare unix.h.
+ */
+#define MULTICLICK_ONLY_EVENT 1
+
+/*
+ * On Windows, data written to the clipboard must be NUL-terminated.
+ */
+#define SELECTION_NUL_TERMINATED 1
+
+/*
+ * On Windows, copying to the clipboard terminates lines with CRLF.
+ */
+#define SEL_NL { 13, 10 }
+
+/*
  * Exports from winctrls.c.
  */
 
@@ -153,13 +188,4 @@ void force_normal(HWND hwnd);
 void UpdateSizeTip(HWND src, int cx, int cy);
 void EnableSizeTip(int bEnable);
 
-/*
- * Unicode and multi-byte character handling stuff.
- */
-#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, mbstr, mblen, wcstr, wclen, def,defused)
-
 #endif