X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/6cb61a05b6157236bbea7b351cfc741eb6853605..64c96bdf566a413dd31c76ceb837497fe5da267c:/mac/mac.h

diff --git a/mac/mac.h b/mac/mac.h
index 612e947e..8b79a778 100644
--- a/mac/mac.h
+++ b/mac/mac.h
@@ -13,18 +13,26 @@
 #include <Palettes.h>
 #include <UnicodeConverter.h>
 
+#include "charset.h"
+
 struct mac_gestalts {
     long sysvers;
     long qdvers;
     long apprvers;
     long cntlattr;
     long windattr;
-    long encvvers;
+    long encvvers; /* TEC version (from TECGetInfo()) */
+    long uncvattr; /* Unicode Converter attributes (frem TECGetInfo()) */
 };
 
 extern struct mac_gestalts mac_gestalts;
 
+#if TARGET_RT_MAC_CFM
+/* All systems that can use CFM have Color QuickDraw */
+#define HAVE_COLOR_QD() 1
+#else
 #define HAVE_COLOR_QD() (mac_gestalts.qdvers > gestaltOriginalQD)
+#endif
 
 typedef struct {
     /* Config that created this session */
@@ -53,7 +61,8 @@ typedef struct {
     ControlHandle	scrollbar;
     WCTabHandle		wctab;
     int			raw_mouse;
-    UnicodeToTextInfo	uni_to_font;
+    UnicodeToTextInfo	uni_to_font;  /* Only one of uni_to_font and	 */
+    charset_t		font_charset; /* font_charset is used at a time. */
 } Session;
 
 /* from macdlg.c */
@@ -72,8 +81,10 @@ extern void mac_growterm(WindowPtr, EventRecord *);
 extern void mac_keyterm(WindowPtr, EventRecord *);
 extern void mac_menuterm(WindowPtr, short, short);
 /* from macstore.c */
-OSErr get_session_dir(Boolean makeit, short *pVRefNum, long *pDirID);
+extern OSErr get_session_dir(Boolean makeit, short *pVRefNum, long *pDirID);
 extern void *open_settings_r_fsp(FSSpec *);
+/* from macucs.c */
+extern void init_ucs(void);
 
 #endif