[nostalgia/studio] Add command for bundling Mac app

Makefile

@@ -17,6 +17,10 @@ PROJECT_PLAYER=./build/${BC_VAR_CURRENT_BUILD}/bin/${BC_VAR_PROJECT_NAME_CAP}
 pkg-gba: build
 	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-gba.py sample_project ${BC_VAR_PROJECT_NAME_CAP}
 
+.PHONY: pkg-mac
+pkg-mac: install
+	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-dmg.py
+
 .PHONY: generate-studio-rsrc
 generate-studio-rsrc:
 	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/file-to-cpp.py --rsrc src/olympic/studio/applib/src/rsrc.json

deps/ox/src/ox/mc/write.hpp

@@ -211,11 +211,14 @@ constexpr Error MetalClawWriter<Writer>::field(const char *name, const IString<L
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *const*val, std::size_t buffLen) noexcept {
+constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *const*val, std::size_t) noexcept {
 	bool fieldSet = false;
 	if (!m_unionIdx.has_value() || *m_unionIdx == m_field) {
 		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-		const auto strLen = *val ? ox::strnlen_s(*val, buffLen) : 0;
+		// this strlen is tolerated because sometimes 0 gets passed to
+		// the size param, which is a lie
+		// this code should be cleaned up at some point...
+		const auto strLen = *val ? ox::strlen(*val) : 0;
 		OX_ALLOW_UNSAFE_BUFFERS_END
 		// write the length
 		const auto strLenBuff = mc::encodeInteger(strLen);

release-notes.md

@@ -1,10 +1,15 @@
-# d2025.04.0
+# d2025.05.0
 
 * Add app icon for both window and file
+* Closing application will now confirm with user if any files have unsaved
+  changes.
 * Fix selection clearing in TileSheet editor to work when clicking outside
   image.
 * Fix color number key range in PalettEditor. Previously, pressing A caused the
   editor to jump to the last color.
+* UUID duplicates will now be reported when opening a project
+* PalettEditor: page rename will now take effect upon pressing enter if the
+  text input has focus
 
 # d2025.02.1
 

src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.cpp

@@ -68,7 +68,7 @@ void PaletteEditorImGui::PageRenameDialog::draw(turbine::Context &tctx) noexcept
 }
 
 
-PaletteEditorImGui::PaletteEditorImGui(studio::StudioContext &sctx, ox::StringParam path):
+PaletteEditorImGui::PaletteEditorImGui(studio::Context &sctx, ox::StringParam path):
 		Editor(sctx, std::move(path)),
 		m_sctx(sctx),
 		m_tctx(sctx.tctx),
@@ -77,7 +77,7 @@ PaletteEditorImGui::PaletteEditorImGui(studio::StudioContext &sctx, ox::StringPa
 	m_pageRenameDlg.inputSubmitted.connect(this, &PaletteEditorImGui::renamePage);
 }
 
-void PaletteEditorImGui::draw(studio::StudioContext&) noexcept {
+void PaletteEditorImGui::draw(studio::Context&) noexcept {
 	auto const paneSize = ImGui::GetContentRegionAvail();
 	{
 		ImGui::BeginChild("Pages", {280, paneSize.y}, true);

src/nostalgia/modules/gfx/src/studio/paletteeditor/paletteeditor-imgui.hpp

@@ -31,16 +31,16 @@ class PaletteEditorImGui: public studio::Editor {
 				constexpr bool isOpen() const noexcept { return m_show; }
 				void draw(turbine::Context &tctx) noexcept;
 		} m_pageRenameDlg;
-		studio::StudioContext &m_sctx;
+		studio::Context &m_sctx;
 		turbine::Context &m_tctx;
 		Palette m_pal;
 		size_t m_selectedColorRow = 0;
 		size_t m_page = 0;
 
 	public:
-		PaletteEditorImGui(studio::StudioContext &sctx, ox::StringParam path);
+		PaletteEditorImGui(studio::Context &sctx, ox::StringParam path);
 
-		void draw(studio::StudioContext&) noexcept final;
+		void draw(studio::Context&) noexcept final;
 
 	protected:
 		ox::Error saveItem() noexcept final;

src/nostalgia/modules/gfx/src/studio/studiomodule.cpp

@@ -12,14 +12,14 @@
 namespace nostalgia::gfx {
 
 static class: public studio::Module {
-	ox::Vector<studio::EditorMaker> editors(studio::StudioContext &ctx) const noexcept final {
+	ox::Vector<studio::EditorMaker> editors(studio::Context &ctx) const noexcept final {
 		return {
 			studio::editorMaker<TileSheetEditorImGui>(ctx, {FileExt_ng, FileExt_nts}),
 			studio::editorMaker<PaletteEditorImGui>(ctx, FileExt_npal),
 		};
 	}
 
-	ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(studio::StudioContext&) const noexcept final {
+	ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(studio::Context&) const noexcept final {
 		ox::Vector<ox::UPtr<studio::ItemMaker>> out;
 		out.emplace_back(ox::make<studio::ItemMakerT<TileSheet>>("Tile Sheet", "TileSheets", FileExt_nts));
 		out.emplace_back(ox::make<studio::ItemMakerT<Palette>>("Palette", "Palettes", FileExt_npal, Palette{

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.cpp

@@ -87,7 +87,7 @@ static ox::Error toPngFile(
 					8)));
 }
 
-TileSheetEditorImGui::TileSheetEditorImGui(studio::StudioContext &sctx, ox::StringParam path):
+TileSheetEditorImGui::TileSheetEditorImGui(studio::Context &sctx, ox::StringParam path):
 		Editor(sctx, std::move(path)),
 		m_sctx{sctx},
 		m_tctx{m_sctx.tctx},
@@ -188,7 +188,7 @@ void TileSheetEditorImGui::keyStateChanged(turbine::Key const key, bool const do
 	}
 }
 
-void TileSheetEditorImGui::draw(studio::StudioContext&) noexcept {
+void TileSheetEditorImGui::draw(studio::Context&) noexcept {
 	if (ig::mainWinHasFocus() && m_tool == TileSheetTool::Select) {
 		if (ImGui::IsKeyDown(ImGuiKey_ModCtrl) && !m_palPathFocused) {
 			if (ImGui::IsKeyPressed(ImGuiKey_A)) {

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditor-imgui.hpp

@@ -45,7 +45,7 @@ class TileSheetEditorImGui: public studio::Editor {
 				constexpr bool isOpen() const noexcept { return m_show; }
 		};
 		static constexpr float s_palViewWidth = 335;
-		studio::StudioContext &m_sctx;
+		studio::Context &m_sctx;
 		turbine::Context &m_tctx;
 		ox::Vector<ox::String> m_paletteList;
 		SubSheetEditor m_subsheetEditor;
@@ -60,7 +60,7 @@ class TileSheetEditorImGui: public studio::Editor {
 		ox::Vector<ox::UPtr<studio::UndoCommand>, 1> m_deferredCmds;
 
 	public:
-		TileSheetEditorImGui(studio::StudioContext &sctx, ox::StringParam path);
+		TileSheetEditorImGui(studio::Context &sctx, ox::StringParam path);
 
 		~TileSheetEditorImGui() override = default;
 
@@ -77,7 +77,7 @@ class TileSheetEditorImGui: public studio::Editor {
 
 		void keyStateChanged(turbine::Key key, bool down) override;
 
-		void draw(studio::StudioContext&) noexcept override;
+		void draw(studio::Context&) noexcept override;
 
 		void drawSubsheetSelector(TileSheet::SubSheet&, TileSheet::SubSheetIdx &path);
 

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.cpp

@@ -45,7 +45,7 @@ Palette const TileSheetEditorModel::s_defaultPalette = {
 };
 
 TileSheetEditorModel::TileSheetEditorModel(
-		studio::StudioContext &sctx, ox::StringParam path, studio::UndoStack &undoStack):
+		studio::Context &sctx, ox::StringParam path, studio::UndoStack &undoStack):
 		m_sctx(sctx),
 		m_tctx(m_sctx.tctx),
 		m_path(std::move(path)),

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditormodel.hpp

@@ -22,7 +22,7 @@ class TileSheetEditorModel: public ox::SignalHandler {
 
 	private:
 		static Palette const s_defaultPalette;
-		studio::StudioContext &m_sctx;
+		studio::Context &m_sctx;
 		turbine::Context &m_tctx;
 		ox::String m_path;
 		ox::String m_palPath;
@@ -39,7 +39,7 @@ class TileSheetEditorModel: public ox::SignalHandler {
 		bool m_updated = false;
 
 	public:
-		TileSheetEditorModel(studio::StudioContext &sctx, ox::StringParam path, studio::UndoStack &undoStack);
+		TileSheetEditorModel(studio::Context &sctx, ox::StringParam path, studio::UndoStack &undoStack);
 
 		~TileSheetEditorModel() override = default;
 

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditorview.cpp

@@ -12,7 +12,7 @@
 namespace nostalgia::gfx {
 
 TileSheetEditorView::TileSheetEditorView(
-		studio::StudioContext &sctx, ox::StringViewCR path, studio::UndoStack &undoStack):
+		studio::Context &sctx, ox::StringViewCR path, studio::UndoStack &undoStack):
 	m_model(sctx, path, undoStack),
 	m_pixelsDrawer(m_model) {
 	glBindVertexArray(0);

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/tilesheeteditorview.hpp

@@ -56,7 +56,7 @@ class TileSheetEditorView: public ox::SignalHandler {
 		std::size_t m_palIdx = 0;
 
 	public:
-		TileSheetEditorView(studio::StudioContext &sctx, ox::StringViewCR path, studio::UndoStack &undoStack);
+		TileSheetEditorView(studio::Context &sctx, ox::StringViewCR path, studio::UndoStack &undoStack);
 
 		~TileSheetEditorView() override = default;
 

src/nostalgia/modules/sound/src/studio/studiomodule.cpp

@@ -9,12 +9,12 @@
 namespace nostalgia::sound {
 
 static class: public studio::Module {
-	ox::Vector<studio::EditorMaker> editors(studio::StudioContext&) const noexcept final {
+	ox::Vector<studio::EditorMaker> editors(studio::Context&) const noexcept final {
 		return {
 		};
 	}
 
-	ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(studio::StudioContext&) const noexcept final {
+	ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(studio::Context&) const noexcept final {
 		ox::Vector<ox::UPtr<studio::ItemMaker>> out;
 		return out;
 	}

src/nostalgia/studio/CMakeLists.txt

@@ -15,7 +15,7 @@ target_link_libraries(
 
 target_compile_definitions(
 	NostalgiaStudio PUBLIC
-		OLYMPIC_APP_VERSION="dev build"
+		OLYMPIC_APP_VERSION="d2025.05.0"
 )
 
 install(

src/nostalgia/studio/Info.plist

@@ -18,7 +18,7 @@
 	<string>APPL</string>
 
 	<key>CFBundleVersion</key>
-	<string>dev build</string>
+	<string>d2025.05.0</string>
 
 	<key>LSMinimumSystemVersion</key>
 	<string>12.0.0</string>

src/olympic/studio/applib/src/aboutpopup.cpp

@@ -29,7 +29,7 @@ bool AboutPopup::isOpen() const noexcept {
 	return m_stage == Stage::Open;
 }
 
-void AboutPopup::draw(StudioContext &sctx) noexcept {
+void AboutPopup::draw(Context &sctx) noexcept {
 	if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
 		close();
 		return;

src/olympic/studio/applib/src/aboutpopup.hpp

@@ -35,7 +35,7 @@ class AboutPopup: public studio::Popup {
 		[[nodiscard]]
 		bool isOpen() const noexcept override;
 
-		void draw(studio::StudioContext &sctx) noexcept override;
+		void draw(studio::Context &sctx) noexcept override;
 
 };
 

src/olympic/studio/applib/src/app.cpp

@@ -28,7 +28,7 @@ class StudioUIDrawer: public turbine::gl::Drawer {
 };
 
 static void keyEventHandler(turbine::Context &ctx, turbine::Key key, bool down) noexcept {
-	auto sctx = turbine::applicationData<studio::StudioContext>(ctx);
+	auto sctx = turbine::applicationData<studio::Context>(ctx);
 	sctx->ui.handleKeyEvent(key, down);
 }
 

src/olympic/studio/applib/src/clawviewer.cpp

@@ -8,12 +8,12 @@
 
 namespace studio {
 
-ClawEditor::ClawEditor(StudioContext &sctx, ox::StringParam path):
+ClawEditor::ClawEditor(Context &sctx, ox::StringParam path):
 	Editor(sctx, std::move(path)),
 	m_obj(sctx.project->loadObj<ox::ModelObject>(itemPath()).unwrapThrow()) {
 }
 
-void ClawEditor::draw(StudioContext&) noexcept {
+void ClawEditor::draw(Context&) noexcept {
 	ImGui::BeginChild("PaletteEditor");
 	static constexpr auto flags = ImGuiTableFlags_RowBg | ImGuiTableFlags_NoBordersInBody;
 	if (ImGui::BeginTable("ObjTree", 3, flags)) {

src/olympic/studio/applib/src/clawviewer.hpp

@@ -16,9 +16,9 @@ class ClawEditor: public Editor {
 		using ObjPath = ox::Vector<ox::StringView, 8>;
 		ox::ModelObject m_obj;
 	public:
-		ClawEditor(StudioContext &sctx, ox::StringParam path);
+		ClawEditor(Context &sctx, ox::StringParam path);
 
-		void draw(StudioContext&) noexcept final;
+		void draw(Context&) noexcept final;
 
 	private:
 		static void drawRow(ox::ModelValue const&value) noexcept;

src/olympic/studio/applib/src/deleteconfirmation.cpp

@@ -31,7 +31,7 @@ bool DeleteConfirmation::isOpen() const noexcept {
 	return m_open;
 }
 
-void DeleteConfirmation::draw(StudioContext &ctx) noexcept {
+void DeleteConfirmation::draw(Context &ctx) noexcept {
 	if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
 		close();
 		return;

src/olympic/studio/applib/src/deleteconfirmation.hpp

@@ -36,7 +36,7 @@ class DeleteConfirmation final: public Popup {
 		[[nodiscard]]
 		bool isOpen() const noexcept override;
 
-		void draw(StudioContext &ctx) noexcept override;
+		void draw(Context &ctx) noexcept override;
 
 };
 

src/olympic/studio/applib/src/makecopypopup.cpp

@@ -28,7 +28,7 @@ bool MakeCopyPopup::isOpen() const noexcept {
 	return m_open;
 }
 
-void MakeCopyPopup::draw(StudioContext &ctx) noexcept {
+void MakeCopyPopup::draw(Context &ctx) noexcept {
 	switch (m_stage) {
 		case Stage::Closed:
 			break;
@@ -70,7 +70,7 @@ void MakeCopyPopup::draw(StudioContext &ctx) noexcept {
 	}
 }
 
-void MakeCopyPopup::accept(StudioContext const &ctx) noexcept {
+void MakeCopyPopup::accept(Context const &ctx) noexcept {
 	auto const p = sfmt("{}{}", m_dirPath, m_fileName);
 	if (!ctx.project->exists(p)) {
 		makeCopy.emit(m_srcPath, p);

src/olympic/studio/applib/src/makecopypopup.hpp

@@ -37,10 +37,10 @@ class MakeCopyPopup: public Widget {
 		[[nodiscard]]
 		bool isOpen() const noexcept;
 
-		void draw(StudioContext &ctx) noexcept override;
+		void draw(Context &ctx) noexcept override;
 
 	private:
-		void accept(StudioContext const &ctx) noexcept;
+		void accept(Context const &ctx) noexcept;
 };
 
 }

src/olympic/studio/applib/src/newdir.cpp

@@ -32,7 +32,7 @@ bool NewDir::isOpen() const noexcept {
 	return m_open;
 }
 
-void NewDir::draw(StudioContext &ctx) noexcept {
+void NewDir::draw(Context &ctx) noexcept {
 	if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
 		close();
 		return;

src/olympic/studio/applib/src/newdir.hpp

@@ -37,7 +37,7 @@ class NewDir final: public Popup {
 		[[nodiscard]]
 		bool isOpen() const noexcept override;
 
-		void draw(StudioContext &ctx) noexcept override;
+		void draw(Context &ctx) noexcept override;
 
 		[[nodiscard]]
 		constexpr ox::CStringView value() const noexcept {

src/olympic/studio/applib/src/newmenu.cpp

@@ -44,7 +44,7 @@ bool NewMenu::isOpen() const noexcept {
 	return m_open;
 }
 
-void NewMenu::draw(StudioContext &sctx) noexcept {
+void NewMenu::draw(Context &sctx) noexcept {
 	if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
 		close();
 		return;
@@ -88,7 +88,7 @@ void NewMenu::installItemTemplate(ox::UPtr<ItemTemplate> &tmplt) noexcept {
 	}
 }
 
-void NewMenu::drawNewItemType(StudioContext const&sctx) noexcept {
+void NewMenu::drawNewItemType(Context const&sctx) noexcept {
 	setSize({280, 180});
 	drawWindow(sctx.tctx, m_open, [this] {
 		ig::ListBox("Item Type", [&](size_t const i) -> ox::CStringView {
@@ -105,7 +105,7 @@ void NewMenu::drawNewItemType(StudioContext const&sctx) noexcept {
 	});
 }
 
-void NewMenu::drawNewItemTemplate(StudioContext const&sctx) noexcept {
+void NewMenu::drawNewItemTemplate(Context const&sctx) noexcept {
 	setSize({280, 180});
 	drawWindow(sctx.tctx, m_open, [this] {
 		auto const&templates =
@@ -117,7 +117,7 @@ void NewMenu::drawNewItemTemplate(StudioContext const&sctx) noexcept {
 	});
 }
 
-void NewMenu::drawNewItemPath(StudioContext &sctx) noexcept {
+void NewMenu::drawNewItemPath(Context &sctx) noexcept {
 	setSize({380, 340});
 	drawWindow(sctx.tctx, m_open, [this, &sctx] {
 		if (m_stage == Stage::NewItemTransitioningToPath) [[unlikely]] {
@@ -170,7 +170,7 @@ void NewMenu::drawFirstPageButtons(Stage const next) noexcept {
 	}
 }
 
-void NewMenu::drawLastPageButtons(StudioContext &sctx) noexcept {
+void NewMenu::drawLastPageButtons(Context &sctx) noexcept {
 	ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 198);
 	ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 20);
 	constexpr ImVec2 btnSz{60, 20};
@@ -191,7 +191,7 @@ void NewMenu::drawLastPageButtons(StudioContext &sctx) noexcept {
 	}
 }
 
-void NewMenu::finish(StudioContext &sctx) noexcept {
+void NewMenu::finish(Context &sctx) noexcept {
 	if (m_itemName.len() == 0) {
 		oxLogError(ox::Error{1, "New file error: no file name"});
 		return;

src/olympic/studio/applib/src/newmenu.hpp

@@ -53,7 +53,7 @@ class NewMenu final: public Popup {
 		[[nodiscard]]
 		bool isOpen() const noexcept override;
 
-		void draw(StudioContext &sctx) noexcept override;
+		void draw(Context &sctx) noexcept override;
 
 		template<typename T>
 		void addItemType(
@@ -75,19 +75,19 @@ class NewMenu final: public Popup {
 		void installItemTemplate(ox::UPtr<ItemTemplate> &tmplt) noexcept;
 
 	private:
-		void drawNewItemType(StudioContext const&sctx) noexcept;
+		void drawNewItemType(Context const&sctx) noexcept;
 
-		void drawNewItemPath(StudioContext &sctx) noexcept;
+		void drawNewItemPath(Context &sctx) noexcept;
 
-		void drawNewItemTemplate(StudioContext const &sctx) noexcept;
+		void drawNewItemTemplate(Context const &sctx) noexcept;
 
 		void drawButtons(Stage next) noexcept;
 
 		void drawFirstPageButtons(Stage next) noexcept;
 
-		void drawLastPageButtons(StudioContext &sctx) noexcept;
+		void drawLastPageButtons(Context &sctx) noexcept;
 
-		void finish(StudioContext &sctx) noexcept;
+		void finish(Context &sctx) noexcept;
 
 };
 

src/olympic/studio/applib/src/newproject.cpp

@@ -33,7 +33,7 @@ bool NewProject::isOpen() const noexcept {
 	return m_open;
 }
 
-void NewProject::draw(StudioContext &ctx) noexcept {
+void NewProject::draw(Context &ctx) noexcept {
 	if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
 		close();
 		return;
@@ -53,7 +53,7 @@ void NewProject::draw(StudioContext &ctx) noexcept {
 	}
 }
 
-void NewProject::drawNewProjectName(StudioContext &sctx) noexcept {
+void NewProject::drawNewProjectName(Context &sctx) noexcept {
 	drawWindow(sctx.tctx, m_open, [this, &sctx] {
 		ig::InputText("Name", m_projectName);
 		ImGui::Text("Path: %s", m_projectPath.c_str());
@@ -64,7 +64,7 @@ void NewProject::drawNewProjectName(StudioContext &sctx) noexcept {
 	});
 }
 
-void NewProject::drawLastPageButtons(StudioContext&) noexcept {
+void NewProject::drawLastPageButtons(Context&) noexcept {
 	ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 110);
 	ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 22);
 	if (ig::PushButton("Finish")) {

src/olympic/studio/applib/src/newproject.hpp

@@ -42,12 +42,12 @@ class NewProject: public studio::Popup {
 		[[nodiscard]]
 		bool isOpen() const noexcept override;
 
-		void draw(studio::StudioContext &ctx) noexcept override;
+		void draw(studio::Context &ctx) noexcept override;
 
 	private:
-		void drawNewProjectName(studio::StudioContext &ctx) noexcept;
+		void drawNewProjectName(studio::Context &ctx) noexcept;
 
-		void drawLastPageButtons(studio::StudioContext &ctx) noexcept;
+		void drawLastPageButtons(studio::Context &ctx) noexcept;
 
 		void finish() noexcept;
 

src/olympic/studio/applib/src/renamefile.cpp

@@ -34,7 +34,7 @@ bool RenameFile::isOpen() const noexcept {
 	return m_open;
 }
 
-void RenameFile::draw(StudioContext &ctx) noexcept {
+void RenameFile::draw(Context &ctx) noexcept {
 	if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
 		close();
 		return;

src/olympic/studio/applib/src/renamefile.hpp

@@ -38,7 +38,7 @@ class RenameFile: public Popup {
 		[[nodiscard]]
 		bool isOpen() const noexcept override;
 
-		void draw(StudioContext &ctx) noexcept override;
+		void draw(Context &ctx) noexcept override;
 
 };
 

src/olympic/studio/applib/src/studioui.cpp

@@ -26,11 +26,11 @@
 namespace studio {
 
 static bool shutdownHandler(turbine::Context &ctx) {
-	auto sctx = turbine::applicationData<StudioContext>(ctx);
+	auto sctx = turbine::applicationData<Context>(ctx);
 	return sctx->ui.handleShutdown();
 }
 
-void navigateTo(StudioContext &ctx, ox::StringParam filePath, ox::StringParam navArgs) noexcept {
+void navigateTo(Context &ctx, ox::StringParam filePath, ox::StringParam navArgs) noexcept {
 	ctx.ui.navigateTo(std::move(filePath), std::move(navArgs));
 }
 
@@ -588,7 +588,7 @@ ox::Error StudioUI::makeCopyDlg(ox::StringViewCR path) noexcept {
 
 ox::Error StudioUI::handleCloseAppResponse(ig::PopupResponse const response) noexcept {
 	if (response == ig::PopupResponse::OK && m_activeEditor) {
-		turbine::requestShutdown(m_tctx);
+		turbine::requestShutdown(m_tctx, true);
 	}
 	return {};
 }

src/olympic/studio/applib/src/studioui.hpp

@@ -29,7 +29,7 @@ class StudioUI: public ox::SignalHandler {
 	friend class StudioUIDrawer;
 
 	private:
-		StudioContext m_sctx;
+		Context m_sctx;
 		turbine::Context &m_tctx;
 		ox::String m_projectDataDir;
 		ox::UPtr<Project> m_project;

src/olympic/studio/modlib/include/studio/context.hpp

@@ -14,19 +14,19 @@ namespace studio {
 
 class StudioUI;
 
-struct StudioContext {
+struct Context {
 	StudioUI &ui;
 	Project *project = nullptr;
 	turbine::Context &tctx;
-	StudioContext(StudioUI &pUi, turbine::Context &pTctx) noexcept:
+	Context(StudioUI &pUi, turbine::Context &pTctx) noexcept:
 		ui(pUi), tctx(pTctx) {}
 };
 
 [[nodiscard]]
-inline keel::Context &keelCtx(StudioContext &ctx) noexcept {
+inline keel::Context &keelCtx(Context &ctx) noexcept {
 	return keelCtx(ctx.tctx);
 }
 
-void navigateTo(StudioContext &ctx, ox::StringParam filePath, ox::StringParam navArgs) noexcept;
+void navigateTo(Context &ctx, ox::StringParam filePath, ox::StringParam navArgs) noexcept;
 
 }

src/olympic/studio/modlib/include/studio/editor.hpp

@@ -121,7 +121,7 @@ class Editor: public studio::BaseEditor {
 		ox::String m_itemName;
 
 	public:
-		Editor(StudioContext &ctx, ox::StringParam itemPath) noexcept;
+		Editor(Context &ctx, ox::StringParam itemPath) noexcept;
 
 		[[nodiscard]]
 		ox::CStringView itemPath() const noexcept final;

src/olympic/studio/modlib/include/studio/filepickerpopup.hpp

@@ -31,7 +31,7 @@ class FilePickerPopup {
 		[[nodiscard]]
 		bool isOpen() const noexcept;
 
-		ox::Optional<ox::String> draw(StudioContext &ctx) noexcept;
+		ox::Optional<ox::String> draw(Context &ctx) noexcept;
 
 };
 

src/olympic/studio/modlib/include/studio/filetreemodel.hpp

@@ -32,7 +32,7 @@ class FileExplorer: public ox::SignalHandler {
 			m_kctx{kctx},
 			m_fileDraggable{fileDraggable} {}
 
-		void draw(StudioContext &ctx, ImVec2 const &sz) const noexcept;
+		void draw(Context &ctx, ImVec2 const &sz) const noexcept;
 
 		void setModel(ox::UPtr<FileTreeModel> &&model, bool selectRoot = false) noexcept;
 

src/olympic/studio/modlib/include/studio/imguiutil.hpp

@@ -272,7 +272,7 @@ bool ComboBox(
 
 bool FileComboBox(
 		ox::CStringViewCR lbl,
-		StudioContext &sctx,
+		Context &sctx,
 		ox::StringViewCR fileExt,
 		size_t &selectedIdx) noexcept;
 
@@ -295,7 +295,7 @@ bool ListBox(ox::CStringViewCR name, ox::SpanView<ox::String> const&list, size_t
 class FilePicker {
 	private:
 		bool m_show{};
-		StudioContext &m_sctx;
+		Context &m_sctx;
 		ox::String const m_title;
 		ox::String const m_fileExt;
 		ImVec2 const m_size;
@@ -303,7 +303,7 @@ class FilePicker {
 		ox::Signal<ox::Error(ox::StringView)> filePicked;
 
 		FilePicker(
-				studio::StudioContext &sctx,
+				studio::Context &sctx,
 				ox::StringParam title,
 				ox::StringParam fileExt,
 				ImVec2 const&size = {}) noexcept;
@@ -348,7 +348,7 @@ class QuestionPopup: public Popup {
 
 		QuestionPopup(ox::StringParam title, ox::StringParam question) noexcept;
 
-		void draw(StudioContext &ctx) noexcept override;
+		void draw(Context &ctx) noexcept override;
 
 };
 
@@ -363,7 +363,7 @@ class MessagePopup: public Popup {
 
 		void show(ox::StringParam msg) noexcept;
 
-		void draw(StudioContext &ctx) noexcept override;
+		void draw(Context &ctx) noexcept override;
 
 };
 

src/olympic/studio/modlib/include/studio/itemmaker.hpp

@@ -162,7 +162,7 @@ class ItemMaker {
 		 * @return path of file or error in Result
 		 */
 		ox::Error write(
-			StudioContext &ctx,
+			Context &ctx,
 			ox::StringViewCR pPath,
 			size_t pTemplateIdx) const noexcept {
 			return writeItem(ctx, pPath, pTemplateIdx);
@@ -177,7 +177,7 @@ class ItemMaker {
 		 * @return path of file or error in Result
 		 */
 		ox::Error write(
-			StudioContext &ctx,
+			Context &ctx,
 			ox::StringViewCR pPath,
 			ox::StringViewCR pName,
 			size_t pTemplateIdx) const noexcept {
@@ -187,7 +187,7 @@ class ItemMaker {
 
 	protected:
 		virtual ox::Error writeItem(
-			StudioContext &ctx,
+			Context &ctx,
 			ox::StringViewCR pPath,
 			size_t pTemplateIdx) const noexcept = 0;
 
@@ -249,7 +249,7 @@ class ItemMakerT final: public ItemMaker {
 		}
 
 		ox::Error writeItem(
-			StudioContext &ctx,
+			Context &ctx,
 			ox::StringViewCR pPath,
 			size_t const pTemplateIdx) const noexcept override {
 			createUuidMapping(keelCtx(ctx.tctx), pPath, ox::UUID::generate().unwrap());

src/olympic/studio/modlib/include/studio/module.hpp

@@ -27,17 +27,17 @@ class Module {
 	public:
 		virtual ~Module() noexcept = default;
 
-		virtual ox::Vector<EditorMaker> editors(studio::StudioContext &ctx) const;
+		virtual ox::Vector<EditorMaker> editors(studio::Context &ctx) const;
 
-		virtual ox::Vector<ox::UPtr<ItemMaker>> itemMakers(studio::StudioContext&) const;
+		virtual ox::Vector<ox::UPtr<ItemMaker>> itemMakers(studio::Context&) const;
 
-		virtual ox::Vector<ox::UPtr<ItemTemplate>> itemTemplates(studio::StudioContext&) const;
+		virtual ox::Vector<ox::UPtr<ItemTemplate>> itemTemplates(studio::Context&) const;
 
 };
 
 template<typename Editor>
 [[nodiscard]]
-EditorMaker editorMaker(StudioContext &ctx, ox::StringParam ext) noexcept {
+EditorMaker editorMaker(Context &ctx, ox::StringParam ext) noexcept {
 	return {
 			{std::move(ext)},
 			[&ctx](ox::StringViewCR path) -> ox::Result<BaseEditor*> {
@@ -48,7 +48,7 @@ EditorMaker editorMaker(StudioContext &ctx, ox::StringParam ext) noexcept {
 
 template<typename Editor>
 [[nodiscard]]
-EditorMaker editorMaker(StudioContext &ctx, std::initializer_list<ox::StringView> exts) noexcept {
+EditorMaker editorMaker(Context &ctx, std::initializer_list<ox::StringView> exts) noexcept {
 	return {
 			[&exts] {
 				ox::Vector<ox::String> fileTypes;

src/olympic/studio/modlib/include/studio/widget.hpp

@@ -15,7 +15,7 @@ namespace studio {
 class Widget: public ox::SignalHandler {
 	public:
 		~Widget() noexcept override = default;
-		virtual void draw(StudioContext&) noexcept = 0;
+		virtual void draw(Context&) noexcept = 0;
 };
 
 }

src/olympic/studio/modlib/src/editor.cpp

@@ -109,7 +109,7 @@ UndoStack *BaseEditor::undoStack() noexcept {
 void BaseEditor::navigateTo(ox::StringViewCR) noexcept {}
 
 
-Editor::Editor(StudioContext &ctx, ox::StringParam itemPath) noexcept:
+Editor::Editor(Context &ctx, ox::StringParam itemPath) noexcept:
 		m_itemPath(std::move(itemPath)),
 		m_itemName(m_itemPath.substr(std::find(m_itemPath.rbegin(), m_itemPath.rend(), '/').offset() + 1)) {
 	m_undoStack.changeTriggered.connect(this, &Editor::markUnsavedChanges);

src/olympic/studio/modlib/src/filepickerpopup.cpp

@@ -52,7 +52,7 @@ bool FilePickerPopup::isOpen() const noexcept {
 	return m_open;
 }
 
-ox::Optional<ox::String> FilePickerPopup::draw(StudioContext &ctx) noexcept {
+ox::Optional<ox::String> FilePickerPopup::draw(Context &ctx) noexcept {
 	ox::Optional<ox::String> out;
 	if (!m_open) {
 		return out;

src/olympic/studio/modlib/src/filetreemodel.cpp

@@ -11,7 +11,7 @@
 
 namespace studio {
 
-void FileExplorer::draw(StudioContext &ctx, ImVec2 const &sz) const noexcept {
+void FileExplorer::draw(Context &ctx, ImVec2 const &sz) const noexcept {
 	ImGui::BeginChild("ProjectExplorer", sz, true);
 	ImGui::SetNextItemOpen(true);
 	if (m_treeModel) {

src/olympic/studio/modlib/src/imguiutil.cpp

@@ -169,7 +169,7 @@ bool ComboBox(
 
 bool FileComboBox(
 		ox::CStringViewCR lbl,
-		StudioContext &sctx,
+		Context &sctx,
 		ox::StringViewCR fileExt,
 		size_t &selectedIdx) noexcept {
 	auto const&list = sctx.project->fileList(fileExt);
@@ -213,7 +213,7 @@ bool ListBox(ox::CStringViewCR name, ox::SpanView<ox::CStringView> const&list, s
 
 
 FilePicker::FilePicker(
-		StudioContext &sctx,
+		Context &sctx,
 		ox::StringParam title,
 		ox::StringParam fileExt,
 		ImVec2 const&size) noexcept:
@@ -267,7 +267,7 @@ QuestionPopup::QuestionPopup(ox::StringParam title, ox::StringParam question) no
 	m_question{std::move(question)} {
 }
 
-void QuestionPopup::draw(StudioContext &ctx) noexcept {
+void QuestionPopup::draw(Context &ctx) noexcept {
 	switch (m_stage) {
 		case Stage::Closed:
 			break;
@@ -312,7 +312,7 @@ void MessagePopup::show(ox::StringParam msg) noexcept {
 	open();
 }
 
-void MessagePopup::draw(StudioContext &ctx) noexcept {
+void MessagePopup::draw(Context &ctx) noexcept {
 	switch (m_stage) {
 		case Stage::Closed:
 			break;

src/olympic/studio/modlib/src/module.cpp

@@ -6,15 +6,15 @@
 
 namespace studio {
 
-ox::Vector<EditorMaker> Module::editors(StudioContext&) const {
+ox::Vector<EditorMaker> Module::editors(Context&) const {
 	return {};
 }
 
-ox::Vector<ox::UPtr<ItemMaker>> Module::itemMakers(StudioContext&) const {
+ox::Vector<ox::UPtr<ItemMaker>> Module::itemMakers(Context&) const {
 	return {};
 }
 
-ox::Vector<ox::UPtr<ItemTemplate>> Module::itemTemplates(StudioContext&) const {
+ox::Vector<ox::UPtr<ItemTemplate>> Module::itemTemplates(Context&) const {
 	return {};
 }
 

src/olympic/turbine/include/turbine/turbine.hpp

@@ -27,7 +27,7 @@ ox::Error run(Context &ctx) noexcept;
 [[nodiscard]]
 TimeMs ticksMs(Context const&ctx) noexcept;
 
-void requestShutdown(Context &ctx) noexcept;
+void requestShutdown(Context &ctx, bool force = false) noexcept;
 
 using ShutdownHandler = bool (*)(Context&);
 

src/olympic/turbine/src/gba/turbine.cpp

@@ -82,7 +82,7 @@ bool buttonDown(Context const&, Key k) noexcept {
 	return k <= Key::GamePad_L && !(REG_GAMEPAD & (1 << static_cast<int>(k)));
 }
 
-void requestShutdown(Context &ctx) noexcept {
+void requestShutdown(Context &ctx, bool) noexcept {
 	ctx.running = false;
 }
 

src/olympic/turbine/src/glfw/gfx.cpp

@@ -93,6 +93,14 @@ static void handleGlfwKeyEvent(GLFWwindow *window, int key, int, int action, int
 	}
 }
 
+static void handleGlfwWindowCloseEvent(GLFWwindow *window) noexcept {
+	auto &ctx = *static_cast<Context*>(glfwGetWindowUserPointer(window));
+	ctx.mandatoryRefreshPeriodEnd = ticksMs(ctx) + config::MandatoryRefreshPeriod;
+	ctx.running = ctx.shutdownHandler ? !ctx.shutdownHandler(ctx) : false;
+	glfwSetWindowShouldClose(window, !ctx.running);
+	glfwPostEmptyEvent();
+}
+
 #if TURBINE_USE_IMGUI
 static void themeImgui() noexcept {
 	// Dark Ruda style by Raikiri from ImThemes
@@ -210,6 +218,7 @@ ox::Error initGfx(Context &ctx) noexcept {
 	glfwSetCursorPosCallback(ctx.window, handleGlfwCursorPosEvent);
 	glfwSetMouseButtonCallback(ctx.window, handleGlfwMouseButtonEvent);
 	glfwSetKeyCallback(ctx.window, handleGlfwKeyEvent);
+	glfwSetWindowCloseCallback(ctx.window, handleGlfwWindowCloseEvent);
 	glfwSetWindowUserPointer(ctx.window, &ctx);
 	glfwMakeContextCurrent(ctx.window);
 	if (!gladLoadGLES2Loader(reinterpret_cast<GLADloadproc>(glfwGetProcAddress))) {

src/olympic/turbine/src/glfw/turbine.cpp

@@ -92,7 +92,7 @@ ox::Error run(Context &ctx) noexcept {
 				  ctx.wakeupTime = ticks + static_cast<unsigned>(st);
 				  sleepTime = static_cast<uint64_t>(st);
 			 } else {
-				  ctx.wakeupTime = ~uint64_t(0);
+				  ctx.wakeupTime = ~uint64_t{0};
 				  sleepTime = ctx.wakeupTime - ticks;
 			 }
 		} else {
@@ -104,12 +104,6 @@ ox::Error run(Context &ctx) noexcept {
 		if (realSleepTime && ctx.mandatoryRefreshPeriodEnd <= ticks) {
 			glfwWaitEventsTimeout(static_cast<double>(realSleepTime) / 1000);
 		}
-		if (glfwWindowShouldClose(ctx.window)) {
-			if (ctx.shutdownHandler(ctx)) {
-				break;
-			}
-			glfwSetWindowShouldClose(ctx.window, false);
-		}
 	}
 	shutdown(ctx);
 	return {};
@@ -125,8 +119,13 @@ bool buttonDown(Context const&ctx, Key const key) noexcept {
 	return (ctx.keysDown >> static_cast<int>(key)) & 1;
 }
 
-void requestShutdown(Context &ctx) noexcept {
-	ctx.running = false;
+void requestShutdown(Context &ctx, bool const force) noexcept {
+	glfwSetWindowShouldClose(ctx.window, true);
+	if (force) {
+		ctx.running = false;
+	} else {
+		ctx.running = ctx.shutdownHandler ? !ctx.shutdownHandler(ctx) : false;
+	}
 }
 
 void setShutdownHandler(Context &ctx, ShutdownHandler const handler) noexcept {

util/scripts/pkg-dmg.py

@@ -0,0 +1,36 @@
+#! /usr/bin/env python3
+
+import os
+import shutil
+import subprocess
+import sys
+
+def rm(path: str):
+    file_exists = os.path.exists(path)
+    is_link = os.path.islink(path)
+    is_dir = os.path.isdir(path)
+    if (file_exists or is_link) and not is_dir:
+        os.remove(path)
+    elif os.path.isdir(path):
+        shutil.rmtree(path)
+
+
+def mkdir_p(path: str):
+    if not os.path.exists(path):
+        os.mkdir(path)
+
+
+def run(args: list[str]):
+    if subprocess.run(args).returncode != 0:
+        sys.exit(1)
+
+
+
+dmg_dir = 'dist/darwin-arm64-release/NostalgiaStudio'
+dmg = f'{dmg_dir}.dmg'
+rm(dmg)
+rm(dmg_dir)
+mkdir_p(dmg_dir)
+shutil.copytree('dist/darwin-arm64-release/NostalgiaStudio.app', f'{dmg_dir}/NostalgiaStudio.app')
+os.symlink('/Applications', f'{dmg_dir}/Applications')
+run(['hdiutil', 'create', '-srcfolder', dmg_dir, dmg])