Deglobalise the Unicode module. Despite all my grand plans, I've

[u/mdw/putty] / terminal.h

diff --git a/terminal.h b/terminal.h
index b6b5a06..daadd70 100644 (file)
--- a/terminal.h
+++ b/terminal.h
@@ -171,9 +171,18 @@ struct terminal_tag {
 
     void *logctx;
 
-    Config *cfg;
+    struct unicode_data *ucsdata;
+
+    /*
+     * We maintain a full _copy_ of a Config structure here, not
+     * merely a pointer to it. That way, when we're passed a new
+     * one for reconfiguration, we can check the differences and
+     * adjust the _current_ setting of (e.g.) auto wrap mode rather
+     * than only the default.
+     */
+    Config cfg;
 };
 
-#define in_utf(term) ((term)->utf || line_codepage==CP_UTF8)
+#define in_utf(term) ((term)->utf || (term)->ucsdata->line_codepage==CP_UTF8)
 
 #endif