X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/d082ac49971a1c1a9e84c5b201c30aab675f154f..ce2832135394f17cf34a9ca00db3c7394b591d46:/mac/mac.h diff --git a/mac/mac.h b/mac/mac.h index 1c1c64e1..838c8285 100644 --- a/mac/mac.h +++ b/mac/mac.h @@ -6,38 +6,26 @@ #define PUTTY_MAC_H #include +#include #include #include #include #include +#include struct mac_gestalts { + long sysvers; long qdvers; long apprvers; long cntlattr; long windattr; - long thdsattr; + 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; @@ -45,7 +33,6 @@ typedef struct { Terminal *term; /* Display state */ int font_width, font_height; - int has_focus; /* Line discipline */ void *ldisc; /* Backend */ @@ -54,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; @@ -66,10 +51,30 @@ typedef struct { PaletteHandle palette; ControlHandle scrollbar; WCTabHandle wctab; - ThreadID thread; 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 /*