refactor: dispose windows on close

- Try and ensure that the correct port is set when drawing controls to avoid weird issues

macbrew-ui/macbrew.c

@@ -42,7 +42,7 @@ static void HandleZoomWindow(WindowPtr thisWindow, EventRecord *event, short zoo
 
 static void HandleGrowWindow(WindowPtr thisWindow, EventRecord *event, short windowKind)
 {
-	Rect oldViewRect = thisWindow->portRect, limitRect;
+	Rect limitRect;
 	long growSize;
 
 	SetRect(&limitRect, kMinWindowSize, kMinWindowSize, kMaxWindowSize, kMaxWindowSize);
@@ -52,7 +52,6 @@ static void HandleGrowWindow(WindowPtr thisWindow, EventRecord *event, short win
 
 	if (growSize != 0)
 	{
-		Rect newViewRect;
 		// Do the actual resize
 		SizeWindow(thisWindow, LoWord(growSize), HiWord(growSize), TRUE);
 
@@ -115,7 +114,18 @@ static void HandleMouseDown(EventRecord *theEvent)
 		if (
 			TrackGoAway(theWindow, theEvent->where))
 		{
-			HideWindow(theWindow);
+			if (windowKind == kViewSessionWindowId)
+			{
+				SessionViewWindowDestroy(theWindow);
+			}
+			else if (windowKind == kViewStepsWindowId)
+			{
+				StepsViewWindowDestroy(theWindow);
+			}
+			else
+			{
+				HideWindow(theWindow);
+			}
 		}
 		break;
 
@@ -139,6 +149,7 @@ static void HandleEvent(void)
 	int ok;
 	EventRecord theEvent;
 	WindowPtr theWindow;
+	GrafPtr savePort;
 
 	HiliteMenu(0);
 	SystemTask(); /* Handle desk accessories */
@@ -151,6 +162,9 @@ static void HandleEvent(void)
 		theWindow = FrontWindow();
 		windowKind = ((WindowPeek)theWindow)->windowKind;
 
+		GetPort(&savePort);
+		SetPort(theWindow);
+
 		switch (theEvent.what)
 		{
 		case mouseDown:
@@ -203,6 +217,7 @@ static void HandleEvent(void)
 			}
 			break;
 		}
+		SetPort(savePort);
 	}
 }
 

macbrew-ui/mbDSessionList.c

@@ -324,7 +324,6 @@ static Boolean SessionListControlMouseDown(DialogPtr theDialog, EventRecord theE
 	Boolean itemSelected = false;
 	const SessionListDialogState *dialogState = SessionListDialogLockState(theDialog);
 	const ListRec *sessionList = SessionListControlLock(dialogState);
-	ControlHandle selectedControl;
 
 	SetPort(sessionList->port);
 	GlobalToLocal(&theEvent.where);

macbrew-ui/mbDataManager.c

@@ -167,10 +167,6 @@ static void ReadBrewSessionStep(ResponseReader *reader, Handle *outHandle)
 
 	HLock(handle);
 
-	//  StringHandle description;
-	// short time;
-	// BrewSessionStepPhase phase;
-
 	brewSessionStep = (BrewSessionStep *)*handle;
 
 	ReadString(reader, &brewSessionStep->description);

macbrew-ui/mbMenus.c

@@ -99,6 +99,10 @@ void HandleMenu(long mSelect)
 
 			FetchFermentationData((*selectedSession)->id, &fermentationData);
 			SessionViewSetFermentationData(viewSessionWindow, fermentationData);
+
+			// TODO: We own fermentationData and  brewSession so we should probably clean them up
+			// 		 but we don't know when the window is destroyed so should we get
+			//       transfer ownership to the window and let it clean it up?
 			break;
 		}
 		case quitItem:
@@ -123,6 +127,10 @@ void HandleMenu(long mSelect)
 
 			FetchBrewSessionSteps((*selectedSession)->id, &sessionStepsHandle);
 			StepsViewSetSteps(viewStepsWindow, sessionStepsHandle);
+
+			// TODO: We own sessionStepsHandle so we should probably clean it up
+			// 		 but we don't know when the window is destroyed so should we get
+			//       transfer ownership to the window and let it clean it up?
 			break;
 		}
 		break;

macbrew-ui/mbSerial.c

@@ -12,7 +12,7 @@
 // as many bytes as it sends to cancel out the echo
 //
 // Note: This needs to be set to zero when emulating in Basilisk II because there is no fake echo there
-#define SUPRESS_ECHO 0
+#define SUPRESS_ECHO 1
 #define kChecksumBytes 4
 // Accounts for \r\n on every response
 #define kSuffixSize 2

macbrew-ui/mbWViewSession.c

@@ -3,21 +3,24 @@
 #include "mbConstants.h"
 #include "mbWViewSession.h"
 #include "mbTypes.h"
+#include "mbUtil.h"
 
 typedef struct ViewSessionWindowState
 {
 	BrewSessionHandle brewSessionHandle;
 	FermentationDataHandle fermentationDataHandle;
+	GrafPtr previousPort;
 } ViewSessionWindowState;
 
 static void DrawStringHandle(StringHandle stringHandle);
 static void ViewSessionWindowInitState(WindowPtr theWindow);
 static ViewSessionWindowState *ViewSessionWindowLockState(WindowPtr theWindow);
 static void *ViewSessionWindowUnlockState(WindowPtr theWindow);
 static void DrawRow(ConstStr255Param title, StringHandle value, short rowNum);
-static void SetupQuickDraw(WindowPtr window);
-static void DrawSessionInfo(WindowPtr window, BrewSessionHandle brewSessionHandle);
-static void DrawGraph(WindowPtr window, FermentationDataHandle fermentationDataHandle);
+static void SetupQuickDraw(WindowPtr window, ViewSessionWindowState *windowState);
+static void CleanupQuickDraw(ViewSessionWindowState *windowState);
+static void DrawSessionInfo(WindowPtr window, ViewSessionWindowState *windowState);
+static void DrawGraph(WindowPtr window, ViewSessionWindowState *windowState);
 
 // TODO: Maybe move to a utils file?
 static void DrawStringHandle(StringHandle stringHandle)
@@ -38,6 +41,11 @@ static ViewSessionWindowState *ViewSessionWindowLockState(WindowPtr theWindow)
 {
 	Handle viewSessionWindowStateHandle = (Handle)GetWRefCon(theWindow);
 
+	if (viewSessionWindowStateHandle == NULL)
+	{
+		Panic("\pCannot lock state before calling ViewSessionWindowInitState!");
+	}
+
 	HLock(viewSessionWindowStateHandle);
 	return (ViewSessionWindowState *)*viewSessionWindowStateHandle;
 }
@@ -61,45 +69,63 @@ static void DrawRow(ConstStr255Param title, StringHandle value, short rowNum)
 	DrawStringHandle(value);
 }
 
-static void SetupQuickDraw(WindowPtr window)
+static void SetupQuickDraw(WindowPtr window, ViewSessionWindowState *windowState)
 {
+	if (windowState->previousPort != NULL)
+	{
+		Panic("\pSetupQuickDraw called twice without a call to CleanupQuickDraw");
+	}
+
+	GetPort(&windowState->previousPort);
 	// Setup QuickDraw
 	SetPort(window);
 	TextFont(geneva);
 	TextSize(12);
 	PenNormal();
 }
 
-static void DrawSessionInfo(WindowPtr window, BrewSessionHandle brewSessionHandle)
+static void CleanupQuickDraw(ViewSessionWindowState *windowState)
+{
+	// Restore the port that was set before QuickDraw was set up for this window
+	// This function should always be called after SetupQuickDraw or it will panic
+	SetPort(windowState->previousPort);
+	windowState->previousPort = NULL;
+}
+
+static void DrawSessionInfo(WindowPtr window, ViewSessionWindowState *windowState)
 {
 	unsigned short rowNum = 1;
+	BrewSessionHandle brewSessionHandle = windowState->brewSessionHandle;
 	BrewSession *brewSession = NULL;
 
 	HLock((Handle)brewSessionHandle);
 	brewSession = *brewSessionHandle;
 
+	SetupQuickDraw(window, windowState);
+
 	HLock((Handle)brewSession->recipe_title);
 	// Set title to demonstrate its working for now
 	SetWTitle(window, *(brewSession->recipe_title));
 	HUnlock((Handle)brewSession->recipe_title);
 
-	SetupQuickDraw(window);
-
 	DrawRow("\pCreated At:", brewSession->created_at, rowNum++);
 	DrawRow("\pBatch Code:", brewSession->batch_code, rowNum++);
 	DrawRow("\pPhase:", brewSession->phase, rowNum++);
 	DrawRow("\pStyle:", brewSession->style_name, rowNum++);
 
+	CleanupQuickDraw(windowState);
+
 	HUnlock((Handle)brewSessionHandle);
 }
 
-static void DrawGraph(WindowPtr window, FermentationDataHandle fermentationDataHandle)
+static void DrawGraph(WindowPtr window, ViewSessionWindowState *windowState)
 {
+	FermentationDataHandle fermentationDataHandle = windowState->fermentationDataHandle;
 	FermentationData *fermentationData = NULL;
 	Rect graphFrame;
 	unsigned short i, pointSize, maxTemp = 0, maxGravity = 0;
 
-	SetupQuickDraw(window);
+	SetupQuickDraw(window, windowState);
 
 	HLock((Handle)fermentationDataHandle);
 	fermentationData = *fermentationDataHandle;
@@ -136,6 +162,13 @@ static void DrawGraph(WindowPtr window, FermentationDataHandle fermentationDataH
 		HUnlock(dataPointHandle);
 	}
 
+	if (maxTemp == 0 || maxGravity == 0)
+	{
+		HUnlock((Handle)fermentationDataHandle);
+		// Protect against divide by zero crashes
+		return;
+	}
+
 	// TODO: Labels for the graph
 	// TODO: Legend for the graph
 	// TODO: Extract things into functions for DRY
@@ -167,6 +200,8 @@ static void DrawGraph(WindowPtr window, FermentationDataHandle fermentationDataH
 		HUnlock(dataPointHandle);
 	}
 
+	CleanupQuickDraw(windowState);
+
 	HUnlock((Handle)fermentationDataHandle);
 }
 
@@ -177,7 +212,7 @@ WindowPtr SessionViewWindowSetUp(void)
 
 	ViewSessionWindowInitState(viewSessionWindow);
 
-	SetPort(viewSessionWindow);
+	// SetPort(viewSessionWindow);
 
 	return viewSessionWindow;
 }
@@ -186,6 +221,15 @@ void SessionViewWindowDestroy(WindowPtr window)
 {
 	if (window != NULL)
 	{
+		// Clean up the state record
+		Handle viewSessionWindowStateHandle = (Handle)GetWRefCon(window);
+		if (viewSessionWindowStateHandle != NULL)
+		{
+			DisposeHandle(viewSessionWindowStateHandle);
+			SetWRefCon(window, (long)NULL);
+		}
+
+		// DisposeWindow automatically cleans up all the controls by calling DisposeControl for us
 		DisposeWindow(window);
 		window = NULL;
 	}
@@ -196,7 +240,7 @@ void SessionViewSetSession(WindowPtr window, BrewSessionHandle brewSessionHandle
 	ViewSessionWindowState *windowState = ViewSessionWindowLockState(window);
 	windowState->brewSessionHandle = brewSessionHandle;
 
-	DrawSessionInfo(window, brewSessionHandle);
+	DrawSessionInfo(window, windowState);
 
 	ViewSessionWindowUnlockState(window);
 }
@@ -206,7 +250,7 @@ void SessionViewSetFermentationData(WindowPtr window, struct FermentationData **
 	ViewSessionWindowState *windowState = ViewSessionWindowLockState(window);
 	windowState->fermentationDataHandle = fermentationDataHandle;
 
-	DrawGraph(window, fermentationDataHandle);
+	DrawGraph(window, windowState);
 
 	ViewSessionWindowUnlockState(window);
 }
@@ -219,12 +263,12 @@ void SessionViewUpdate(WindowPtr window)
 
 	if (brewSessionHandle != NULL)
 	{
-		DrawSessionInfo(window, windowState->brewSessionHandle);
+		DrawSessionInfo(window, windowState);
 	}
 
 	if (fermentationDataHandle != NULL)
 	{
-		DrawGraph(window, windowState->fermentationDataHandle);
+		DrawGraph(window, windowState);
 	}
 
 	ViewSessionWindowUnlockState(window);