-/* $Id: mac.c,v 1.39 2003/02/01 15:44:08 ben Exp $ */
+/* $Id: mac.c,v 1.45 2003/02/04 23:39:26 ben Exp $ */
/*
* Copyright (c) 1999 Ben Harris
* All rights reserved.
#include <DiskInit.h>
#include <Gestalt.h>
#include <LowMem.h>
+#include <Navigation.h>
#include <Resources.h>
#include <Script.h>
#include <TextCommon.h>
#include "ssh.h"
#include "mac.h"
+#if !TARGET_API_MAC_CARBON
QDGlobals qd;
+#endif
Session *sesslist;
Handle menuBar;
TECInfoHandle ti;
+#if !TARGET_API_MAC_CARBON
/* Init Memory Manager */
MaxApplZone();
/* Init QuickDraw */
TEInit();
/* Init Dialog Manager */
InitDialogs(NULL);
+#endif
cold = 0;
/* Get base system version (only used if there's no better selector) */
mac_gestalts.uncvattr = (*ti)->tecUnicodeConverterFeatures;
DisposeHandle((Handle)ti);
}
+ /* Navigation Services? */
+ if (NavServicesAvailable())
+ mac_gestalts.navsvers = NavLibraryVersion();
+ else
+ mac_gestalts.navsvers = 0;
sk_init();
}
flags = FLAG_INTERACTIVE;
+#if !TARGET_API_MAC_CARBON
{
short vol;
long dirid;
LMSetCurDirStore(dirid);
}
}
+#endif
/* Install Apple Event handlers. */
AEInstallEventHandler(kCoreEventClass, kAEOpenApplication,
static void mac_event(EventRecord *event) {
short part;
WindowPtr window;
- Point pt;
switch (event->what) {
case mouseDown:
mac_adjustmenus();
mac_menucommand(MenuSelect(event->where));
break;
+#if !TARGET_API_MAC_CARBON
case inSysWindow:
SystemClick(event, window);
break;
+#endif
case inContent:
if (window != FrontWindow())
/* XXX: check for movable modal dboxes? */
break;
case inDrag:
/* XXX: moveable modal check? */
+#if TARGET_API_MAC_CARBON
+ {
+ BitMap screenBits;
+
+ GetQDGlobalsScreenBits(&screenBits);
+ DragWindow(window, event->where, &screenBits.bounds);
+ }
+#else
DragWindow(window, event->where, &qd.screenBits.bounds);
+#endif
break;
case inGrow:
mac_growwindow(window, event);
case updateEvt:
mac_updatewindow((WindowPtr)event->message);
break;
+#if !TARGET_API_MAC_CARBON
case diskEvt:
if (HiWord(event->message) != noErr) {
+ Point pt;
+
SetPt(&pt, 120, 120);
DIBadMount(pt, event->message);
}
break;
+#endif
case kHighLevelEvent:
AEProcessAppleEvent(event); /* errors? */
break;
static void mac_contentclick(WindowPtr window, EventRecord *event) {
short item;
+ DialogRef dialog;
switch (mac_windowtype(window)) {
case wTerminal:
mac_clickterm(window, event);
break;
case wAbout:
- if (DialogSelect(event, &window, &item))
+ dialog = GetDialogFromWindow(window);
+ if (DialogSelect(event, &dialog, &item))
switch (item) {
case wiAboutLicence:
mac_openlicence();
}
static void mac_activateabout(WindowPtr window, EventRecord *event) {
+ DialogRef dialog;
DialogItemType itemtype;
Handle itemhandle;
short item;
Rect itemrect;
int active;
+ dialog = GetDialogFromWindow(window);
active = (event->modifiers & activeFlag) != 0;
- GetDialogItem(window, wiAboutLicence, &itemtype, &itemhandle, &itemrect);
+ GetDialogItem(dialog, wiAboutLicence, &itemtype, &itemhandle, &itemrect);
HiliteControl((ControlHandle)itemhandle, active ? 0 : 255);
- DialogSelect(event, &window, &item);
+ DialogSelect(event, &dialog, &item);
}
-static void mac_updatewindow(WindowPtr window) {
+static void mac_updatewindow(WindowPtr window)
+{
+#if TARGET_API_MAC_CARBON
+ RgnHandle rgn;
+#endif
switch (mac_windowtype(window)) {
case wTerminal:
case wAbout:
case wSettings:
BeginUpdate(window);
+#if TARGET_API_MAC_CARBON
+ rgn = NewRgn();
+ GetPortVisibleRegion(GetWindowPort(window), rgn);
+ UpdateDialog(GetDialogFromWindow(window), rgn);
+ DisposeRgn(rgn);
+#else
UpdateDialog(window, window->visRgn);
+#endif
EndUpdate(window);
break;
case wLicence:
Handle h;
int len;
long fondsize;
+ Rect textrect;
- SetPort(window);
+ SetPort((GrafPtr)GetWindowPort(window));
BeginUpdate(window);
fondsize = GetScriptVariable(smRoman, smScriptSmallFondSize);
TextFont(HiWord(fondsize));
TextSize(LoWord(fondsize));
h = Get1Resource('TEXT', wLicence);
len = GetResourceSizeOnDisk(h);
+#if TARGET_API_MAC_CARBON
+ GetPortBounds(GetWindowPort(window), &textrect);
+#else
+ textrect = window->portRect;
+#endif
if (h != NULL) {
HLock(h);
- TETextBox(*h, len, &window->portRect, teFlushDefault);
+ TETextBox(*h, len, &textrect, teFlushDefault);
HUnlock(h);
}
EndUpdate(window);
/*
* Work out what kind of window we're dealing with.
- * Concept shamelessly nicked from SurfWriter.
*/
-static int mac_windowtype(WindowPtr window) {
- int kind;
- long refcon;
-
- if (window == NULL)
- return wNone;
- kind = ((WindowPeek)window)->windowKind;
- if (kind < 0)
+static int mac_windowtype(WindowPtr window)
+{
+
+#if !TARGET_API_MAC_CARBON
+ if (GetWindowKind(window) < 0)
return wDA;
- if (GetWVariant(window) == zoomDocProc)
- return wTerminal;
- refcon = GetWRefCon(window);
- if (refcon < 1024)
- return refcon;
- else
- return wSettings;
+#endif
+ return ((WinInfo *)GetWRefCon(window))->wtype;
}
/*
static void mac_menucommand(long result) {
short menu, item;
- Str255 da;
WindowPtr window;
+#if !TARGET_API_MAC_CARBON
+ Str255 da;
+#endif
menu = HiWord(result);
item = LoWord(result);
case iAbout:
mac_openabout();
goto done;
+#if !TARGET_API_MAC_CARBON
default:
GetMenuItemText(GetMenuHandle(mApple), item, da);
OpenDeskAcc(da);
goto done;
+#endif
}
break;
case mFile:
VersRecHndl vers;
Rect box;
StringPtr longvers;
+ WinInfo *wi;
if (windows.about)
SelectWindow(windows.about);
else {
- windows.about = GetNewDialog(wAbout, NULL, (WindowPtr)-1);
+ windows.about =
+ GetDialogWindow(GetNewDialog(wAbout, NULL, (WindowPtr)-1));
+ wi = smalloc(sizeof(*wi));
+ wi->s = NULL;
+ wi->wtype = wAbout;
+ SetWRefCon(windows.about, (long)wi);
vers = (VersRecHndl)Get1Resource('vers', 1);
if (vers != NULL && *vers != NULL) {
longvers = (*vers)->shortVersion + (*vers)->shortVersion[0] + 1;
- GetDialogItem(windows.about, wiAboutVersion,
+ GetDialogItem(GetDialogFromWindow(windows.about), wiAboutVersion,
&itemtype, &item, &box);
assert(itemtype & kStaticTextDialogItem);
SetDialogItemText(item, longvers);
}
static void mac_openlicence(void) {
+ WinInfo *wi;
if (windows.licence)
SelectWindow(windows.licence);
else {
windows.licence = GetNewWindow(wLicence, NULL, (WindowPtr)-1);
+ wi = smalloc(sizeof(*wi));
+ wi->s = NULL;
+ wi->wtype = wLicence;
+ SetWRefCon(windows.licence, (long)wi);
ShowWindow(windows.licence);
}
}
static void mac_closewindow(WindowPtr window) {
switch (mac_windowtype(window)) {
+#if !TARGET_API_MAC_CARBON
case wDA:
- CloseDeskAcc(((WindowPeek)window)->windowKind);
+ CloseDeskAcc(GetWindowKind(window));
break;
+#endif
case wTerminal:
mac_closeterm(window);
break;
case wAbout:
windows.about = NULL;
- DisposeDialog(window);
+ DisposeDialog(GetDialogFromWindow(window));
break;
case wLicence:
windows.licence = NULL;
/*
* Make the menus look right before the user gets to see them.
*/
+#if TARGET_API_MAC_CARBON
+#define EnableItem EnableMenuItem
+#define DisableItem DisableMenuItem
+#endif
static void mac_adjustmenus(void) {
WindowPtr window;
MenuHandle menu;
Point mouse;
WindowPtr window, front;
short part;
+#if TARGET_API_MAC_CARBON
+ Cursor arrow;
+ RgnHandle visrgn;
+#endif
GetMouse(&mouse);
LocalToGlobal(&mouse);
front = FrontWindow();
if (part != inContent || window == NULL || window != front) {
/* Cursor isn't in the front window, so switch to arrow */
+#if TARGET_API_MAC_CARBON
+ GetQDGlobalsArrow(&arrow);
+ SetCursor(&arrow);
+#else
SetCursor(&qd.arrow);
+#endif
SetRectRgn(cursrgn, SHRT_MIN, SHRT_MIN, SHRT_MAX, SHRT_MAX);
- if (front != NULL)
+ if (front != NULL) {
+#if TARGET_API_MAC_CARBON
+ visrgn = NewRgn();
+ GetPortVisibleRegion(GetWindowPort(front), visrgn);
+ DiffRgn(cursrgn, visrgn, cursrgn);
+ DisposeRgn(visrgn);
+#else
DiffRgn(cursrgn, front->visRgn, cursrgn);
+#endif
+ }
} else {
switch (mac_windowtype(window)) {
case wTerminal:
mac_adjusttermcursor(window, mouse, cursrgn);
break;
default:
+#if TARGET_API_MAC_CARBON
+ GetQDGlobalsArrow(&arrow);
+ SetCursor(&arrow);
+ GetPortVisibleRegion(GetWindowPort(window), cursrgn);
+#else
SetCursor(&qd.arrow);
CopyRgn(window->visRgn, cursrgn);
+#endif
break;
}
}
{
Filename ret;
if (!strcmp(name, "LogFileName"))
- strcpy(ret.path, "putty.log");
+ FSMakeFSSpec(0, 0, "\pputty.log", &ret.fss);
else
- *ret.path = '\0';
+ memset(&ret, 0, sizeof(ret));
return ret;
}
/* SGT: I have no idea whether Mac X servers need anything here. */
}
-Filename filename_from_str(char *str)
+Filename filename_from_str(const char *str)
{
Filename ret;
- strncpy(ret.path, str, sizeof(ret.path));
- ret.path[sizeof(ret.path)-1] = '\0';
+ Str255 tmp;
+
+ /* XXX This fails for filenames over 255 characters long. */
+ c2pstrcpy(tmp, str);
+ FSMakeFSSpec(0, 0, tmp, &ret.fss);
return ret;
}
-char *filename_to_str(Filename fn)
+/*
+ * Convert a filename to a string for display purposes.
+ * See pp 2-44--2-46 of IM:Files
+ *
+ * XXX static storage considered harmful
+ */
+const char *filename_to_str(const Filename *fn)
{
- /* FIXME: Memory leak! */
-
- return dupstr(fn.path);
+ CInfoPBRec pb;
+ Str255 dirname;
+ OSErr err;
+ static char *path = NULL;
+ char *newpath;
+
+ if (path != NULL) sfree(path);
+ path = smalloc(fn->fss.name[0]);
+ p2cstrcpy(path, fn->fss.name);
+ pb.dirInfo.ioNamePtr = dirname;
+ pb.dirInfo.ioVRefNum = fn->fss.vRefNum;
+ pb.dirInfo.ioDrParID = fn->fss.parID;
+ pb.dirInfo.ioFDirIndex = -1;
+ do {
+ pb.dirInfo.ioDrDirID = pb.dirInfo.ioDrParID;
+ err = PBGetCatInfoSync(&pb);
+
+ /* XXX Assume not A/UX */
+ newpath = smalloc(strlen(path) + dirname[0] + 2);
+ p2cstrcpy(newpath, dirname);
+ strcat(newpath, ":");
+ strcat(newpath, path);
+ sfree(path);
+ path = newpath;
+ } while (pb.dirInfo.ioDrDirID != fsRtDirID);
+ return path;
}
int filename_equal(Filename f1, Filename f2)
{
- return !strcmp(f1.path, f2.path);
+
+ return f1.fss.vRefNum == f2.fss.vRefNum &&
+ f1.fss.parID == f2.fss.parID &&
+ f1.fss.name[0] == f2.fss.name[0] &&
+ memcmp(f1.fss.name + 1, f2.fss.name + 1, f1.fss.name[0]) == 0;
}
int filename_is_null(Filename fn)
{
- return !*fn.path;
+
+ return fn.fss.vRefNum == 0 && fn.fss.parID == 0 && fn.fss.name[0] == 0;
+}
+
+FILE *f_open(Filename fn, char const *mode)
+{
+ short savevol;
+ long savedir;
+ char tmp[256];
+ FILE *ret;
+
+ HGetVol(NULL, &savevol, &savedir);
+ if (HSetVol(NULL, fn.fss.vRefNum, fn.fss.parID) == noErr) {
+ p2cstrcpy(tmp, fn.fss.name);
+ ret = fopen(tmp, mode);
+ } else
+ ret = NULL;
+ HSetVol(NULL, savevol, savedir);
+ return ret;
}
/*
projects / u / mdw / putty / blobdiff