Add the ability to close sessions. This adds *_free() functions to most

[u/mdw/putty] / mac / mac.h

diff --git a/mac/mac.h b/mac/mac.h
index d0db75e..99e2df8 100644 (file)
--- a/mac/mac.h
+++ b/mac/mac.h
@@ -24,6 +24,7 @@ struct mac_gestalts {
     long encvvers; /* TEC version (from TECGetInfo()) */
     long uncvattr; /* Unicode Converter attributes (frem TECGetInfo()) */
     long mtcpvers;
+    long otptattr;
 };
 
 extern struct mac_gestalts mac_gestalts;
@@ -52,12 +53,20 @@ typedef struct Session {
     char *realhost;
     /* Logging */
     void *logctx;
+    /* Unicode stuff */
+    struct unicode_data ucsdata;
 
     /* Mac-specific elements */
     short              fontnum;
     int                        font_ascent;
     int                        font_leading;
     int                        font_boldadjust;
+    Point              font_stdnumer;
+    Point              font_stddenom;
+    Point              font_widenumer;
+    Point              font_widedenom;
+    Point              font_bignumer;
+    Point              font_bigdenom;
     WindowPtr          window;
     WindowPtr          settings_window;
     PaletteHandle      palette;
@@ -86,18 +95,19 @@ 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);
+extern void mac_closeterm(WindowPtr);
 /* from macstore.c */
 extern OSErr get_putty_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);
+extern void init_ucs(Session *);
 /* from mtcpnet.c */
 extern OSErr mactcp_init(void);
-extern void mactcp_shutdown(void);
+extern void mactcp_cleanup(void);
 extern void mactcp_poll(void);
-extern SockAddr mactcp_namelookup(char *, char **);
-extern SockAddr mactcp_nonamelookup(char *);
+extern SockAddr mactcp_namelookup(char const *, char **);
+extern SockAddr mactcp_nonamelookup(char const *);
 extern void mactcp_getaddr(SockAddr, char *, int);
 extern int mactcp_hostname_is_local(char *);
 extern int mactcp_address_is_local(SockAddr);
@@ -108,6 +118,22 @@ extern Socket mactcp_register(void *, Plug);
 extern Socket mactcp_new(SockAddr addr, int, int, int, int, Plug);
 extern Socket mactcp_newlistener(char *, int, Plug, int);
 extern char *mactcp_addr_error(SockAddr);
+/* from otnet.c */
+extern OSErr ot_init(void);
+extern void ot_cleanup(void);
+extern void ot_poll(void);
+extern SockAddr ot_namelookup(char const *, char **);
+extern SockAddr ot_nonamelookup(char const *);
+extern void ot_getaddr(SockAddr, char *, int);
+extern int ot_hostname_is_local(char *);
+extern int ot_address_is_local(SockAddr);
+extern int ot_addrtype(SockAddr);
+extern void ot_addrcopy(SockAddr, char *);
+extern void ot_addr_free(SockAddr);
+extern Socket ot_register(void *, Plug);
+extern Socket ot_new(SockAddr addr, int, int, int, int, Plug);
+extern Socket ot_newlistener(char *, int, Plug, int);
+extern char *ot_addr_error(SockAddr);
 
 #endif