X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/3976728b1aa1805bee688fcfa9131edcbe4dae88..bf873e8e28f7ac4998614b1e94b677a11df89e6a:/mac/mac.h

diff --git a/mac/mac.h b/mac/mac.h
index 1bd54824..838c8285 100644
--- a/mac/mac.h
+++ b/mac/mac.h
@@ -6,37 +6,26 @@
 #define PUTTY_MAC_H
 
 #include <MacTypes.h>
+#include <Controls.h>
 #include <Events.h>
 #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 encvvers;
 };
 
 extern struct mac_gestalts mac_gestalts;
 
 #define HAVE_COLOR_QD() (mac_gestalts.qdvers > gestaltOriginalQD)
 
-/* from macterm.c */
-extern void mac_newsession(void);
-extern void mac_activateterm(WindowPtr, Boolean);
-extern void mac_adjusttermcursor(WindowPtr, Point, RgnHandle);
-extern void mac_adjusttermmenus(WindowPtr);
-extern void mac_updateterm(WindowPtr);
-extern void mac_clickterm(WindowPtr, EventRecord *);
-extern void mac_growterm(WindowPtr, EventRecord *);
-extern void mac_keyterm(WindowPtr, EventRecord *);
-extern void mac_menuterm(WindowPtr, short, short);
-/* from maccfg.c */
-extern void mac_loadconfig(Config *);
-/* from macnet.c */
-extern void macnet_eventcheck(void);
-
 typedef struct {
     /* Config that created this session */
     Config cfg;
@@ -52,8 +41,6 @@ typedef struct {
     char *realhost;
     /* Logging */
     void *logctx;
-    /* Conveniences */
-    unsigned long attr_mask;		/* Mask of attributes to display */
 
     /* Mac-specific elements */
     short		fontnum;
@@ -65,8 +52,29 @@ typedef struct {
     ControlHandle	scrollbar;
     WCTabHandle		wctab;
     int			raw_mouse;
+    UnicodeToTextInfo	uni_to_font;
 } Session;
 
+/* from macterm.c */
+extern void mac_newsession(void);
+extern void mac_opensession(void);
+extern void mac_startsession(Session *);
+extern void mac_activateterm(WindowPtr, Boolean);
+extern void mac_adjusttermcursor(WindowPtr, Point, RgnHandle);
+extern void mac_adjusttermmenus(WindowPtr);
+extern void mac_updateterm(WindowPtr);
+extern void mac_clickterm(WindowPtr, EventRecord *);
+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 void *open_settings_r_fsp(FSSpec *);
+/* from maccfg.c */
+extern void mac_loadconfig(Config *);
+/* from macnet.c */
+extern void macnet_eventcheck(void);
+
 #endif
 
 /*