Add a mechanism for determining which charset to use for a given Mac OS font,

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

diff --git a/mac/mac.h b/mac/mac.h
index 838c828..e974d90 100644 (file)
--- a/mac/mac.h
+++ b/mac/mac.h
@@ -13,6 +13,8 @@
 #include <Palettes.h>
 #include <UnicodeConverter.h>
 
+#include "charset.h"
+
 struct mac_gestalts {
     long sysvers;
     long qdvers;
@@ -48,15 +50,20 @@ typedef struct {
     int                        font_leading;
     int                        font_boldadjust;
     WindowPtr          window;
+    WindowPtr          settings_window;
     PaletteHandle      palette;
     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 macterm.c */
+/* from macdlg.c */
 extern void mac_newsession(void);
+extern void mac_clickdlg(WindowPtr, EventRecord *);
+extern void mac_activatedlg(WindowPtr, EventRecord *);
+/* from macterm.c */
 extern void mac_opensession(void);
 extern void mac_startsession(Session *);
 extern void mac_activateterm(WindowPtr, Boolean);
@@ -70,10 +77,6 @@ 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