Use the Unicode Converter to convert from Unicode to the display encoding

[sgt/putty] / mac / mac.h

diff --git a/mac/mac.h b/mac/mac.h
index 1c1c64e..626ca51 100644 (file)
--- a/mac/mac.h
+++ b/mac/mac.h
@@ -10,13 +10,15 @@
 #include <Gestalt.h>
 #include <MacWindows.h>
 #include <Palettes.h>
+#include <UnicodeConverter.h>
 
 struct mac_gestalts {
+    long sysvers;
     long qdvers;
     long apprvers;
     long cntlattr;
     long windattr;
-    long thdsattr;
+    long encvvers;
 };
 
 extern struct mac_gestalts mac_gestalts;
@@ -45,7 +47,6 @@ typedef struct {
     Terminal *term;
     /* Display state */
     int font_width, font_height;
-    int has_focus;
     /* Line discipline */
     void *ldisc;
     /* Backend */
@@ -54,8 +55,6 @@ typedef struct {
     char *realhost;
     /* Logging */
     void *logctx;
-    /* Conveniences */
-    unsigned long attr_mask;           /* Mask of attributes to display */
 
     /* Mac-specific elements */
     short              fontnum;
@@ -66,8 +65,8 @@ typedef struct {
     PaletteHandle      palette;
     ControlHandle      scrollbar;
     WCTabHandle                wctab;
-    ThreadID           thread;
     int                        raw_mouse;
+    UnicodeToTextInfo  uni_to_font;
 } Session;
 
 #endif