[buildcore] Make pybb cmake_build specify --config debug/release

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/buildcore/scripts/pybb.py

@@ -11,6 +11,7 @@
 # "Python Busy Box" - adds cross-platform equivalents to Unix commands that
 #                     don't translate well to that other operating system
 
+import multiprocessing
 import os
 import platform
 import shutil
@@ -57,7 +58,11 @@ def cmake_build(base_path: str, target: Optional[str]) -> int:
         path = os.path.join(base_path, d)
         if not os.path.isdir(path):
             continue
-        args = ['cmake', '--build', path]
+        args = ['cmake', '--build', path, f'-j{multiprocessing.cpu_count()}']
+        if path.endswith('release'):
+            args.append('--config=release')
+        elif path.endswith('debug'):
+            args.append('--config=debug')
         if target is not None:
             args.extend(['--target', target])
         err = subprocess.run(args).returncode

deps/ox/src/ox/clargs/clargs.cpp

@@ -29,7 +29,7 @@ ClArgs::ClArgs(ox::SpanView<const char*> args) noexcept {
 						m_bools[arg] = false;
 					}
 					m_strings[arg] = val;
-					if (auto r = ox::atoi(val.c_str()); r.error == 0) {
+					if (auto r = ox::strToInt(val); r.error == 0) {
 						m_ints[arg] = r.value;
 					}
 					++i;

deps/ox/src/ox/claw/read.cpp

@@ -81,7 +81,7 @@ Result<ClawHeader> readClawHeader(ox::BufferView buff) noexcept {
 		return ox::Error(4, "Claw format does not match any supported format/version combo");
 	}
 	hdr.typeName = typeName;
-	std::ignore = ox::atoi(versionStr).copyTo(hdr.typeVersion);
+	std::ignore = ox::strToInt(versionStr).copyTo(hdr.typeVersion);
 	hdr.data = buffRaw;
 	hdr.dataSize = buffLen;
 	return hdr;

deps/ox/src/ox/fs/filesystem/filelocation.cpp

@@ -31,10 +31,10 @@ FileAddress::FileAddress(uint64_t inode) noexcept {
 FileAddress::FileAddress(ox::StringViewCR path) noexcept {
 	auto pathSize = path.bytes();
 	m_data.path = new char[pathSize + 1];
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(m_data.path, path.data(), pathSize);
-OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 	m_data.path[pathSize] = 0;
-OX_CLANG_NOWARN_END
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	m_type = FileAddressType::Path;
 }
 
@@ -48,9 +48,11 @@ FileAddress &FileAddress::operator=(const FileAddress &other) noexcept {
 		case FileAddressType::Path:
 		{
 			if (other.m_data.path) {
+				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				auto strSize = ox::strlen(other.m_data.path) + 1;
 				m_data.path = new char[strSize];
 				ox::memcpy(m_data.path, other.m_data.path, strSize);
+				OX_ALLOW_UNSAFE_BUFFERS_END
 			} else {
 				m_data.constPath = "";
 				m_type = FileAddressType::ConstPath;

deps/ox/src/ox/fs/filesystem/filelocation.hpp

@@ -24,9 +24,6 @@ enum class FileAddressType: int8_t {
 	Inode,
 };
 
-template<typename T>
-constexpr Error model(T *h, CommonPtrWith<class FileAddress> auto *fa) noexcept;
-
 class FileAddress {
 
 	template<typename T>

deps/ox/src/ox/fs/filesystem/filesystem.hpp

@@ -468,7 +468,7 @@ Error FileSystemTemplate<FileStore, Directory>::writeFilePath(
 
 template<typename FileStore, typename Directory>
 Error FileSystemTemplate<FileStore, Directory>::writeFileInode(uint64_t inode, const void *buffer, uint64_t size, FileType fileType) noexcept {
-	oxTrace("ox.fs.FileSystemTemplate.writeFileInode", ox::itoa(inode));
+	oxTrace("ox.fs.FileSystemTemplate.writeFileInode", ox::intToStr(inode));
 	return m_fs.write(inode, buffer, static_cast<size_t>(size), static_cast<uint8_t>(fileType));
 }
 

deps/ox/src/ox/fs/test/tests.cpp

@@ -119,7 +119,9 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				auto constexpr path = ox::StringLiteral("/usr/share/charset.gbag");
 				ox::PathIterator it(path.c_str(), path.len());
 				auto buff = static_cast<char*>(ox_alloca(path.len() + 1));
+				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				oxAssert(it.dirPath(buff, path.len()) == 0 && ox::strcmp(buff, "/usr/share/") == 0, "PathIterator shows incorrect dir path");
+				OX_ALLOW_UNSAFE_BUFFERS_END
 				return ox::Error(0);
 			}
 		},
@@ -127,7 +129,9 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			"PathIterator::hasNext",
 			[](ox::StringView) {
 				const auto path = "/file1";
+				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				ox::PathIterator it(path, ox::strlen(path));
+				OX_ALLOW_UNSAFE_BUFFERS_END
 				oxAssert(it.hasNext(), "PathIterator shows incorrect hasNext");
 				oxAssert(!it.next().hasNext(), "PathIterator shows incorrect hasNext");
 				return ox::Error(0);
@@ -163,9 +167,11 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 			[](ox::StringView) {
 				constexpr auto buffLen = 5000;
 				constexpr auto str1 = "Hello, World!";
+				OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 				constexpr auto str1Len = ox::strlen(str1) + 1;
 				constexpr auto str2 = "Hello, Moon!";
 				constexpr auto str2Len = ox::strlen(str2) + 1;
+				OX_ALLOW_UNSAFE_BUFFERS_END
 				auto list = new (ox_alloca(buffLen)) ox::ptrarith::NodeBuffer<uint32_t, ox::FileStoreItem<uint32_t>>(buffLen);
 				oxAssert(ox::FileStore32::format(list, buffLen), "FileStore::format failed.");
 				ox::FileStore32 fileStore(list, buffLen);

deps/ox/src/ox/fs/tool.cpp

@@ -57,7 +57,9 @@ static ox::Error runRead(ox::FileSystem *fs, ox::Span<const char*> args) noexcep
 		return ox::Error(1);
 	}
 	OX_REQUIRE(buff, fs->read(ox::StringView(args[1])));
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	std::ignore = fwrite(buff.data(), sizeof(decltype(buff)::value_type), buff.size(), stdout);
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	return ox::Error(0);
 }
 

deps/ox/src/ox/mc/intops.hpp

@@ -71,7 +71,9 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 	// move input to uint64_t to allow consistent bit manipulation, and to avoid
 	// overflow concerns
 	uint64_t val = 0;
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	ox::memcpy(&val, &input, sizeof(input));
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	if (val) {
 		// bits needed to represent number factoring in space possibly
 		// needed for signed bit
@@ -94,7 +96,9 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 		}
 		if (bytes == 9) {
 			out.data[0] = bytesIndicator;
+			OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			ox::memcpy(&out.data[1], &leVal, 8);
+			OX_ALLOW_UNSAFE_BUFFERS_END
 			if (inputNegative) {
 				out.data[1] |= 0b1000'0000;
 			}
@@ -104,7 +108,9 @@ constexpr McInt encodeInteger(I pInput) noexcept {
 			auto intermediate =
 				static_cast<uint64_t>(leVal.raw() | (negBit << (valBits - 1))) << bytes |
 				static_cast<uint64_t>(bytesIndicator);
+			OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 			ox::memcpy(&out.data[0], &intermediate, sizeof(intermediate));
+			OX_ALLOW_UNSAFE_BUFFERS_END
 		}
 		out.length = bytes;
 	}
@@ -151,33 +157,37 @@ constexpr Result<I> decodeInteger(Reader_c auto&rdr, std::size_t *bytesRead) noe
 	decoded >>= bytes;
 	// move sign bit
 	if constexpr(is_signed_v<I>) {
-		 const auto negBit = bytes * 8 - bytes - 1;
+		const auto negBit = bytes * 8 - bytes - 1;
-		 // move sign
+		// move sign
-		 const auto negative = (decoded >> negBit) == 1;
+		const auto negative = (decoded >> negBit) == 1;
-		 if (negative) {
+		if (negative) {
-			 // fill in all bits between encoded sign and real sign with 1s
+			// fill in all bits between encoded sign and real sign with 1s
-			 // split it up because the 32-bit ARM can't shift more than 32 bits
+			// split it up because the 32-bit ARM can't shift more than 32 bits
-			 ox::Array<uint32_t, 2> d = {};
+			ox::Array<uint32_t, 2> d = {};
-			 //d[0] = decoded & 0xffff'ffff;
+			//d[0] = decoded & 0xffff'ffff;
-			 //d[1] = decoded >> 32;
+			//d[1] = decoded >> 32;
-			 ox::memcpy(&d[0], &decoded, sizeof(decoded));
+		 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-			 auto bit = negBit;
+			ox::memcpy(&d[0], &decoded, sizeof(decoded));
-			 for (; bit < ox::min<std::size_t>(Bits<I>, 32); ++bit) {
+		 	OX_ALLOW_UNSAFE_BUFFERS_END
-				 d[0] |= 1 << bit;
+			auto bit = negBit;
-			 }
+			for (; bit < ox::min<std::size_t>(Bits<I>, 32); ++bit) {
-			 bit -= 32;
+				d[0] |= 1 << bit;
-			 for (; bit < Bits<I>; ++bit) {
+			}
-				 d[1] |= 1 << bit;
+			bit -= 32;
-			 }
+			for (; bit < Bits<I>; ++bit) {
-			 I out = 0;
+				d[1] |= 1 << bit;
-			 if constexpr(ox::defines::BigEndian) {
+			}
-				 const auto d0Tmp = d[0];
+			I out = 0;
-				 d[0] = d[1];
+			if constexpr(ox::defines::BigEndian) {
-				 d[1] = d0Tmp;
+				const auto d0Tmp = d[0];
-			 }
+				d[0] = d[1];
-			 ox::memcpy(&out, &d[0], sizeof(out));
+				d[1] = d0Tmp;
-			 return out;
+			}
-		 }
+		 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+			ox::memcpy(&out, &d[0], sizeof(out));
+			OX_ALLOW_UNSAFE_BUFFERS_END
+			return out;
+		}
 	}
 	return static_cast<I>(decoded);
 }

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

@@ -214,7 +214,12 @@ template<Writer_c Writer>
 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
+		// 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);
 		OX_RETURN_ERROR(m_writer.write(reinterpret_cast<const char*>(strLenBuff.data.data()), strLenBuff.length));

deps/ox/src/ox/model/modelvalue.hpp

@@ -997,7 +997,7 @@ constexpr ModelValue::ModelValue(const ModelValue &other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
+			m_data = other.m_data;
 			break;
 		case Type::String:
 			m_data.str = new String(other.get<String>());
@@ -1030,8 +1030,8 @@ constexpr ModelValue::ModelValue(ModelValue &&other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
+			m_data = other.m_data;
-			ox::memset(&other.m_data, 0, sizeof(m_data));
+			other.m_data.ui64 = 0;
 			break;
 		case Type::String:
 			m_data.str = other.m_data.str;
@@ -1223,7 +1223,7 @@ constexpr ModelValue &ModelValue::operator=(const ModelValue &other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
+			m_data = other.m_data;
 			break;
 		case Type::String:
 			m_data.str = new String(other.get<String>());
@@ -1261,8 +1261,8 @@ constexpr ModelValue &ModelValue::operator=(ModelValue &&other) noexcept {
 		case Type::SignedInteger16:
 		case Type::SignedInteger32:
 		case Type::SignedInteger64:
-			ox::memcpy(&m_data, &other.m_data, sizeof(m_data));
+			m_data = other.m_data;
-			ox::memset(&other.m_data, 0, sizeof(m_data));
+			other.m_data = {};
 			break;
 		case Type::String:
 			m_data.str = other.m_data.str;

deps/ox/src/ox/oc/read.cpp

@@ -15,7 +15,7 @@ namespace ox {
 
 OrganicClawReader::OrganicClawReader(const uint8_t *buff, std::size_t buffSize) {
 	auto json = reinterpret_cast<const char*>(buff);
-	auto jsonLen = ox::strnlen(json, buffSize);
+	auto jsonLen = ox::strnlen_s(json, buffSize);
 	Json::CharReaderBuilder parserBuilder;
 	auto parser = std::unique_ptr<Json::CharReader>(parserBuilder.newCharReader());
 	if (!parser->parse(json, json + jsonLen, &m_json, nullptr)) {

deps/ox/src/ox/oc/read.hpp

@@ -8,7 +8,11 @@
 
 #pragma once
 
+#include <ox/std/def.hpp>
+
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 #include <json/json.h>
+OX_ALLOW_UNSAFE_BUFFERS_END
 
 #include <ox/model/fieldcounter.hpp>
 #include <ox/model/modelhandleradaptor.hpp>

deps/ox/src/ox/oc/write.hpp

@@ -8,7 +8,11 @@
 
 #pragma once
 
+#include <ox/std/def.hpp>
+
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 #include <json/json.h>
+OX_ALLOW_UNSAFE_BUFFERS_END
 
 #include <ox/model/fieldcounter.hpp>
 #include <ox/model/modelhandleradaptor.hpp>
@@ -258,7 +262,9 @@ Result<ox::Buffer> writeOC(const auto &val) noexcept {
 	const auto str = Json::writeString(jsonBuilder, writer.m_json);
 	Result<Buffer> buff;
 	buff.value.resize(str.size() + 1);
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(buff.value.data(), str.data(), str.size() + 1);
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	return buff;
 }
 
@@ -270,7 +276,9 @@ Result<ox::String> writeOCString(const auto &val) noexcept {
 	const auto str = Json::writeString(jsonBuilder, writer.m_json);
 	Result<ox::String> buff;
 	buff.value.resize(str.size());
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	memcpy(buff.value.data(), str.data(), str.size() + 1);
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	return buff;
 }
 

deps/ox/src/ox/std/cstrops.hpp

@@ -30,9 +30,12 @@ constexpr T1 strncpy(T1 dest, T2 src, std::size_t maxLen) noexcept {
 }
 
 [[nodiscard]]
-constexpr auto strnlen(const char *str1, std::size_t maxLen) noexcept {
+constexpr size_t strnlen_s(const char *str, size_t const maxLen) noexcept {
-	std::size_t len = 0;
+	if (!str) [[unlikely]] {
-	for (; len < maxLen && str1[len]; len++);
+		return 0;
+	}
+	size_t len = 0;
+	for (; len < maxLen && str[len]; len++);
 	return len;
 }
 

deps/ox/src/ox/std/istring.hpp

@@ -245,7 +245,7 @@ struct MaybeView<ox::IString<sz>> {
 
 template<Integer_c Integer>
 [[nodiscard]]
-constexpr auto itoa(Integer v) noexcept {
+constexpr auto intToStr(Integer v) noexcept {
 	constexpr auto Cap = [] {
 		auto out = 0;
 		switch (sizeof(Integer)) {

deps/ox/src/ox/std/span.hpp

@@ -8,6 +8,10 @@
 
 #pragma once
 
+#if __has_include(<array>)
+#include <array>
+#endif
+
 #include "array.hpp"
 #include "bit.hpp"
 #include "def.hpp"
@@ -35,6 +39,20 @@ class Span {
 
 		constexpr Span() noexcept = default;
 
+#if __has_include(<array>)
+		template<std::size_t sz>
+		constexpr Span(std::array<T, sz> &a) noexcept:
+			m_items(a.data()),
+			m_size(a.size()) {
+		}
+
+		template<std::size_t sz>
+		constexpr Span(std::array<ox::remove_const_t<T>, sz> const&a) noexcept:
+			m_items(a.data()),
+			m_size(a.size()) {
+		}
+#endif
+
 		template<std::size_t sz>
 		constexpr Span(ox::Array<T, sz> &a) noexcept:
 			m_items(a.data()),

deps/ox/src/ox/std/string.hpp

@@ -28,7 +28,7 @@ OX_CLANG_NOWARN_BEGIN(-Wunsafe-buffer-usage)
 namespace ox {
 
 template<typename Integer>
-constexpr ox::IString<21> itoa(Integer v) noexcept;
+constexpr ox::IString<21> intToStr(Integer v) noexcept;
 
 template<std::size_t SmallStringSize_v>
 class BasicString {
@@ -213,22 +213,22 @@ class BasicString {
 
 		[[nodiscard]]
 		constexpr const char *c_str() const noexcept {
-			return static_cast<const char*>(m_buff.data());
+			return m_buff.data();
 		}
 
 		[[nodiscard]]
-		inline explicit operator const char*() const {
+		constexpr explicit operator const char*() const {
 			return c_str();
 		}
 
 #if __has_include(<string>)
 		[[nodiscard]]
-		inline std::string toStdString() const {
+		std::string toStdString() const {
 			return c_str();
 		}
 
 		[[nodiscard]]
-		inline explicit operator std::string() const {
+		explicit operator std::string() const {
 			return c_str();
 		}
 #endif
@@ -317,13 +317,13 @@ constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operat
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator=(int64_t i) noexcept {
-	set(ox::itoa(i));
+	set(ox::intToStr(i));
 	return *this;
 }
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator=(uint64_t i) noexcept {
-	set(ox::itoa(i));
+	set(ox::intToStr(i));
 	return *this;
 }
 
@@ -371,7 +371,7 @@ constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operat
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> &BasicString<SmallStringSize_v>::operator+=(Integer_c auto i) noexcept {
-	auto const str = ox::itoa(i);
+	auto const str = ox::intToStr(i);
 	return this->operator+=(str.c_str());
 }
 
@@ -414,7 +414,7 @@ constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operato
 
 template<std::size_t SmallStringSize_v>
 constexpr BasicString<SmallStringSize_v> BasicString<SmallStringSize_v>::operator+(Integer_c auto i) const noexcept {
-	auto const str = ox::itoa(i);
+	auto const str = ox::intToStr(i);
 	return *this + str;
 }
 

deps/ox/src/ox/std/stringliteral.hpp

@@ -32,7 +32,9 @@ class StringLiteral: public detail::BaseStringView {
 
 		constexpr explicit StringLiteral(const char *str, std::size_t len) noexcept: BaseStringView(str, len) {}
 
+		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 		constexpr explicit StringLiteral(char const *str) noexcept: StringLiteral(str, ox::strlen(str)) {}
+		OX_ALLOW_UNSAFE_BUFFERS_END
 
 		constexpr StringLiteral &operator=(StringLiteral const&other) noexcept {
 			if (&other != this) {

deps/ox/src/ox/std/stringview.hpp

@@ -100,7 +100,8 @@ constexpr auto toStdStringView(StringViewCR sv) noexcept {
 #endif
 
 
-constexpr ox::Result<int> atoi(ox::StringViewCR str) noexcept {
+constexpr ox::Result<int> strToInt(ox::StringViewCR str) noexcept {
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	int total = 0;
 	int multiplier = 1;
 	for (auto i = static_cast<int64_t>(str.len()) - 1; i != -1; --i) {
@@ -113,6 +114,7 @@ constexpr ox::Result<int> atoi(ox::StringViewCR str) noexcept {
 		}
 	}
 	return total;
+	OX_ALLOW_UNSAFE_BUFFERS_END
 }
 
 

deps/ox/src/ox/std/strops.cpp

@@ -9,6 +9,8 @@
 #include "def.hpp"
 #include "strops.hpp"
 
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+
 static_assert(ox::strcmp("asdf", "hijk") < 0, "asdf < hijk");
 static_assert(ox::strcmp("hijk", "asdf") > 0, "hijk > asdf");
 static_assert(ox::strcmp("resize", "read") > 0, "resize > read");
@@ -42,3 +44,5 @@ std::size_t strlen(const char *str) {
 }
 
 #endif
+
+OX_ALLOW_UNSAFE_BUFFERS_END

deps/ox/src/ox/std/test/tests.cpp

@@ -145,6 +145,7 @@ OX_CLANG_NOWARN_END
 			return ox::Error{};
 		}
 	},
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	{
 		"ABCDEFG != HIJKLMN",
 		[]() {
@@ -169,6 +170,7 @@ OX_CLANG_NOWARN_END
 			return ox::Error(ox::memcmp("ABCDEFGHI", "ABCDEFG", 7) != 0);
 		}
 	},
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	{
 		"IString",
 		[]() {

deps/ox/src/ox/std/tracehook.cpp

@@ -39,6 +39,8 @@ enum LogChan {
 	Debug = 4,
 };
 
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+
 template<LogChan chan>
 static void log(ox::StringViewCR str) {
 	const auto sz = ox::min<std::size_t>(0x100, str.bytes());
@@ -103,5 +105,7 @@ void oxTraceHook([[maybe_unused]] const char *file, [[maybe_unused]] int line,
 #endif
 }
 
+OX_ALLOW_UNSAFE_BUFFERS_END
+
 }
 

deps/ox/src/ox/std/uuid.hpp

@@ -105,6 +105,10 @@ class UUID {
 		ox::Array<uint8_t, 16> m_value{};
 
 	public:
+
+		static constexpr auto TypeName = "net.drinkingtea.ox.UUID";
+		static constexpr auto TypeVersion = 1;
+
 		static void seedGenerator(const RandomSeed &seed) noexcept;
 
 		static ox::Result<UUID> generate() noexcept;

release-notes.md

@@ -1,10 +1,26 @@
-# d2025.04.0
+# d2025.05.1
+
+* TileSheetEditor: Fix overrun errors when switching subsheets, clear selection
+  on switch (261e324acd)
+* Fix new build error that occurs in MSVC (26d5048e6720c4c2d52508a6ee44c67dd9fe3ee5)
+
+# d2025.05.0
 
 * Add app icon for both window and file
-* Fix selection clearing in TileSheet editor to work when clicking outside
+* Change application font to Roboto Medium
+* Closing application will now confirm with user if any files have unsaved
+  changes.
+* UUID duplicates will now be reported when opening a project
+* Deleting a directory now closes files in that directory
+* Delete key now initiates deletion of selected directory
+* Remove ability to re-order tabs. There were bugs associated with that.
+* TileSheetEditor: Fix selection clearing in to work when clicking outside
   image.
-* Fix color number key range in PalettEditor. Previously, pressing A caused the
+* TileSheetEditor: Fix Delete Tile functionality, which was completely broken
-  editor to jump to the last color.
+* PaletteEditor: Fix color number key range in. Previously, pressing A caused
+  the editor to jump to the last color.
+* PaletteEditor: page rename will now take effect upon pressing enter if the
+  text input has focus
 
 # d2025.02.1
 

sample_project/Palettes/SC9K_Logo.npal

@@ -0,0 +1,28 @@
+K1;3d1a77ec-265f-4905-2061-4f1003ee2189;O1;net.drinkingtea.nostalgia.gfx.Palette;5;{
+	"colorNames" : 
+	[
+		"Color 1",
+		"Color 2",
+		"Color 3"
+	],
+	"pages" : 
+	[
+		{
+			"colors" : 
+			[
+				{
+					"b" : 10,
+					"g" : 5,
+					"r" : 5
+				},
+				{},
+				{
+					"b" : 31,
+					"g" : 31,
+					"r" : 31
+				}
+			],
+			"name" : "Page 1"
+		}
+	]
+}

src/nostalgia/modules/gfx/include/nostalgia/gfx/gfx.hpp

@@ -238,7 +238,7 @@ uint_t spriteCount(Context &ctx) noexcept;
 
 ox::Error initConsole(Context &ctx) noexcept;
 
-void puts(Context &ctx, int column, int row, ox::StringViewCR str) noexcept;
+void consoleWrite(Context &ctx, int column, int row, ox::StringViewCR str) noexcept;
 
 }
 

src/nostalgia/modules/gfx/src/gba/panic.cpp

@@ -36,13 +36,13 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 	setBgStatus(*ctx, 0, true);
 	clearBg(*ctx, 0);
 	auto const serr = ox::sfmt<ox::IString<23>>("Error code: {}", static_cast<int64_t>(err));
-	puts(*ctx, 32 + 1,  1, "SADNESS...");
+	consoleWrite(*ctx, 32 + 1,  1, "SADNESS...");
-	puts(*ctx, 32 + 1,  4, "UNEXPECTED STATE:");
+	consoleWrite(*ctx, 32 + 1,  4, "UNEXPECTED STATE:");
-	puts(*ctx, 32 + 2,  6, panicMsg);
+	consoleWrite(*ctx, 32 + 2,  6, panicMsg);
 	if (err) {
-		puts(*ctx, 32 + 2,  8, serr);
+		consoleWrite(*ctx, 32 + 2,  8, serr);
 	}
-	puts(*ctx, 32 + 1, 15, "PLEASE RESTART THE SYSTEM");
+	consoleWrite(*ctx, 32 + 1, 15, "PLEASE RESTART THE SYSTEM");
 	// print to terminal if in mGBA
 	oxErrf("\033[31;1;1mPANIC:\033[0m [{}:{}]: {}\n", file, line, panicMsg);
 	if (err.msg) {

src/nostalgia/modules/gfx/src/gfx.cpp

@@ -251,7 +251,7 @@ ox::Error initConsole(Context &ctx) noexcept {
 	return loadBgPalette(ctx, 0, PaletteAddr);
 }
 
-void puts(
+void consoleWrite(
 		Context &ctx,
 		int const column,
 		int const row,

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

@@ -50,22 +50,25 @@ void PaletteEditorImGui::PageRenameDialog::draw(turbine::Context &tctx) noexcept
 		return;
 	}
 	if (ig::BeginPopup(tctx, "Rename Page", m_show)) {
+		if (ImGui::IsWindowAppearing()) {
+			ImGui::SetKeyboardFocusHere();
+		}
 		ig::InputText("Name", m_name);
-		switch (ig::PopupControlsOkCancel(m_show)) {
+		auto const nameInputFocused = ImGui::IsItemFocused();
-			case ig::PopupResponse::OK:
+		auto const resp = ig::PopupControlsOkCancel(m_show);
-				inputSubmitted.emit(m_name);
+		if ((nameInputFocused && ImGui::IsKeyPressed(ImGuiKey_Enter))
-				[[fallthrough]];
+			|| resp == ig::PopupResponse::OK) {
-			case ig::PopupResponse::Cancel:
+			inputSubmitted.emit(m_name);
-				close();
+			close();
-			default:
+		} else if (resp == ig::PopupResponse::Cancel) {
-				break;
+			close();
 		}
 		ImGui::EndPopup();
 	}
 }
 
 
-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),
@@ -74,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);
@@ -102,13 +105,13 @@ void PaletteEditorImGui::navigateTo(ox::StringViewCR arg) noexcept {
 	auto const &color = args[0];
 	auto const &page = args[1];
 	{
-		auto const [c, err] = atoi(color);
+		auto const [c, err] = strToInt(color);
 		if (!err && static_cast<size_t>(c) < colorCnt(m_pal)) {
 			m_selectedColorRow = static_cast<size_t>(c);
 		}
 	}
 	{
-		auto const [pg, err] = atoi(page);
+		auto const [pg, err] = strToInt(page);
 		if (!err && static_cast<size_t>(pg) < m_pal.pages.size()) {
 			m_page = static_cast<size_t>(pg);
 		}

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;
@@ -53,7 +53,7 @@ class PaletteEditorImGui: public studio::Editor {
 		static void drawColumn(ox::CStringView txt) noexcept;
 
 		static void drawColumn(ox::Integer_c auto i) noexcept {
-			drawColumn(ox::itoa(i));
+			drawColumn(ox::intToStr(i));
 		}
 
 		static void numShortcuts(size_t &val, size_t sizeRange) noexcept;

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

@@ -12,15 +12,15 @@
 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::UniquePtr<studio::ItemMaker>> out;
+		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{
 			.colorNames = {},

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/cutpastecommand.cpp

@@ -27,11 +27,14 @@ CutPasteCommand::CutPasteCommand(
 		TileSheet::SubSheetIdx subSheetIdx,
 		ox::Point const&dstStart,
 		ox::Point dstEnd,
-		TileSheetClipboard const&cb) noexcept:
+		TileSheetClipboard const&cb):
 		m_commandId(commandId),
 		m_img(img),
 		m_subSheetIdx(std::move(subSheetIdx)) {
 	auto const&ss = getSubSheet(m_img, m_subSheetIdx);
+	if (dstStart.x >= ss.columns * TileWidth || dstStart.y >= ss.rows * TileHeight) {
+		throw ox::Exception{1, "paste starts beyond the bounds of target"};
+	}
 	dstEnd.x = std::min(ss.columns * TileWidth - 1, dstEnd.x);
 	dstEnd.y = std::min(ss.rows * TileHeight - 1, dstEnd.y);
 	for (auto const&p : cb.pixels()) {

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/cutpastecommand.hpp

@@ -69,7 +69,7 @@ class CutPasteCommand: public TileSheetCommand {
 				TileSheet::SubSheetIdx subSheetIdx,
 				ox::Point const&dstStart,
 				ox::Point dstEnd,
-				TileSheetClipboard const&cb) noexcept;
+				TileSheetClipboard const&cb);
 
 		ox::Error redo() noexcept final;
 

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/deletetilescommand.cpp

@@ -8,14 +8,14 @@
 
 namespace nostalgia::gfx {
 
-gfx::DeleteTilesCommand::DeleteTilesCommand(
+DeleteTilesCommand::DeleteTilesCommand(
 		TileSheet &img,
 		TileSheet::SubSheetIdx idx,
-		std::size_t tileIdx,
+		std::size_t const tileIdx,
-		std::size_t tileCnt) noexcept:
+		std::size_t const tileCnt) noexcept:
 		m_img(img),
 		m_idx(std::move(idx)) {
-	const unsigned bytesPerTile = m_img.bpp == 4 ? PixelsPerTile / 2 : PixelsPerTile;
+	constexpr unsigned bytesPerTile = PixelsPerTile;
 	m_deletePos = tileIdx * bytesPerTile;
 	m_deleteSz = tileCnt * bytesPerTile;
 	m_deletedPixels.resize(m_deleteSz);
@@ -28,15 +28,21 @@ gfx::DeleteTilesCommand::DeleteTilesCommand(
 	}
 }
 
-ox::Error gfx::DeleteTilesCommand::redo() noexcept {
+ox::Error DeleteTilesCommand::redo() noexcept {
 	auto &s = getSubSheet(m_img, m_idx);
 	auto &p = s.pixels;
-	auto srcPos = m_deletePos + m_deleteSz;
+	auto const srcPos = m_deletePos + m_deleteSz;
-	auto const src = &p[srcPos];
 	auto const dst1 = &p[m_deletePos];
 	auto const dst2 = &p[(p.size() - m_deleteSz)];
-	ox::memmove(dst1, src, p.size() - srcPos);
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-	ox::memset(dst2, 0, m_deleteSz * sizeof(decltype(p[0])));
+	if (srcPos < p.size()) {
+		auto const src = &p[srcPos];
+		ox::memmove(dst1, src, p.size() - srcPos);
+		ox::memset(dst2, 0, m_deleteSz * sizeof(decltype(p[0])));
+	} else {
+		ox::memset(dst1, 0, p.size() - m_deletePos);
+	}
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	return {};
 }
 
@@ -44,11 +50,16 @@ ox::Error DeleteTilesCommand::undo() noexcept {
 	auto &s = getSubSheet(m_img, m_idx);
 	auto &p = s.pixels;
 	auto const src = &p[m_deletePos];
-	auto const dst1 = &p[m_deletePos + m_deleteSz];
-	auto const dst2 = src;
 	auto const sz = p.size() - m_deletePos - m_deleteSz;
-	ox::memmove(dst1, src, sz);
+	auto const srcPos = m_deletePos + m_deleteSz;
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+	if (srcPos < p.size()) {
+		auto const dst1 = &p[m_deletePos + m_deleteSz];
+		ox::memmove(dst1, src, sz);
+	}
+	auto const dst2 = src;
 	ox::memcpy(dst2, m_deletedPixels.data(), m_deletedPixels.size());
+	OX_ALLOW_UNSAFE_BUFFERS_END
 	return {};
 }
 

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/inserttilescommand.cpp

@@ -9,28 +9,29 @@ namespace nostalgia::gfx {
 InsertTilesCommand::InsertTilesCommand(
 		TileSheet &img,
 		TileSheet::SubSheetIdx idx,
-		std::size_t tileIdx,
+		std::size_t const tileIdx,
-		std::size_t tileCnt) noexcept:
+		std::size_t const tileCnt) noexcept:
-		m_img(img),
+		m_img{img},
-		m_idx(std::move(idx)) {
+		m_idx{std::move(idx)} {
-	const unsigned bytesPerTile = m_img.bpp == 4 ? PixelsPerTile / 2 : PixelsPerTile;
+	m_insertPos = tileIdx * PixelsPerTile;
-	m_insertPos = tileIdx * bytesPerTile;
+	m_insertCnt = tileCnt * PixelsPerTile;
-	m_insertCnt = tileCnt * bytesPerTile;
 	m_deletedPixels.resize(m_insertCnt);
 	// copy pixels to be erased
 	{
 		auto &s = getSubSheet(m_img, m_idx);
 		auto &p = s.pixels;
-		auto dst = m_deletedPixels.begin();
+		auto const dst = m_deletedPixels.begin();
-		auto src = p.begin() + p.size() - m_insertCnt;
+		auto const src = p.begin() + p.size() - m_insertCnt;
 		ox::copy_n(src, m_insertCnt, dst);
 	}
 }
 
+OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+
 ox::Error InsertTilesCommand::redo() noexcept {
 	auto &s = getSubSheet(m_img, m_idx);
 	auto &p = s.pixels;
-	auto dstPos = m_insertPos + m_insertCnt;
+	auto const dstPos = m_insertPos + m_insertCnt;
 	auto const src = &p[m_insertPos];
 	if (dstPos < p.size()) {
 		auto const dst = &p[dstPos];
@@ -55,6 +56,8 @@ ox::Error InsertTilesCommand::undo() noexcept {
 	return {};
 }
 
+OX_ALLOW_UNSAFE_BUFFERS_END
+
 int InsertTilesCommand::commandId() const noexcept {
 	return static_cast<int>(CommandId::InsertTile);
 }

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/palettechangecommand.cpp

@@ -6,14 +6,14 @@
 
 namespace nostalgia::gfx {
 
-gfx::PaletteChangeCommand::PaletteChangeCommand(
+PaletteChangeCommand::PaletteChangeCommand(
 		TileSheet::SubSheetIdx idx,
 		TileSheet &img,
 		ox::StringViewCR newPalette) noexcept:
-		m_img(img),
+		m_img{img},
-		m_idx(std::move(idx)),
+		m_idx{std::move(idx)},
-		m_oldPalette(m_img.defaultPalette),
+		m_oldPalette{m_img.defaultPalette},
-		m_newPalette(ox::sfmt<ox::IString<43>>("uuid://{}", newPalette)) {
+		m_newPalette{ox::sfmt<ox::IString<43>>("uuid://{}", newPalette)} {
 }
 
 ox::Error PaletteChangeCommand::redo() noexcept {

src/nostalgia/modules/gfx/src/studio/tilesheeteditor/commands/updatesubsheetcommand.cpp

@@ -6,7 +6,7 @@
 
 namespace nostalgia::gfx {
 
-gfx::UpdateSubSheetCommand::UpdateSubSheetCommand(
+UpdateSubSheetCommand::UpdateSubSheetCommand(
 		TileSheet &img,
 		TileSheet::SubSheetIdx idx,
 		ox::StringParam name,

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},
@@ -129,7 +129,7 @@ void TileSheetEditorImGui::keyStateChanged(turbine::Key const key, bool const do
 	if (!down) {
 		return;
 	}
-	if (key == turbine::Key::Escape) {
+	if (ig::mainWinHasFocus() && key == turbine::Key::Escape) {
 		m_subsheetEditor.close();
 		m_exportMenu.close();
 		m_palPicker.close();
@@ -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)) {
@@ -549,7 +549,7 @@ void TileSheetEditorImGui::drawPaletteMenu() noexcept {
 					ImGui::PushID(static_cast<int>(i));
 					// Column: color idx
 					ImGui::TableNextColumn();
-					auto const label = ox::itoa(i + 1);
+					auto const label = ox::intToStr(i + 1);
 					auto const rowSelected = i == m_view.palIdx();
 					if (ImGui::Selectable(
 							label.c_str(), rowSelected, ImGuiSelectableFlags_SpanAllColumns)) {

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,14 +45,14 @@ 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_sctx{sctx},
-		m_tctx(m_sctx.tctx),
+		m_tctx{m_sctx.tctx},
-		m_path(std::move(path)),
+		m_path{std::move(path)},
-		m_img(*readObj<TileSheet>(keelCtx(m_tctx), m_path).unwrapThrow()),
+		m_img{*readObj<TileSheet>(keelCtx(m_tctx), m_path).unwrapThrow()},
 		// ignore failure to load palette
-		m_pal(readObj<Palette>(keelCtx(m_tctx), m_img.defaultPalette).value),
+		m_pal{readObj<Palette>(keelCtx(m_tctx), m_img.defaultPalette).value},
-		m_undoStack(undoStack) {
+		m_undoStack{undoStack} {
 	normalizeSubsheets(m_img.subsheet);
 	m_pal.updated.connect(this, &TileSheetEditorModel::markUpdated);
 	m_undoStack.changeTriggered.connect(this, &TileSheetEditorModel::markUpdatedCmdId);
@@ -67,19 +67,27 @@ void TileSheetEditorModel::cut() {
 	TileSheetClipboard blankCb;
 	auto cb = ox::make_unique<TileSheetClipboard>();
 	auto const&s = activeSubSheet();
-	iterateSelectionRows(*m_selection, [&](int const x, int const y) {
+	if (iterateSelectionRows(*m_selection, [&](int const x, int const y) {
 		auto pt = ox::Point{x, y};
 		auto const idx = gfx::idx(s, pt);
-		auto const c = getPixel(s, idx);
+		if (idx >= s.pixels.size()) {
+			return ox::Error{1, "invalid idx"};
+		}
+		auto const c = s.pixels[idx];
 		pt -= m_selection->a;
 		cb->addPixel(pt, c);
 		blankCb.addPixel(pt, 0);
-	});
+		return ox::Error{};
+	})) {
+		return;
+	}
 	auto const pt1 = m_selection->a;
 	auto const pt2 = ox::Point{s.columns * TileWidth, s.rows * TileHeight};
 	turbine::setClipboardObject(m_tctx, std::move(cb));
-	std::ignore = pushCommand(ox::make<CutPasteCommand>(
+	if (auto const cmd = ox::makeCatch<CutPasteCommand>(
-		CommandId::Cut, m_img, m_activeSubsSheetIdx, pt1, pt2, blankCb));
+		CommandId::Cut, m_img, m_activeSubsSheetIdx, pt1, pt2, blankCb); cmd.ok()) {
+		std::ignore = pushCommand(cmd.value);
+	}
 }
 
 void TileSheetEditorModel::copy() {
@@ -87,14 +95,20 @@ void TileSheetEditorModel::copy() {
 		return;
 	}
 	auto cb = ox::make_unique<TileSheetClipboard>();
-	iterateSelectionRows(*m_selection, [&](int const x, int const y) {
+	if (iterateSelectionRows(*m_selection, [&](int const x, int const y) {
 		auto pt = ox::Point{x, y};
 		auto const&s = activeSubSheet();
 		auto const idx = gfx::idx(s, pt);
-		auto const c = getPixel(s, idx);
+		if (idx >= s.pixels.size()) {
+			return ox::Error{1, "invalid idx"};
+		}
+		auto const c = s.pixels[idx];
 		pt -= m_selection->a;
 		cb->addPixel(pt, c);
-	});
+		return ox::Error{};
+	})) {
+		return;
+	}
 	turbine::setClipboardObject(m_tctx, std::move(cb));
 }
 
@@ -111,8 +125,10 @@ void TileSheetEditorModel::paste() {
 	auto const&s = activeSubSheet();
 	auto const pt1 = m_selection->a;
 	auto const pt2 = ox::Point{s.columns * TileWidth, s.rows * TileHeight};
-	std::ignore = pushCommand(ox::make<CutPasteCommand>(
+	if (auto const cmd = ox::makeCatch<CutPasteCommand>(
-		CommandId::Paste, m_img, m_activeSubsSheetIdx, pt1, pt2, *cb));
+		CommandId::Paste, m_img, m_activeSubsSheetIdx, pt1, pt2, *cb); cmd.ok()) {
+		std::ignore = pushCommand(cmd.value);
+	}
 }
 
 bool TileSheetEditorModel::acceptsClipboardPayload() const noexcept {
@@ -152,7 +168,7 @@ void TileSheetEditorModel::drawCommand(ox::Point const &pt, std::size_t const pa
 	auto const idx = gfx::idx(activeSubSheet, pt);
 	if (m_ongoingDrawCommand) {
 		m_updated = m_updated || m_ongoingDrawCommand->append(idx);
-	} else if (getPixel(activeSubSheet, idx) != palIdx) {
+	} else if (activeSubSheet.pixels[idx] != palIdx) {
 		std::ignore = pushCommand(ox::make<DrawCommand>(
 			m_img, m_activeSubsSheetIdx, idx, static_cast<int>(palIdx)));
 	}
@@ -213,6 +229,7 @@ ox::Error TileSheetEditorModel::updateSubsheet(
 void TileSheetEditorModel::setActiveSubsheet(TileSheet::SubSheetIdx const&idx) noexcept {
 	m_activeSubsSheetIdx = idx;
 	this->activeSubsheetChanged.emit(m_activeSubsSheetIdx);
+	clearSelection();
 }
 
 void TileSheetEditorModel::fill(ox::Point const&pt, int const palIdx) noexcept {
@@ -381,7 +398,7 @@ void TileSheetEditorModel::getFillPixels(
 		int const oldColor) const noexcept {
 	auto const idx = ptToIdx(pt, activeSubSheet.columns);
 	auto const relIdx = idx % PixelsPerTile;
-	if (pixels[relIdx] || getPixel(activeSubSheet, idx) != oldColor) {
+	if (pixels[relIdx] || activeSubSheet.pixels[idx] != oldColor) {
 		return;
 	}
 	// mark pixels to update
@@ -419,7 +436,7 @@ void TileSheetEditorModel::setPalPath() noexcept {
 }
 
 ox::Error TileSheetEditorModel::pushCommand(studio::UndoCommand *cmd) noexcept {
-	std::ignore = m_undoStack.push(ox::UPtr<studio::UndoCommand>{cmd});
+	std::ignore = m_undoStack.push(ox::UPtr{cmd});
 	m_ongoingDrawCommand = dynamic_cast<DrawCommand*>(cmd);
 	m_updated = true;
 	return {};

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/gfx/src/studio/tilesheeteditor/tilesheetpixelgrid.cpp

@@ -5,12 +5,13 @@
 #include <ox/claw/write.hpp>
 
 #include <nostalgia/gfx/consts.hpp>
+#include <nostalgia/gfx/gfx.hpp>
 
 #include "tilesheetpixelgrid.hpp"
 
 namespace nostalgia::gfx {
 
-void TileSheetGrid::setPixelSizeMod(float sm) noexcept {
+void TileSheetGrid::setPixelSizeMod(float const sm) noexcept {
 	m_pixelSizeMod = sm;
 }
 
@@ -18,10 +19,11 @@ ox::Error TileSheetGrid::buildShader() noexcept {
 	auto const pixelLineVshad = ox::sfmt(VShad, gl::GlslVersion);
 	auto const pixelLineFshad = ox::sfmt(FShad, gl::GlslVersion);
 	auto const pixelLineGshad = ox::sfmt(GShad, gl::GlslVersion);
-	return glutils::buildShaderProgram(pixelLineVshad, pixelLineFshad, pixelLineGshad).moveTo(m_shader);
+	return glutils::buildShaderProgram(
+		pixelLineVshad, pixelLineFshad, pixelLineGshad).moveTo(m_shader);
 }
 
-void TileSheetGrid::draw(bool update, ox::Vec2 const&scroll) noexcept {
+void TileSheetGrid::draw(bool const update, ox::Vec2 const&scroll) noexcept {
 	// the lines just show up bigger on Windows for some reason
 	if constexpr(ox::defines::OS == ox::OS::Windows) {
 		glLineWidth(3 * m_pixelSizeMod * 0.25f);
@@ -51,7 +53,8 @@ void TileSheetGrid::initBufferSet(ox::Vec2 const&paneSize, TileSheet::SubSheet c
 	// vbo layout
 	auto const pt1Attr = static_cast<GLuint>(glGetAttribLocation(m_shader, "vPt1"));
 	glEnableVertexAttribArray(pt1Attr);
-	glVertexAttribPointer(pt1Attr, 2, GL_FLOAT, GL_FALSE, VertexVboRowLength * sizeof(float), nullptr);
+	glVertexAttribPointer(
+		pt1Attr, 2, GL_FLOAT, GL_FALSE, VertexVboRowLength * sizeof(float), nullptr);
 	auto const pt2Attr = static_cast<GLuint>(glGetAttribLocation(m_shader, "vPt2"));
 	glEnableVertexAttribArray(pt2Attr);
 	glVertexAttribPointer(pt2Attr, 2, GL_FLOAT, GL_FALSE, VertexVboRowLength * sizeof(float),
@@ -70,18 +73,18 @@ void TileSheetGrid::update(ox::Vec2 const&paneSize, TileSheet::SubSheet const&su
 }
 
 void TileSheetGrid::setBufferObject(
-		ox::Point pt1,
+		ox::Point const pt1,
-		ox::Point pt2,
+		ox::Point const pt2,
-		Color32 c,
+		Color32 const c,
-		float *vbo,
+		ox::Span<float> const vbo,
 		ox::Vec2 const&pixSize) noexcept {
 	auto const x1 = static_cast<float>(pt1.x) * pixSize.x - 1.f;
 	auto const y1 = 1.f - static_cast<float>(pt1.y) * pixSize.y;
 	auto const x2 = static_cast<float>(pt2.x) * pixSize.x - 1.f;
 	auto const y2 = 1.f - static_cast<float>(pt2.y) * pixSize.y;
-	// don't worry, this memcpy gets optimized to something much more ideal
+	// don't worry, this gets optimized to something much more ideal
 	ox::Array<float, VertexVboLength> const vertices = {x1, y1, x2, y2, redf(c), greenf(c), bluef(c)};
-	memcpy(vbo, vertices.data(), sizeof(vertices));
+	ox::spancpy(vbo, ox::SpanView<float>{vertices});
 }
 
 void TileSheetGrid::setBufferObjects(ox::Vec2 const&paneSize, TileSheet::SubSheet const&subsheet) noexcept {
@@ -92,7 +95,8 @@ void TileSheetGrid::setBufferObjects(ox::Vec2 const&paneSize, TileSheet::SubShee
 	}
 	auto const pixSize = pixelSize(paneSize);
 	auto const set = [&](std::size_t i, ox::Point pt1, ox::Point pt2, Color32 c) {
-		auto const vbo = &m_bufferSet.vertices[i * VertexVboLength];
+		auto const idx = i * VertexVboLength;
+		auto const vbo = ox::Span{m_bufferSet.vertices} + idx;
 		setBufferObject(pt1, pt2, c, vbo, pixSize);
 	};
 	// set buffer length

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

@@ -7,7 +7,6 @@
 #include <glutils/glutils.hpp>
 #include <studio/studio.hpp>
 
-#include <nostalgia/gfx/gfx.hpp>
 #include <nostalgia/gfx/tilesheet.hpp>
 
 namespace nostalgia::gfx {
@@ -74,7 +73,7 @@ class TileSheetGrid {
 		void update(ox::Vec2 const&paneSize, TileSheet::SubSheet const&subsheet) noexcept;
 
 	private:
-		static void setBufferObject(ox::Point pt1, ox::Point pt2, Color32 c, float *vbo, ox::Vec2 const&pixSize) noexcept;
+		static void setBufferObject(ox::Point pt1, ox::Point pt2, Color32 c, ox::Span<float> vbo, ox::Vec2 const&pixSize) noexcept;
 
 		void setBufferObjects(ox::Vec2 const&paneSize, TileSheet::SubSheet const&subsheet) noexcept;
 

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

@@ -2,8 +2,6 @@
  * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
-#include <nostalgia/gfx/consts.hpp>
-#include <nostalgia/gfx/ptidxconv.hpp>
 #include "tilesheeteditormodel.hpp"
 #include "tilesheetpixels.hpp"
 
@@ -88,11 +86,11 @@ ox::Vec2 TileSheetPixels::pixelSize(ox::Vec2 const&paneSize) const noexcept {
 
 void TileSheetPixels::setPixelBufferObject(
 		ox::Vec2 const&paneSize,
-		unsigned vertexRow,
+		unsigned const vertexRow,
 		float x, float y,
-		Color16 color,
+		Color16 const color,
-		float *vbo,
+		ox::Span<float> const vbo,
-		GLuint *ebo) const noexcept {
+		ox::Span<GLuint> const ebo) const noexcept {
 	auto const [xmod, ymod] = pixelSize(paneSize);
 	x *= xmod;
 	y *= -ymod;
@@ -106,12 +104,12 @@ void TileSheetPixels::setPixelBufferObject(
 			x + xmod, y + ymod, r, g, b, // top right
 			       x, y + ymod, r, g, b, // top left
 	};
-	memcpy(vbo, vertices.data(), sizeof(vertices));
+	ox::spancpy(vbo, ox::SpanView<float>{vertices});
 	std::array const elms = {
 			vertexRow + 0, vertexRow + 1, vertexRow + 2,
 			vertexRow + 2, vertexRow + 3, vertexRow + 0,
 	};
-	memcpy(ebo, elms.data(), sizeof(elms));
+	ox::spancpy(ebo, ox::SpanView<GLuint>{elms});
 }
 
 void TileSheetPixels::setBufferObjects(ox::Vec2 const&paneSize) noexcept {
@@ -137,8 +135,8 @@ void TileSheetPixels::setBufferObjects(ox::Vec2 const&paneSize) noexcept {
 		auto const pt = idxToPt(static_cast<int>(i), subSheet.columns);
 		auto const fx = static_cast<float>(pt.x);
 		auto const fy = static_cast<float>(pt.y);
-		auto const vbo = &m_bufferSet.vertices[i * vboLen];
+		auto const vbo = ox::Span{m_bufferSet.vertices} + i * vboLen;
-		auto const ebo = &m_bufferSet.elements[i * VertexEboLength];
+		auto const ebo = ox::Span{m_bufferSet.elements} + i * VertexEboLength;
 		if (i * vboLen + vboLen > m_bufferSet.vertices.size()) {
 			return;
 		}

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

@@ -6,11 +6,9 @@
 
 #include <ox/std/vec.hpp>
 
-#include <glutils/glutils.hpp>
-#include <studio/studio.hpp>
-
 #include <nostalgia/gfx/color.hpp>
-#include <nostalgia/gfx/gfx.hpp>
+
+#include <glutils/glutils.hpp>
 
 namespace nostalgia::gfx {
 
@@ -44,15 +42,15 @@ class TileSheetPixels {
 
 	private:
 		void setPixelBufferObject(
-				ox::Vec2 const&paneS,
+				ox::Vec2 const&paneSize,
 				unsigned vertexRow,
 				float x,
 				float y,
 				Color16 color,
-				float *vbo,
+				ox::Span<float> vbo,
-				GLuint *ebo) const noexcept;
+				ox::Span<GLuint> ebo) const noexcept;
 
-		void setBufferObjects(ox::Vec2 const&paneS) noexcept;
+		void setBufferObjects(ox::Vec2 const&paneSize) noexcept;
 
 };
 

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

@@ -9,13 +9,13 @@
 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::UniquePtr<studio::ItemMaker>> out;
+		ox::Vector<ox::UPtr<studio::ItemMaker>> out;
 		return out;
 	}
 } const mod;

src/nostalgia/player/app.cpp

@@ -69,7 +69,7 @@ static ox::Error runTest(turbine::Context &tctx) {
 	OX_RETURN_ERROR(gfx::loadSpriteTileSheet(*cctx, "/TileSheets/Charset.nts"));
 	OX_RETURN_ERROR(gfx::loadSpritePalette(*cctx, "/Palettes/Chester.npal"));
 	OX_RETURN_ERROR(gfx::initConsole(*cctx));
-	gfx::puts(*cctx, 10, 9, "DOPENESS!!!");
+	gfx::consoleWrite(*cctx, 10, 9, "DOPENESS!!!");
 	turbine::setUpdateHandler(tctx, testUpdateHandler);
 	turbine::setKeyEventHandler(tctx, testKeyEventHandler);
 	return turbine::run(tctx);

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.1"
 )
 
 install(

src/nostalgia/studio/Info.plist

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

src/nostalgia/studio/icondata.cpp

@@ -5,7 +5,7 @@
 
 namespace studio {
 
-static constexpr ox::Array<uint8_t, 134> WindowIcon16Data {
+static const ox::Array<uint8_t, 134> WindowIcon16Data {
 	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00,
 	0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x10,
 	0x00, 0x00, 0x00, 0x10, 0x02, 0x03, 0x00, 0x00, 0x00, 0x62,
@@ -24,7 +24,7 @@ static constexpr ox::Array<uint8_t, 134> WindowIcon16Data {
 
 ox::SpanView<uint8_t> WindowIcon16() noexcept { return WindowIcon16Data; }
 
-static constexpr ox::Array<uint8_t, 149> WindowIcon24Data {
+static const ox::Array<uint8_t, 149> WindowIcon24Data {
 	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00,
 	0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x18,
 	0x00, 0x00, 0x00, 0x18, 0x02, 0x03, 0x00, 0x00, 0x00, 0x9d,
@@ -44,7 +44,7 @@ static constexpr ox::Array<uint8_t, 149> WindowIcon24Data {
 
 ox::SpanView<uint8_t> WindowIcon24() noexcept { return WindowIcon24Data; }
 
-static constexpr ox::Array<uint8_t, 4249> WindowIcon32Data {
+static const ox::Array<uint8_t, 4249> WindowIcon32Data {
 	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00,
 	0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x20,
 	0x00, 0x00, 0x00, 0x20, 0x02, 0x03, 0x00, 0x00, 0x00, 0x0e,
@@ -474,7 +474,7 @@ static constexpr ox::Array<uint8_t, 4249> WindowIcon32Data {
 
 ox::SpanView<uint8_t> WindowIcon32() noexcept { return WindowIcon32Data; }
 
-static constexpr ox::Array<uint8_t, 334> WindowIcon40Data {
+static const ox::Array<uint8_t, 334> WindowIcon40Data {
 	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00,
 	0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x28,
 	0x00, 0x00, 0x00, 0x28, 0x08, 0x03, 0x00, 0x00, 0x00, 0xbb,
@@ -513,7 +513,7 @@ static constexpr ox::Array<uint8_t, 334> WindowIcon40Data {
 
 ox::SpanView<uint8_t> WindowIcon40() noexcept { return WindowIcon40Data; }
 
-static constexpr ox::Array<uint8_t, 163> WindowIcon48Data {
+static const ox::Array<uint8_t, 163> WindowIcon48Data {
 	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00,
 	0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x30,
 	0x00, 0x00, 0x00, 0x30, 0x02, 0x03, 0x00, 0x00, 0x00, 0x2a,
@@ -535,7 +535,7 @@ static constexpr ox::Array<uint8_t, 163> WindowIcon48Data {
 
 ox::SpanView<uint8_t> WindowIcon48() noexcept { return WindowIcon48Data; }
 
-static constexpr ox::Array<uint8_t, 8148> WindowIcon128Data {
+static const ox::Array<uint8_t, 8148> WindowIcon128Data {
 	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00,
 	0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x80,
 	0x00, 0x00, 0x00, 0x80, 0x02, 0x03, 0x00, 0x00, 0x00, 0xbe,
@@ -1355,7 +1355,7 @@ static constexpr ox::Array<uint8_t, 8148> WindowIcon128Data {
 
 ox::SpanView<uint8_t> WindowIcon128() noexcept { return WindowIcon128Data; }
 
-static constexpr ox::Array<uint8_t, 275> WindowIcon264Data {
+static const ox::Array<uint8_t, 275> WindowIcon264Data {
 	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00,
 	0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x01, 0x08,
 	0x00, 0x00, 0x01, 0x08, 0x02, 0x03, 0x00, 0x00, 0x00, 0xde,
@@ -1388,7 +1388,7 @@ static constexpr ox::Array<uint8_t, 275> WindowIcon264Data {
 
 ox::SpanView<uint8_t> WindowIcon264() noexcept { return WindowIcon264Data; }
 
-static constexpr ox::Array<uint8_t, 851> WindowIcon1080Data {
+static const ox::Array<uint8_t, 851> WindowIcon1080Data {
 	0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00,
 	0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x03, 0x48,
 	0x00, 0x00, 0x03, 0x48, 0x02, 0x03, 0x00, 0x00, 0x00, 0x80,

src/olympic/keel/include/keel/context.hpp

@@ -12,8 +12,6 @@
 
 namespace keel {
 
-class Context;
-
 class Context {
 	public:
 		ox::UPtr<ox::FileSystem> rom;

src/olympic/keel/include/keel/keel.hpp

@@ -15,7 +15,18 @@
 namespace keel {
 
 ox::Error init(
-		keel::Context &ctx,
+		Context &ctx,
+		ox::UPtr<ox::FileSystem> &&fs,
+		ox::StringViewCR appName,
+		DuplicateSet &duplicateSet) noexcept;
+
+ox::Result<ox::UPtr<Context>> init(
+		ox::UPtr<ox::FileSystem> &&fs,
+		ox::StringViewCR appName,
+		DuplicateSet &duplicateSet) noexcept;
+
+ox::Error init(
+		Context &ctx,
 		ox::UPtr<ox::FileSystem> &&fs,
 		ox::StringViewCR appName) noexcept;
 

src/olympic/keel/include/keel/media.hpp

@@ -29,13 +29,14 @@ OX_MODEL_BEGIN(PreloadPtr)
 	OX_MODEL_FIELD(preloadAddr)
 OX_MODEL_END()
 
-ox::Result<std::size_t> getPreloadAddr(keel::Context &ctx, ox::FileAddress const&addr) noexcept;
+ox::Result<std::size_t> getPreloadAddr(Context &ctx, ox::FileAddress const&addr) noexcept;
-ox::Result<std::size_t> getPreloadAddr(keel::Context &ctx, ox::StringViewCR path) noexcept;
+ox::Result<std::size_t> getPreloadAddr(Context &ctx, ox::StringViewCR path) noexcept;
 
 
 void createUuidMapping(Context &ctx, ox::StringViewCR filePath, ox::UUID const&uuid) noexcept;
 
-ox::Error buildUuidMap(Context &ctx) noexcept;
+// map of UUIDs to paths
+using DuplicateSet = ox::HashMap<ox::UUID, ox::Vector<ox::String>>;
 
 ox::Result<ox::UUID> pathToUuid(Context &ctx, ox::StringViewCR path) noexcept;
 
@@ -87,8 +88,8 @@ constexpr auto makeLoader(Context &ctx) {
 }
 
 template<typename T>
-ox::Result<keel::AssetRef<T>> readObjFile(
+ox::Result<AssetRef<T>> readObjFile(
-		keel::Context &ctx,
+		Context &ctx,
 		ox::StringViewCR assetId,
 		bool const forceLoad) noexcept {
 	static constexpr auto load = [](
@@ -135,11 +136,11 @@ ox::Result<keel::AssetRef<T>> readObjNoCache(
 
 #endif
 
-ox::Error reloadAsset(keel::Context &ctx, ox::StringViewCR assetId) noexcept;
+ox::Error reloadAsset(Context &ctx, ox::StringViewCR assetId) noexcept;
 
 template<typename T>
-ox::Result<keel::AssetRef<T>> readObj(
+ox::Result<AssetRef<T>> readObj(
-		keel::Context &ctx,
+		Context &ctx,
 		ox::StringViewCR assetId,
 		[[maybe_unused]] bool forceLoad = false) noexcept {
 #ifndef OX_BARE_METAL
@@ -150,8 +151,8 @@ ox::Result<keel::AssetRef<T>> readObj(
 }
 
 template<typename T>
-ox::Result<keel::AssetRef<T>> readObj(
+ox::Result<AssetRef<T>> readObj(
-		keel::Context &ctx,
+		Context &ctx,
 		ox::FileAddress const&file,
 		[[maybe_unused]] bool forceLoad = false) noexcept {
 #ifndef OX_BARE_METAL
@@ -169,7 +170,7 @@ ox::Result<keel::AssetRef<T>> readObj(
 
 template<typename T>
 ox::Error writeObj(
-		keel::Context &ctx,
+		Context &ctx,
 		ox::FileAddress const&file,
 		T const&obj,
 		ox::ClawFormat fmt = ox::ClawFormat::Metal) noexcept {
@@ -177,6 +178,8 @@ ox::Error writeObj(
 	return ctx.rom->write(file, objBuff.data(), objBuff.size());
 }
 
+ox::Error setRomFs(Context &ctx, ox::UPtr<ox::FileSystem> &&fs, DuplicateSet &duplicateSet) noexcept;
+
 ox::Error setRomFs(Context &ctx, ox::UPtr<ox::FileSystem> &&fs) noexcept;
 
 ox::Result<ox::UPtr<ox::FileSystem>> loadRomFs(ox::StringViewCR path) noexcept;

src/olympic/keel/src/keel.cpp

@@ -6,21 +6,24 @@
 
 namespace keel {
 
-ox::Error init(
+static ox::Error init(
-		keel::Context &ctx,
+		Context &ctx,
 		ox::UPtr<ox::FileSystem> &&fs,
-		ox::StringViewCR appName) noexcept {
+		ox::StringViewCR appName,
+		DuplicateSet *duplicateSet) noexcept {
 	ctx.appName = appName;
-	std::ignore = setRomFs(ctx, std::move(fs));
+	std::ignore = duplicateSet ?
+		setRomFs(ctx, std::move(fs), *duplicateSet) :
+		setRomFs(ctx, std::move(fs));
 #ifndef OX_BARE_METAL
 	auto const&mods = modules();
 	for (auto &mod : mods) {
 		// register type converters
-		for (auto c : mod->converters()) {
+		for (auto const c : mod->converters()) {
 			ctx.converters.emplace_back(c);
 		}
 		// register pack transforms
-		for (auto c : mod->packTransforms()) {
+		for (auto const c : mod->packTransforms()) {
 			ctx.packTransforms.emplace_back(c);
 		}
 	}
@@ -28,6 +31,30 @@ ox::Error init(
 	return {};
 }
 
+ox::Error init(
+		Context &ctx,
+		ox::UPtr<ox::FileSystem> &&fs,
+		ox::StringViewCR appName,
+		DuplicateSet &duplicateSet) noexcept {
+	return init(ctx, std::move(fs), appName, &duplicateSet);
+}
+
+ox::Result<ox::UPtr<Context>> init(
+	ox::UPtr<ox::FileSystem> &&fs,
+	ox::StringViewCR appName,
+	DuplicateSet &duplicateSet) noexcept {
+	auto ctx = ox::make_unique<Context>();
+	OX_RETURN_ERROR(keel::init(*ctx, std::move(fs), appName, &duplicateSet));
+	return ctx;
+}
+
+ox::Error init(
+		Context &ctx,
+		ox::UPtr<ox::FileSystem> &&fs,
+		ox::StringViewCR appName) noexcept {
+	return init(ctx, std::move(fs), appName, nullptr);
+}
+
 ox::Result<ox::UPtr<Context>> init(ox::UPtr<ox::FileSystem> &&fs, ox::StringViewCR appName) noexcept {
 	auto ctx = ox::make_unique<Context>();
 	OX_RETURN_ERROR(keel::init(*ctx, std::move(fs), appName));

src/olympic/keel/src/media.cpp

@@ -47,7 +47,7 @@ void createUuidMapping(Context &ctx, ox::StringViewCR filePath, ox::UUID const&u
 	ctx.uuidToPath[uuid.toString()] = filePath;
 }
 
-static ox::Error buildUuidMap(Context &ctx, ox::StringViewCR path) noexcept {
+static ox::Error buildUuidMap(Context &ctx, ox::StringViewCR path, DuplicateSet *duplicates) noexcept {
 	OX_REQUIRE(files, ctx.rom->ls(path));
 	for (auto const&f : files) {
 		OX_REQUIRE_M(filePath, ox::join("/", ox::Array<ox::StringView, 2>{path, f}));
@@ -58,22 +58,31 @@ static ox::Error buildUuidMap(Context &ctx, ox::StringViewCR path) noexcept {
 				ctx.rom->read(filePath, 0, buff.size(), buff));
 			auto const [uuid, err] = readUuidHeader(buff);
 			if (!err) {
-				createUuidMapping(ctx, filePath, uuid);
+				// check for duplication
+				if (duplicates && ctx.uuidToPath[uuid.toString()].len()) {
+					auto &dl = (*duplicates)[uuid];
+					if (dl.empty()) {
+						dl.emplace_back(ctx.uuidToPath[uuid.toString()]);
+					}
+					dl.emplace_back(filePath);
+				} else {
+					createUuidMapping(ctx, filePath, uuid);
+				}
 			}
 		} else if (stat.fileType == ox::FileType::Directory) {
 			if (!beginsWith(f, ".")) {
-				OX_RETURN_ERROR(buildUuidMap(ctx, filePath));
+				OX_RETURN_ERROR(buildUuidMap(ctx, filePath, duplicates));
 			}
 		}
 	}
 	return {};
 }
 
-ox::Error buildUuidMap(Context &ctx) noexcept {
+static ox::Error buildUuidMap(Context &ctx, DuplicateSet *duplicates) noexcept {
 	if (!ctx.rom) {
-		return ox::Error(1, "No ROM FS");
+		return ox::Error{1, "No ROM FS"};
 	}
-	return buildUuidMap(ctx, "");
+	return buildUuidMap(ctx, "", duplicates);
 }
 
 ox::Result<ox::UUID> pathToUuid(Context &ctx, ox::StringViewCR path) noexcept {
@@ -173,7 +182,7 @@ ox::Result<ox::CStringView> uuidToPath(Context &ctx, ox::UUID const&uuid) noexce
 #endif
 }
 
-ox::Error reloadAsset(keel::Context &ctx, ox::StringViewCR assetId) noexcept {
+ox::Error reloadAsset(Context &ctx, ox::StringViewCR assetId) noexcept {
 	if (beginsWith(assetId, "uuid://")) {
 		return ctx.assetManager.reloadAsset(substr(assetId, 7));
 	} else {
@@ -199,7 +208,7 @@ namespace keel {
 static void clearUuidMap(Context&) noexcept {
 }
 
-ox::Error buildUuidMap(Context&) noexcept {
+static ox::Error buildUuidMap(Context&, DuplicateSet*) noexcept {
 	return {};
 }
 
@@ -249,10 +258,16 @@ ox::Error reloadAsset(keel::Context&, ox::StringView) noexcept {
 
 namespace keel {
 
+ox::Error setRomFs(Context &ctx, ox::UPtr<ox::FileSystem> &&fs, DuplicateSet &duplicateSet) noexcept {
+	ctx.rom = std::move(fs);
+	clearUuidMap(ctx);
+	return buildUuidMap(ctx, &duplicateSet);
+}
+
 ox::Error setRomFs(Context &ctx, ox::UPtr<ox::FileSystem> &&fs) noexcept {
 	ctx.rom = std::move(fs);
 	clearUuidMap(ctx);
-	return buildUuidMap(ctx);
+	return buildUuidMap(ctx, nullptr);
 }
 
 ox::Result<ox::UPtr<ox::FileSystem>> loadRomFs(ox::StringViewCR path) noexcept {

src/olympic/keel/src/pack-applib.cpp

@@ -55,7 +55,20 @@ static ox::Error pack(
 	ox::Buffer dstBuff(32 * ox::units::MB);
 	OX_RETURN_ERROR(ox::FileSystem32::format(dstBuff.data(), dstBuff.size()));
 	ox::FileSystem32 dst(dstBuff);
-	OX_REQUIRE(ctx, keel::init(ox::make_unique<ox::PassThroughFS>(argSrc), "keel-pack"));
+	keel::DuplicateSet duplicateSet;
+	OX_REQUIRE(ctx, keel::init(
+		ox::make_unique<ox::PassThroughFS>(argSrc), "keel-pack", duplicateSet));
+	if (duplicateSet.size()) {
+		oxErr("Multiple files have the same UUID:\n");
+		for (auto const &k : duplicateSet.keys()) {
+			oxErrf("\n\t{}:\n", k.toString());
+			for (auto const &v : duplicateSet[k]) {
+				oxErrf("\t\t{}\n", v);
+			}
+		}
+		oxErr("\n");
+		std::exit(1);
+	}
 	keel::TypeStore ts(*ctx->rom, ox::sfmt("{}/type_descriptors", projectDataDir));
 	OX_RETURN_ERROR(generateTypes(ts));
 	keel::Manifest manifest;

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

@@ -13,23 +13,15 @@ extern ox::String appVersion;
 
 namespace studio {
 
-AboutPopup::AboutPopup(turbine::Context &ctx) noexcept {
+AboutPopup::AboutPopup(turbine::Context &ctx) noexcept: Popup("About") {
 	m_text = ox::sfmt("{} - {}", keelCtx(ctx).appName, olympic::appVersion);
 }
 
-void AboutPopup::open() noexcept {
+void AboutPopup::draw(Context &sctx) noexcept {
-	m_stage = Stage::Opening;
+	if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
-}
+		close();
-
+		return;
-void AboutPopup::close() noexcept {
+	}
-	m_stage = Stage::Closed;
-}
-
-bool AboutPopup::isOpen() const noexcept {
-	return m_stage == Stage::Open;
-}
-
-void AboutPopup::draw(StudioContext &sctx) noexcept {
 	switch (m_stage) {
 		case Stage::Closed:
 			break;
@@ -43,7 +35,7 @@ void AboutPopup::draw(StudioContext &sctx) noexcept {
 			ig::centerNextWindow(sctx.tctx);
 			auto open = true;
 			if (ImGui::BeginPopupModal("About", &open, modalFlags)) {
-				ImGui::Text("%s", m_text.c_str());
+				ImGui::Text("%s\n\nBuild date: %s", m_text.c_str(), __DATE__);
 				ImGui::NewLine();
 				ImGui::Dummy({148.0f, 0.0f});
 				ImGui::SameLine();

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

@@ -13,29 +13,14 @@
 
 namespace studio {
 
-class AboutPopup: public studio::Popup {
+class AboutPopup final: public ig::Popup {
-	public:
-		enum class Stage {
-			Closed,
-			Opening,
-			Open,
-		};
-
 	private:
-		Stage m_stage = Stage::Closed;
 		ox::String m_text;
 
 	public:
 		explicit AboutPopup(turbine::Context &ctx) noexcept;
 
-		void open() noexcept override;
+		void draw(Context &sctx) noexcept override;
-
-		void close() noexcept override;
-
-		[[nodiscard]]
-		bool isOpen() const noexcept override;
-
-		void draw(studio::StudioContext &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,11 @@ 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;
+	}
 	switch (m_stage) {
 		case Stage::Closed:
 			break;

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

@@ -2,6 +2,8 @@
  * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
+#include <studio/imguiutil.hpp>
+
 #include "makecopypopup.hpp"
 
 namespace studio {
@@ -26,7 +28,7 @@ bool MakeCopyPopup::isOpen() const noexcept {
 	return m_open;
 }
 
-void MakeCopyPopup::draw(StudioContext const &ctx) noexcept {
+void MakeCopyPopup::draw(Context &ctx) noexcept {
 	switch (m_stage) {
 		case Stage::Closed:
 			break;
@@ -68,7 +70,7 @@ void MakeCopyPopup::draw(StudioContext const &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

@@ -7,11 +7,12 @@
 #include <ox/std/string.hpp>
 
 #include <studio/context.hpp>
-#include <studio/imguiutil.hpp>
+
+#include <studio/widget.hpp>
 
 namespace studio {
 
-class MakeCopyPopup {
+class MakeCopyPopup: public Widget {
  	private:
 		enum class Stage {
 			Closed,
@@ -36,10 +37,10 @@ class MakeCopyPopup {
 		[[nodiscard]]
 		bool isOpen() const noexcept;
 
-		void draw(StudioContext const &ctx) noexcept;
+		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,11 @@ 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;
+	}
 	switch (m_stage) {
 		case Stage::Closed:
 			break;

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,11 @@ 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;
+	}
 	switch (m_stage) {
 		case Stage::Opening:
 			ImGui::OpenPopup(title().c_str());
@@ -84,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 {
@@ -101,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 =
@@ -113,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]] {
@@ -166,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};
@@ -187,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

@@ -12,7 +12,8 @@
 
 namespace studio {
 
-NewProject::NewProject(ox::StringParam projectDatadir) noexcept: m_projectDataDir(std::move(projectDatadir)) {
+NewProject::NewProject(ox::StringParam projectDatadir) noexcept:
+	m_projectDataDir{std::move(projectDatadir)} {
 	setTitle("New Project");
 	setSize({230, 140});
 }
@@ -32,7 +33,11 @@ bool NewProject::isOpen() const noexcept {
 	return m_open;
 }
 
-void NewProject::draw(studio::StudioContext &ctx) noexcept {
+void NewProject::draw(Context &ctx) noexcept {
+	if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
+		close();
+		return;
+	}
 	switch (m_stage) {
 		case Stage::Opening:
 			ImGui::OpenPopup(title().c_str());
@@ -48,39 +53,25 @@ void NewProject::draw(studio::StudioContext &ctx) noexcept {
 	}
 }
 
-void NewProject::drawNewProjectName(studio::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());
-		if (ImGui::Button("Browse")) {
+		if (ig::PushButton("Browse")) {
 			oxLogError(studio::chooseDirectory().moveTo(m_projectPath));
 		}
 		drawLastPageButtons(sctx);
 	});
 }
 
-void NewProject::drawFirstPageButtons() noexcept {
+void NewProject::drawLastPageButtons(Context&) noexcept {
-	ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 130);
+	ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 110);
-	ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 20);
+	ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 22);
-	auto const btnSz = ImVec2(60, 20);
+	if (ig::PushButton("Finish")) {
-	if (ImGui::Button("Next", btnSz)) {
-		m_stage = Stage::NewItemName;
-	}
-	ImGui::SameLine();
-	if (ImGui::Button("Cancel", btnSz)) {
-		ImGui::CloseCurrentPopup();
-		m_stage = Stage::Closed;
-	}
-}
-
-void NewProject::drawLastPageButtons(studio::StudioContext&) noexcept {
-	ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 95);
-	ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 20);
-	if (ImGui::Button("Finish")) {
 		finish();
 	}
 	ImGui::SameLine();
-	if (ImGui::Button("Quit")) {
+	if (ig::PushButton("Quit")) {
 		ImGui::CloseCurrentPopup();
 		m_stage = Stage::Closed;
 	}

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

@@ -29,7 +29,7 @@ class NewProject: public studio::Popup {
 		ox::String const m_projectDataDir;
 		ox::String m_projectPath;
 		ox::IString<255> m_projectName;
-		ox::Vector<ox::UniquePtr<studio::ItemMaker>> m_types;
+		ox::Vector<ox::UPtr<studio::ItemMaker>> m_types;
 		bool m_open = false;
 
 	public:
@@ -42,14 +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 drawFirstPageButtons() noexcept;
+		void drawLastPageButtons(studio::Context &ctx) noexcept;
-
-		void drawLastPageButtons(studio::StudioContext &ctx) noexcept;
 
 		void finish() noexcept;
 

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

@@ -34,7 +34,11 @@ 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;
+	}
 	switch (m_stage) {
 		case Stage::Closed:
 			break;

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

@@ -17,14 +17,20 @@
 #include "font.hpp"
 #include "studioui.hpp"
 
+#ifdef OX_OS_Darwin
+#define STUDIO_CTRL "Cmd"
+#else
+#define STUDIO_CTRL "Ctrl"
+#endif
+
 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));
 }
 
@@ -59,10 +65,7 @@ OX_MODEL_END()
 StudioUI::StudioUI(turbine::Context &ctx, ox::StringParam projectDataDir) noexcept:
 		m_sctx{*this, ctx},
 		m_tctx{ctx},
-		m_projectDataDir{std::move(projectDataDir)},
+		m_projectDataDir{std::move(projectDataDir)} {
-		m_projectExplorer{keelCtx(m_tctx)},
-		m_newProject{m_projectDataDir},
-		m_aboutPopup{m_tctx} {
 	{
 		ImFontConfig fontCfg;
 		fontCfg.FontDataOwnedByAtlas = false;
@@ -119,14 +122,6 @@ StudioUI::StudioUI(turbine::Context &ctx, ox::StringParam projectDataDir) noexce
 }
 
 void StudioUI::handleKeyEvent(turbine::Key const key, bool const down) noexcept {
-	for (auto const p : m_popups) {
-		if (p->isOpen()) {
-			if (key == turbine::Key::Escape) {
-				p->close();
-			}
-			return;
-		}
-	}
 	if (m_activeEditor && !ImGui::IsKeyDown(ImGuiKey_ModCtrl)) {
 		m_activeEditor->keyStateChanged(key, down);
 	}
@@ -159,15 +154,9 @@ void StudioUI::draw() noexcept {
 			ImGui::SameLine();
 		}
 		drawTabBar();
-		for (auto const&w : m_widgets) {
+		for (auto const w : m_widgets) {
 			w->draw(m_sctx);
 		}
-		for (auto const p : m_popups) {
-			p->draw(m_sctx);
-		}
-		m_closeAppConfirm.draw(m_sctx);
-		m_closeFileConfirm.draw(m_sctx);
-		m_copyFilePopup.draw(m_sctx);
 	}
 	ImGui::End();
 	handleKeyInput();
@@ -188,45 +177,64 @@ bool StudioUI::handleShutdown() noexcept {
 void StudioUI::drawMenu() noexcept {
 	if (ImGui::BeginMainMenuBar()) {
 		if (ImGui::BeginMenu("File")) {
-			if (ImGui::MenuItem("New...", "Ctrl+N", false, m_project)) {
+			if (ImGui::MenuItem("New...", STUDIO_CTRL "+N", false, m_project)) {
 				m_newMenu.open();
 			}
-			if (ImGui::MenuItem("New Project...", "Ctrl+Shift+N")) {
+			if (ImGui::MenuItem("New Project...", STUDIO_CTRL "+Shift+N")) {
 				m_newProject.open();
 			}
-			if (ImGui::MenuItem("Open Project...", "Ctrl+O")) {
+			if (ImGui::MenuItem("Open Project...", STUDIO_CTRL "+O")) {
 				m_taskRunner.add(*ox::make<FileDialogManager>(this, &StudioUI::openProjectPath));
 			}
-			if (ImGui::MenuItem("Save", "Ctrl+S", false, m_activeEditor && m_activeEditor->unsavedChanges())) {
+			if (ImGui::MenuItem(
+					"Save",
+					STUDIO_CTRL "+S",
+					false,
+					m_activeEditor && m_activeEditor->unsavedChanges())) {
 				m_activeEditor->save();
 			}
-			if (ImGui::MenuItem("Quit", "Ctrl+Q")) {
+			if (ImGui::MenuItem("Quit", STUDIO_CTRL "+Q")) {
 				turbine::requestShutdown(m_tctx);
 			}
 			ImGui::EndMenu();
 		}
 		if (ImGui::BeginMenu("Edit")) {
 			auto undoStack = m_activeEditor ? m_activeEditor->undoStack() : nullptr;
-			if (ImGui::MenuItem("Undo", "Ctrl+Z", false, undoStack && undoStack->canUndo())) {
+			if (ImGui::MenuItem(
+					"Undo", STUDIO_CTRL "+Z", false, undoStack && undoStack->canUndo())) {
 				oxLogError(undoStack->undo());
 			}
-			if (ImGui::MenuItem("Redo", "Ctrl+Y", false, undoStack && undoStack->canRedo())) {
+			if (ImGui::MenuItem(
+					"Redo", STUDIO_CTRL "+Y", false, undoStack && undoStack->canRedo())) {
 				oxLogError(undoStack->redo());
 			}
 			ImGui::Separator();
-			if (ImGui::MenuItem("Copy", "Ctrl+C", false, m_activeEditor && m_activeEditor->copyEnabled())) {
+			if (ImGui::MenuItem(
+					"Copy",
+					STUDIO_CTRL "+C",
+					false,
+					m_activeEditor && m_activeEditor->copyEnabled())) {
 				m_activeEditor->copy();
 			}
-			if (ImGui::MenuItem("Cut", "Ctrl+X", false, m_activeEditor && m_activeEditor->cutEnabled())) {
+			if (ImGui::MenuItem(
+					"Cut",
+					STUDIO_CTRL "+X",
+					false,
+					m_activeEditor && m_activeEditor->cutEnabled())) {
 				m_activeEditor->cut();
 			}
-			if (ImGui::MenuItem("Paste", "Ctrl+V", false, m_activeEditor && m_activeEditor->pasteEnabled())) {
+			if (ImGui::MenuItem(
+					"Paste",
+					STUDIO_CTRL "+V",
+					false,
+					m_activeEditor && m_activeEditor->pasteEnabled())) {
 				m_activeEditor->paste();
 			}
 			ImGui::EndMenu();
 		}
 		if (ImGui::BeginMenu("View")) {
-			if (ImGui::MenuItem("Project Explorer", "Ctrl+Shift+1", m_showProjectExplorer)) {
+			if (ImGui::MenuItem(
+					"Project Explorer", STUDIO_CTRL "+Shift+1", m_showProjectExplorer)) {
 				toggleProjectExplorer();
 			}
 			ImGui::EndMenu();
@@ -244,7 +252,7 @@ void StudioUI::drawMenu() noexcept {
 void StudioUI::drawTabBar() noexcept {
 	auto const viewport = ImGui::GetContentRegionAvail();
 	ImGui::BeginChild("TabWindow##MainWindow##Studio", ImVec2(viewport.x, viewport.y));
-	constexpr auto tabBarFlags = ImGuiTabBarFlags_Reorderable | ImGuiTabBarFlags_TabListPopupButton;
+	constexpr auto tabBarFlags = ImGuiTabBarFlags_TabListPopupButton;
 	if (ImGui::BeginTabBar("TabBar##TabWindow##MainWindow##Studio", tabBarFlags)) {
 		drawTabs();
 		ImGui::EndTabBar();
@@ -285,7 +293,6 @@ void StudioUI::drawTabs() noexcept {
 		}
 		if (!open) {
 			if (e->unsavedChanges()) {
-				m_closeAppConfirm.open();
 				m_closeFileConfirm.open();
 				++it;
 			} else {
@@ -293,12 +300,8 @@ void StudioUI::drawTabs() noexcept {
 				if (m_activeEditor == (*it).get()) {
 					m_activeEditor = nullptr;
 				}
-				try {
+				if (auto const err = m_editors.erase(it).moveTo(it)) {
-					OX_THROW_ERROR(m_editors.erase(it).moveTo(it));
+					oxErrf("Editor tab deletion failed: {} ({}:{})\n", toStr(err), err.src.file_name(), err.src.line());
-				} catch (ox::Exception const&ex) {
-					oxErrf("Editor tab deletion failed: {} ({}:{})\n", ex.what(), ex.src.file_name(), ex.src.line());
-				} catch (std::exception const&ex) {
-					oxErrf("Editor tab deletion failed: {}\n", ex.what());
 				}
 			}
 		} else {
@@ -403,7 +406,6 @@ void StudioUI::handleKeyInput() noexcept {
 		} else if (ImGui::IsKeyPressed(ImGuiKey_W)) {
 			if (m_activeEditor) {
 				if (m_activeEditor->unsavedChanges()) {
-					m_closeAppConfirm.open();
 					m_closeFileConfirm.open();
 				} else {
 					oxLogError(closeCurrentFile());
@@ -473,6 +475,18 @@ ox::Error StudioUI::handleMoveFile(ox::StringViewCR oldPath, ox::StringViewCR ne
 	return m_projectExplorer.refreshProjectTreeModel();
 }
 
+ox::Error StudioUI::handleDeleteDir(ox::StringViewCR path) noexcept {
+	auto const p = sfmt("{}/", path);
+	for (auto &e : m_editors) {
+		if (beginsWith(e->itemPath(), p)) {
+			oxLogError(closeFile(path));
+			m_closeActiveTab = true;
+			break;
+		}
+	}
+	return m_projectExplorer.refreshProjectTreeModel();
+}
+
 ox::Error StudioUI::handleDeleteFile(ox::StringViewCR path) noexcept {
 	for (auto &e : m_editors) {
 		if (path == e->itemPath()) {
@@ -494,17 +508,31 @@ ox::Error StudioUI::createOpenProject(ox::StringViewCR path) noexcept {
 
 ox::Error StudioUI::openProjectPath(ox::StringParam path) noexcept {
 	OX_REQUIRE_M(fs, keel::loadRomFs(path.view()));
-	OX_RETURN_ERROR(keel::setRomFs(keelCtx(m_tctx), std::move(fs)));
+	keel::DuplicateSet ds;
+	OX_RETURN_ERROR(keel::setRomFs(keelCtx(m_tctx), std::move(fs), ds));
+	if (ds.size()) {
+		ox::String msg;
+		msg += "Multiple files have the same UUID:\n";
+		for (auto const &k : ds.keys()) {
+			msg += ox::sfmt("\n\t{}:\n", k.toString());
+			for (auto const &v : ds[k]) {
+				msg += ox::sfmt("\t\t - {}\n", v);
+			}
+		}
+		m_messagePopup.show(msg);
+	}
 	OX_RETURN_ERROR(
 			ox::make_unique_catch<Project>(keelCtx(m_tctx), std::move(path), m_projectDataDir)
 			        .moveTo(m_project));
 	m_sctx.project = m_project.get();
-	turbine::setWindowTitle(m_tctx, ox::sfmt("{} - {}", keelCtx(m_tctx).appName, m_project->projectPath()));
+	turbine::setWindowTitle(
+		m_tctx, ox::sfmt("{} - {}", keelCtx(m_tctx).appName, m_project->projectPath()));
 	m_deleteConfirmation.deleteFile.connect(m_sctx.project, &Project::deleteItem);
 	m_copyFilePopup.makeCopy.connect(m_sctx.project, &Project::copyItem);
 	m_newDirDialog.newDir.connect(m_sctx.project, &Project::mkdir);
 	m_project->dirAdded.connect(&m_projectExplorer, &ProjectExplorer::refreshProjectTreeModel);
 	m_project->fileAdded.connect(&m_projectExplorer, &ProjectExplorer::refreshProjectTreeModel);
+	m_project->dirDeleted.connect(this, &StudioUI::handleDeleteDir);
 	m_project->fileDeleted.connect(this, &StudioUI::handleDeleteFile);
 	m_project->fileMoved.connect(this, &StudioUI::handleMoveFile);
 	m_openFiles.clear();
@@ -570,7 +598,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,15 +29,14 @@ 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;
 		TaskRunner m_taskRunner;
 		ox::Vector<ox::UPtr<BaseEditor>> m_editors;
-		ox::Vector<ox::UPtr<Widget>> m_widgets;
 		ox::HashMap<ox::String, EditorMaker::Func> m_editorMakers;
-		ProjectExplorer m_projectExplorer;
+		ProjectExplorer m_projectExplorer{keelCtx(m_tctx)};
 		ox::Vector<ox::String> m_openFiles;
 		BaseEditor *m_activeEditorOnLastDraw = nullptr;
 		BaseEditor *m_activeEditor = nullptr;
@@ -46,6 +45,7 @@ class StudioUI: public ox::SignalHandler {
 		ox::Vector<ox::Pair<ox::String>> m_queuedMoves;
 		ox::Vector<ox::Pair<ox::String>> m_queuedDirMoves;
 		NewMenu m_newMenu{keelCtx(m_tctx)};
+		AboutPopup m_aboutPopup{m_tctx};
 		DeleteConfirmation m_deleteConfirmation;
 		NewDir m_newDirDialog;
 		ig::QuestionPopup m_closeFileConfirm{"Close File?", "This file has unsaved changes. Close?"};
@@ -53,17 +53,21 @@ class StudioUI: public ox::SignalHandler {
 			"Close Application?",
 			"There are files with unsaved changes. Close?"
 		};
+		ig::MessagePopup m_messagePopup{"Message", ""};
 		MakeCopyPopup m_copyFilePopup;
 		RenameFile m_renameFile;
-		NewProject m_newProject;
+		NewProject m_newProject{m_projectDataDir};
-		AboutPopup m_aboutPopup;
+		ox::Array<Widget*, 10> const m_widgets {
-		ox::Array<Popup*, 6> const m_popups = {
+			&m_closeFileConfirm,
+			&m_closeAppConfirm,
+			&m_copyFilePopup,
 			&m_newMenu,
 			&m_newProject,
 			&m_aboutPopup,
 			&m_deleteConfirmation,
 			&m_newDirDialog,
 			&m_renameFile,
+			&m_messagePopup,
 		};
 		bool m_showProjectExplorer = true;
 		struct NavAction {
@@ -122,6 +126,8 @@ class StudioUI: public ox::SignalHandler {
 
 		ox::Error handleMoveFile(ox::StringViewCR oldPath, ox::StringViewCR newPath, ox::UUID const&id) noexcept;
 
+		ox::Error handleDeleteDir(ox::StringViewCR path) noexcept;
+
 		ox::Error handleDeleteFile(ox::StringViewCR path) noexcept;
 
 		ox::Error createOpenProject(ox::StringViewCR path) noexcept;

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

@@ -12,6 +12,7 @@
 
 #include <turbine/context.hpp>
 #include <studio/context.hpp>
+#include <studio/widget.hpp>
 
 namespace studio::ig {
 
@@ -168,7 +169,9 @@ TextInput<ox::IString<MaxChars>> InputText(
 	out.changed = ImGui::InputText(
 			label.c_str(), out.text.data(), MaxChars + 1, flags, callback, user_data);
 	if (out.changed) {
+		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 		std::ignore = out.text.unsafeResize(ox::strlen(out.text.c_str()));
+		OX_ALLOW_UNSAFE_BUFFERS_END
 	}
 	return out;
 }
@@ -185,7 +188,9 @@ TextInput<ox::IString<MaxChars>> InputTextWithHint(
 	out.changed = ImGui::InputTextWithHint(
 			label.c_str(), hint.c_str(), out.text.data(), MaxChars + 1, flags, callback, user_data);
 	if (out.changed) {
+		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 		std::ignore = out.text.unsafeResize(ox::strlen(out.text.c_str()));
+		OX_ALLOW_UNSAFE_BUFFERS_END
 	}
 	return out;
 }
@@ -200,7 +205,9 @@ bool InputText(
 	auto const out = ImGui::InputText(
 		label.c_str(), text.data(), StrCap + 1, flags, callback, user_data);
 	if (out) {
+		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 		std::ignore = text.unsafeResize(ox::strlen(text.c_str()));
+		OX_ALLOW_UNSAFE_BUFFERS_END
 	}
 	return out;
 }
@@ -222,6 +229,10 @@ PopupResponse PopupControlsOkCancel(
 	ox::CStringViewCR ok = "OK",
 	ox::CStringViewCR cancel = "Cancel");
 
+PopupResponse PopupControlsOk(
+	bool &popupOpen,
+	ox::CStringViewCR ok);
+
 [[nodiscard]]
 bool BeginPopup(turbine::Context &ctx, ox::CStringViewCR popupName, bool &show, ImVec2 const&sz = {285, 0});
 
@@ -249,7 +260,7 @@ bool ComboBox(ox::CStringView lbl, ox::Span<const ox::String> list, size_t &sele
 /**
  *
  * @param lbl
- * @param callback
+ * @param f callback function
  * @param selectedIdx
  * @return true if new value selected, false otherwise
  */
@@ -261,7 +272,7 @@ bool ComboBox(
 
 bool FileComboBox(
 		ox::CStringViewCR lbl,
-		StudioContext &sctx,
+		Context &sctx,
 		ox::StringViewCR fileExt,
 		size_t &selectedIdx) noexcept;
 
@@ -284,7 +295,7 @@ bool ListBox(ox::CStringViewCR name, ox::SpanView<ox::String> const&list, size_t
 class FilePicker {
 	private:
 		bool m_show{};
-		studio::StudioContext &m_sctx;
+		Context &m_sctx;
 		ox::String const m_title;
 		ox::String const m_fileExt;
 		ImVec2 const m_size;
@@ -292,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;
@@ -303,8 +314,8 @@ class FilePicker {
 
 };
 
-class QuestionPopup {
+class Popup: public Widget {
- 	private:
+	protected:
 		enum class Stage {
 			Closed,
 			Opening,
@@ -313,12 +324,11 @@ class QuestionPopup {
 		Stage m_stage = Stage::Closed;
 		bool m_open{};
 		ox::String m_title;
-		ox::String m_question;
 
 	public:
-		ox::Signal<ox::Error(ig::PopupResponse)> response;
+		ox::Signal<ox::Error(PopupResponse)> response;
 
-		QuestionPopup(ox::StringParam title, ox::StringParam question) noexcept;
+		explicit Popup(ox::StringParam title) noexcept;
 
 		void open() noexcept;
 
@@ -327,7 +337,33 @@ class QuestionPopup {
 		[[nodiscard]]
 		bool isOpen() const noexcept;
 
-		void draw(StudioContext &ctx, ImVec2 const &sz = {}) noexcept;
+};
+
+class QuestionPopup: public Popup {
+	private:
+		ox::String m_question;
+
+	public:
+		ox::Signal<ox::Error(PopupResponse)> response;
+
+		QuestionPopup(ox::StringParam title, ox::StringParam question) noexcept;
+
+		void draw(Context &ctx) noexcept override;
+
+};
+
+class MessagePopup: public Popup {
+ 	private:
+		ox::String m_msg;
+
+	public:
+		ox::Signal<ox::Error(PopupResponse)> response;
+
+		MessagePopup(ox::StringParam title, ox::StringParam msg) noexcept;
+
+		void show(ox::StringParam msg) noexcept;
+
+		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/popup.hpp

@@ -12,10 +12,12 @@
 
 #include <turbine/context.hpp>
 
+#include "widget.hpp"
+
 namespace studio {
 
 
-class Popup {
+class Popup: public Widget {
 	private:
 		ox::Vec2 m_size;
 		ox::String m_title;
@@ -23,7 +25,7 @@ class Popup {
 		// emits path parameter
 		ox::Signal<ox::Error(ox::String const&)> finished;
 
-		virtual ~Popup() noexcept = default;
+		~Popup() noexcept override = default;
 
 		virtual void open() noexcept = 0;
 
@@ -32,8 +34,6 @@ class Popup {
 		[[nodiscard]]
 		virtual bool isOpen() const noexcept = 0;
 
-		virtual void draw(studio::StudioContext &ctx) noexcept = 0;
-
 	protected:
 		constexpr void setSize(ox::Size sz) noexcept {
 			m_size = {static_cast<float>(sz.width), static_cast<float>(sz.height)};

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

@@ -23,6 +23,7 @@ enum class ProjectEvent {
 	// FileRecognized is triggered for all matching files upon a new
 	// subscription to a section of the project and upon the addition of a file.
 	FileRecognized,
+	DirDeleted,
 	FileDeleted,
 	FileUpdated,
 	FileMoved,
@@ -134,6 +135,7 @@ class Project: public ox::SignalHandler {
 		// file.
 		ox::Signal<ox::Error(ox::StringViewCR)> fileRecognized;
 		ox::Signal<ox::Error(ox::StringViewCR)> fileDeleted;
+		ox::Signal<ox::Error(ox::StringViewCR)> dirDeleted;
 		ox::Signal<ox::Error(ox::StringViewCR path, ox::UUID const&id)> fileUpdated;
 		ox::Signal<ox::Error(ox::StringViewCR oldPath, ox::StringViewCR newPath, ox::UUID const&id)> fileMoved;
 
@@ -201,6 +203,9 @@ ox::Error Project::subscribe(ProjectEvent e, ox::SignalHandler *tgt, Functor &&s
 			connect(this, &Project::fileRecognized, tgt, slot);
 			break;
 		}
+		case ProjectEvent::DirDeleted:
+			connect(this, &Project::dirDeleted, tgt, slot);
+			break;
 		case ProjectEvent::FileDeleted:
 			connect(this, &Project::fileDeleted, tgt, slot);
 			break;

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

@@ -24,7 +24,7 @@ class Task: public ox::SignalHandler {
 
 class TaskRunner {
 	private:
-		ox::Vector<ox::UniquePtr<studio::Task>> m_tasks;
+		ox::Vector<ox::UPtr<studio::Task>> m_tasks;
 	public:
 		void update(turbine::Context &ctx) noexcept;
 		void add(Task &task) noexcept;

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(studio::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/filedialog_nfd.cpp

@@ -12,10 +12,12 @@
 namespace studio {
 
 FDFilterItem::FDFilterItem(ox::StringViewCR pName, ox::StringViewCR pSpec) noexcept {
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	name.resize(pName.len() + 1);
 	ox::strncpy(name.data(), pName.data(), pName.len());
 	spec.resize(pSpec.len() + 1);
 	ox::strncpy(spec.data(), pSpec.data(), pSpec.len());
+	OX_ALLOW_UNSAFE_BUFFERS_END
 }
 
 static ox::Result<ox::String> toResult(nfdresult_t r, NFD::UniquePathN const&path) noexcept {

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) {
@@ -93,6 +93,9 @@ void FileTreeModel::draw(turbine::Context &tctx) const noexcept {
 		if (ImGui::IsItemActivated() || ImGui::IsItemClicked(1)) {
 			m_explorer.setSelectedNode(this);
 		}
+		if (ImGui::IsItemFocused() && ImGui::IsKeyPressed(ImGuiKey_Delete)) {
+			m_explorer.fileDeleted(m_fullPath);
+		}
 		ig::IDStackItem const idStackItem{m_name};
 		m_explorer.drawDirContextMenu(m_fullPath);
 		if (m_explorer.fileDraggable()) {

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

@@ -82,6 +82,25 @@ PopupResponse PopupControlsOkCancel(
 	return PopupControlsOkCancel(ImGui::GetContentRegionAvail().x + 17, popupOpen, ok, cancel);
 }
 
+PopupResponse PopupControlsOk(
+	bool &popupOpen,
+	ox::CStringViewCR ok) {
+	auto out = PopupResponse::None;
+	constexpr auto btnSz = ImVec2{50, BtnSz.y};
+	ImGui::Separator();
+	ImGui::SetCursorPosX(ImGui::GetContentRegionAvail().x - 42);
+	if (ImGui::Button(ok.c_str(), btnSz)) {
+		popupOpen = false;
+		out = PopupResponse::OK;
+	}
+	ImGui::SameLine();
+	if (ImGui::IsKeyDown(ImGuiKey_Escape)) {
+		popupOpen = false;
+		out = PopupResponse::Cancel;
+	}
+	return out;
+}
+
 bool BeginPopup(turbine::Context &ctx, ox::CStringViewCR popupName, bool &show, ImVec2 const&sz) {
 	constexpr auto modalFlags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize;
 	centerNextWindow(ctx);
@@ -150,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);
@@ -194,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:
@@ -226,25 +245,29 @@ void FilePicker::show() noexcept {
 }
 
 
-QuestionPopup::QuestionPopup(ox::StringParam title, ox::StringParam question) noexcept:
+Popup::Popup(ox::StringParam title) noexcept: m_title{std::move(title)} {
-	m_title{std::move(title)},
-	m_question{std::move(question)} {
 }
 
-void QuestionPopup::open() noexcept {
+void Popup::open() noexcept {
 	m_stage = Stage::Opening;
 }
 
-void QuestionPopup::close() noexcept {
+void Popup::close() noexcept {
 	m_stage = Stage::Closed;
 	m_open = false;
 }
 
-bool QuestionPopup::isOpen() const noexcept {
+bool Popup::isOpen() const noexcept {
 	return m_open;
 }
 
-void QuestionPopup::draw(StudioContext &ctx, ImVec2 const &sz) noexcept {
+
+QuestionPopup::QuestionPopup(ox::StringParam title, ox::StringParam question) noexcept:
+	Popup{std::move(title)},
+	m_question{std::move(question)} {
+}
+
+void QuestionPopup::draw(Context &ctx) noexcept {
 	switch (m_stage) {
 		case Stage::Closed:
 			break;
@@ -255,7 +278,7 @@ void QuestionPopup::draw(StudioContext &ctx, ImVec2 const &sz) noexcept {
 		[[fallthrough]];
 		case Stage::Open:
 			centerNextWindow(ctx.tctx);
-			ImGui::SetNextWindowSize(static_cast<ImVec2>(sz));
+			ImGui::SetNextWindowSize({});
 			constexpr auto modalFlags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize;
 			if (ImGui::BeginPopupModal(m_title.c_str(), &m_open, modalFlags)) {
 				ImGui::Text("%s", m_question.c_str());
@@ -279,6 +302,49 @@ void QuestionPopup::draw(StudioContext &ctx, ImVec2 const &sz) noexcept {
 }
 
 
+MessagePopup::MessagePopup(ox::StringParam title, ox::StringParam msg) noexcept:
+	Popup{std::move(title)},
+	m_msg{std::move(msg)} {
+}
+
+void MessagePopup::show(ox::StringParam msg) noexcept {
+	m_msg = std::move(msg);
+	open();
+}
+
+void MessagePopup::draw(Context &ctx) noexcept {
+	switch (m_stage) {
+		case Stage::Closed:
+			break;
+		case Stage::Opening:
+			ImGui::OpenPopup(m_title.c_str());
+			m_stage = Stage::Open;
+			m_open = true;
+		[[fallthrough]];
+		case Stage::Open:
+			centerNextWindow(ctx.tctx);
+			ImGui::SetNextWindowSize({});
+			constexpr auto modalFlags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize;
+			if (ImGui::BeginPopupModal(m_title.c_str(), &m_open, modalFlags)) {
+				ImGui::Text("%s", m_msg.c_str());
+				auto const r = PopupControlsOk(m_open, "OK");
+				switch (r) {
+					case PopupResponse::None:
+						break;
+					case PopupResponse::OK:
+						response.emit(r);
+						close();
+						break;
+					case PopupResponse::Cancel:
+						break;
+				}
+				ImGui::EndPopup();
+			}
+			break;
+	}
+}
+
+
 bool s_mainWinHasFocus{};
 bool mainWinHasFocus() noexcept {
 	return s_mainWinHasFocus;

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/studio/modlib/src/project.cpp

@@ -145,7 +145,7 @@ ox::Error Project::deleteItem(ox::StringViewCR path) noexcept {
 		}
 		auto const err = m_fs.remove(path);
 		if (!err) {
-			fileDeleted.emit(path);
+			dirDeleted.emit(path);
 		}
 		return err;
 	} else {