[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;
-		 // move sign
-		 const auto negative = (decoded >> negBit) == 1;
-		 if (negative) {
-			 // 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
-			 ox::Array<uint32_t, 2> d = {};
-			 //d[0] = decoded & 0xffff'ffff;
-			 //d[1] = decoded >> 32;
-			 ox::memcpy(&d[0], &decoded, sizeof(decoded));
-			 auto bit = negBit;
-			 for (; bit < ox::min<std::size_t>(Bits<I>, 32); ++bit) {
-				 d[0] |= 1 << bit;
-			 }
-			 bit -= 32;
-			 for (; bit < Bits<I>; ++bit) {
-				 d[1] |= 1 << bit;
-			 }
-			 I out = 0;
-			 if constexpr(ox::defines::BigEndian) {
-				 const auto d0Tmp = d[0];
-				 d[0] = d[1];
-				 d[1] = d0Tmp;
-			 }
-			 ox::memcpy(&out, &d[0], sizeof(out));
-			 return out;
-		 }
+		const auto negBit = bytes * 8 - bytes - 1;
+		// move sign
+		const auto negative = (decoded >> negBit) == 1;
+		if (negative) {
+			// 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
+			ox::Array<uint32_t, 2> d = {};
+			//d[0] = decoded & 0xffff'ffff;
+			//d[1] = decoded >> 32;
+		 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+			ox::memcpy(&d[0], &decoded, sizeof(decoded));
+		 	OX_ALLOW_UNSAFE_BUFFERS_END
+			auto bit = negBit;
+			for (; bit < ox::min<std::size_t>(Bits<I>, 32); ++bit) {
+				d[0] |= 1 << bit;
+			}
+			bit -= 32;
+			for (; bit < Bits<I>; ++bit) {
+				d[1] |= 1 << bit;
+			}
+			I out = 0;
+			if constexpr(ox::defines::BigEndian) {
+				const auto d0Tmp = d[0];
+				d[0] = d[1];
+				d[1] = d0Tmp;
+			}
+		 	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));
-			ox::memset(&other.m_data, 0, sizeof(m_data));
+			m_data = other.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));
-			ox::memset(&other.m_data, 0, sizeof(m_data));
+			m_data = other.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 {
-	std::size_t len = 0;
-	for (; len < maxLen && str1[len]; len++);
+constexpr size_t strnlen_s(const char *str, size_t const maxLen) noexcept {
+	if (!str) [[unlikely]] {
+		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;

project/.nostalgia/type_descriptors/B.int32;0

@@ -1,5 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"length" : 4,
-	"primitiveType" : 1,
-	"typeName" : "B.int32"
-}

project/.nostalgia/type_descriptors/B.int8;0

@@ -1,5 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"length" : 1,
-	"primitiveType" : 1,
-	"typeName" : "B.int8"
-}

project/.nostalgia/type_descriptors/B.string;0

@@ -1,4 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"primitiveType" : 4,
-	"typeName" : "B.string"
-}

project/.nostalgia/type_descriptors/B.uint16;0

@@ -1,4 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"length" : 2,
-	"typeName" : "B.uint16"
-}

project/.nostalgia/type_descriptors/B.uint64;0

@@ -1,4 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"length" : 8,
-	"typeName" : "B.uint64"
-}

project/.nostalgia/type_descriptors/B.uint8;0

@@ -1,4 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"length" : 1,
-	"typeName" : "B.uint8"
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.NostalgiaGraphic;1

@@ -1,39 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "bpp",
-			"typeId" : "B.int8;0"
-		},
-		{
-			"fieldName" : "rows",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "columns",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "defaultPalette",
-			"typeId" : "net.drinkingtea.ox.FileAddress;1"
-		},
-		{
-			"fieldName" : "pal",
-			"typeId" : "net.drinkingtea.nostalgia.core.Palette;1"
-		},
-		{
-			"fieldName" : "pixels",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint8;0"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.NostalgiaGraphic",
-	"typeVersion" : 1
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette.ColorInfo;3

@@ -1,12 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "name",
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.Palette.ColorInfo",
-	"typeVersion" : 3
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette.PalettePage;1

@@ -1,23 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "name",
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "colors",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.nostalgia.core.PaletteColor;1"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.Palette.PalettePage",
-	"typeVersion" : 1
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;1

@@ -1,19 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "colors",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint16;0"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.Palette",
-	"typeVersion" : 1
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;2

@@ -1,23 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "pages",
-			"subscriptLevels" : 2,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				},
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint16;0"
-		}
-	],
-	"preloadable" : true,
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.Palette",
-	"typeVersion" : 2
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;3

@@ -1,34 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "colorInfo",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.nostalgia.core.Palette.ColorInfo;3"
-		},
-		{
-			"fieldName" : "pages",
-			"subscriptLevels" : 2,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				},
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint16;0"
-		}
-	],
-	"preloadable" : true,
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.Palette",
-	"typeVersion" : 3
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;4

@@ -1,31 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "colorNames",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "pages",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.nostalgia.core.Palette.PalettePage;1"
-		}
-	],
-	"preloadable" : true,
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.Palette",
-	"typeVersion" : 4
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.PaletteColor;1

@@ -1,24 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "r",
-			"typeId" : "B.uint8;0"
-		},
-		{
-			"fieldName" : "g",
-			"typeId" : "B.uint8;0"
-		},
-		{
-			"fieldName" : "b",
-			"typeId" : "B.uint8;0"
-		},
-		{
-			"fieldName" : "a",
-			"typeId" : "B.uint8;0"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.PaletteColor",
-	"typeVersion" : 1
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;1

@@ -1,42 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "name",
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "rows",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "columns",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "subsheets",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet;1"
-		},
-		{
-			"fieldName" : "pixels",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint8;0"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet",
-	"typeVersion" : 1
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;3

@@ -1,42 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "name",
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "rows",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "columns",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "subsheets",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet;3"
-		},
-		{
-			"fieldName" : "pixels",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint8;0"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet",
-	"typeVersion" : 3
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;4

@@ -1,46 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "id",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "name",
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "rows",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "columns",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "subsheets",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet;4"
-		},
-		{
-			"fieldName" : "pixels",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint8;0"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet",
-	"typeVersion" : 4
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;2

@@ -1,20 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "bpp",
-			"typeId" : "B.int8;0"
-		},
-		{
-			"fieldName" : "defaultPalette",
-			"typeId" : "net.drinkingtea.ox.FileAddress;1"
-		},
-		{
-			"fieldName" : "subsheet",
-			"typeId" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet;1"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.TileSheet",
-	"typeVersion" : 2
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;3

@@ -1,24 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "bpp",
-			"typeId" : "B.int8;0"
-		},
-		{
-			"fieldName" : "idIt",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "defaultPalette",
-			"typeId" : "net.drinkingtea.ox.FileAddress;1"
-		},
-		{
-			"fieldName" : "subsheet",
-			"typeId" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet;3"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.TileSheet",
-	"typeVersion" : 3
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;4

@@ -1,24 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "bpp",
-			"typeId" : "B.int8;0"
-		},
-		{
-			"fieldName" : "idIt",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "defaultPalette",
-			"typeId" : "net.drinkingtea.ox.FileAddress;1"
-		},
-		{
-			"fieldName" : "subsheet",
-			"typeId" : "net.drinkingtea.nostalgia.core.TileSheet.SubSheet;4"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.core.TileSheet",
-	"typeVersion" : 4
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.CompactPalette;1

@@ -1,23 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "pages",
-			"subscriptLevels" : 2,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				},
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint16;0"
-		}
-	],
-	"preloadable" : true,
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.gfx.CompactPalette",
-	"typeVersion" : 1
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.CompactTileSheet;1

@@ -1,28 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "bpp",
-			"typeId" : "B.int8;0"
-		},
-		{
-			"fieldName" : "defaultPalette",
-			"typeId" : "net.drinkingtea.ox.FileAddress;1"
-		},
-		{
-			"fieldName" : "pixels",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint8;0"
-		}
-	],
-	"preloadable" : true,
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.gfx.CompactTileSheet",
-	"typeVersion" : 1
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.Palette.PalettePage;2

@@ -1,23 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "name",
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "colors",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.nostalgia.gfx.PaletteColor;2"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.gfx.Palette.PalettePage",
-	"typeVersion" : 2
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.Palette;5

@@ -1,31 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "colorNames",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "pages",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.nostalgia.gfx.Palette.PalettePage;2"
-		}
-	],
-	"preloadable" : true,
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.gfx.Palette",
-	"typeVersion" : 5
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.PaletteColor;2

@@ -1,24 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "r",
-			"typeId" : "B.uint8;0"
-		},
-		{
-			"fieldName" : "g",
-			"typeId" : "B.uint8;0"
-		},
-		{
-			"fieldName" : "b",
-			"typeId" : "B.uint8;0"
-		},
-		{
-			"fieldName" : "a",
-			"typeId" : "B.uint8;0"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.gfx.PaletteColor",
-	"typeVersion" : 2
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet;5

@@ -1,46 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "id",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "name",
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "rows",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "columns",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "subsheets",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet;5"
-		},
-		{
-			"fieldName" : "pixels",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint8;0"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet",
-	"typeVersion" : 5
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.gfx.TileSheet;5

@@ -1,24 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "bpp",
-			"typeId" : "B.int8;0"
-		},
-		{
-			"fieldName" : "idIt",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "defaultPalette",
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "subsheet",
-			"typeId" : "net.drinkingtea.nostalgia.gfx.TileSheet.SubSheet;5"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.gfx.TileSheet",
-	"typeVersion" : 5
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.SceneDoc;1

@@ -1,41 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "tilesheet",
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "palettes",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "tiles",
-			"subscriptLevels" : 3,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				},
-				{
-					"subscriptType" : 4
-				},
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.nostalgia.scene.TileDoc;1"
-		}
-	],
-	"preloadable" : true,
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.scene.SceneDoc",
-	"typeVersion" : 1
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.SceneStatic;1

@@ -1,88 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "tilesheet",
-			"typeId" : "net.drinkingtea.ox.FileAddress;1"
-		},
-		{
-			"fieldName" : "palettes",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "net.drinkingtea.ox.FileAddress;1"
-		},
-		{
-			"fieldName" : "columns",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint16;0"
-		},
-		{
-			"fieldName" : "rows",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint16;0"
-		},
-		{
-			"fieldName" : "tileMapIdx",
-			"subscriptLevels" : 2,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				},
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint16;0"
-		},
-		{
-			"fieldName" : "tileType",
-			"subscriptLevels" : 2,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				},
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint8;0"
-		},
-		{
-			"fieldName" : "layerAttachments",
-			"subscriptLevels" : 2,
-			"subscriptStack" : 
-			[
-				{
-					"subscriptType" : 4
-				},
-				{
-					"subscriptType" : 4
-				}
-			],
-			"typeId" : "B.uint8;0"
-		}
-	],
-	"preloadable" : true,
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.scene.SceneStatic",
-	"typeVersion" : 1
-}

project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.scene.TileDoc;1

@@ -1,33 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "subsheet_id",
-			"typeId" : "B.int32;0"
-		},
-		{
-			"fieldName" : "subsheet_path",
-			"typeId" : "net.drinkingtea.ox.BasicString#8#;1"
-		},
-		{
-			"fieldName" : "type",
-			"typeId" : "B.uint8;0"
-		},
-		{
-			"fieldName" : "layer_attachments",
-			"subscriptLevels" : 1,
-			"subscriptStack" : 
-			[
-				{
-					"length" : 4,
-					"subscriptType" : 3
-				}
-			],
-			"typeId" : "B.uint8;0"
-		}
-	],
-	"preloadable" : true,
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.nostalgia.scene.TileDoc",
-	"typeVersion" : 1
-}

project/.nostalgia/type_descriptors/net.drinkingtea.ox.BasicString#8#;1

@@ -1,9 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"primitiveType" : 4,
-	"typeName" : "net.drinkingtea.ox.BasicString",
-	"typeParams" : 
-	[
-		"8"
-	],
-	"typeVersion" : 1
-}

project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data;1

@@ -1,20 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "path",
-			"typeId" : "B.string"
-		},
-		{
-			"fieldName" : "constPath",
-			"typeId" : "B.string"
-		},
-		{
-			"fieldName" : "inode",
-			"typeId" : "B.uint64;0"
-		}
-	],
-	"primitiveType" : 6,
-	"typeName" : "net.drinkingtea.ox.FileAddress.Data",
-	"typeVersion" : 1
-}

project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress;1

@@ -1,16 +0,0 @@
-O1;net.drinkingtea.ox.TypeDescriptor;1;{
-	"fieldList" : 
-	[
-		{
-			"fieldName" : "type",
-			"typeId" : "B.int8;0"
-		},
-		{
-			"fieldName" : "data",
-			"typeId" : "net.drinkingtea.ox.FileAddress.Data"
-		}
-	],
-	"primitiveType" : 5,
-	"typeName" : "net.drinkingtea.ox.FileAddress",
-	"typeVersion" : 1
-}

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
-  editor to jump to the last color.
+* TileSheetEditor: Fix Delete Tile functionality, which was completely broken
+* 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...");
-	puts(*ctx, 32 + 1,  4, "UNEXPECTED STATE:");
-	puts(*ctx, 32 + 2,  6, panicMsg);
+	consoleWrite(*ctx, 32 + 1,  1, "SADNESS...");
+	consoleWrite(*ctx, 32 + 1,  4, "UNEXPECTED STATE:");
+	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

@@ -68,7 +68,7 @@ void PaletteEditorImGui::PageRenameDialog::draw(turbine::Context &tctx) noexcept
 }
 
 
-PaletteEditorImGui::PaletteEditorImGui(studio::StudioContext &sctx, ox::StringParam path):
+PaletteEditorImGui::PaletteEditorImGui(studio::Context &sctx, ox::StringParam path):
 		Editor(sctx, std::move(path)),
 		m_sctx(sctx),
 		m_tctx(sctx.tctx),
@@ -77,7 +77,7 @@ PaletteEditorImGui::PaletteEditorImGui(studio::StudioContext &sctx, ox::StringPa
 	m_pageRenameDlg.inputSubmitted.connect(this, &PaletteEditorImGui::renamePage);
 }
 
-void PaletteEditorImGui::draw(studio::StudioContext&) noexcept {
+void PaletteEditorImGui::draw(studio::Context&) noexcept {
 	auto const paneSize = ImGui::GetContentRegionAvail();
 	{
 		ImGui::BeginChild("Pages", {280, paneSize.y}, true);
@@ -105,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::UniquePtr<studio::ItemMaker>> out;
+	ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(studio::Context&) const noexcept final {
+		ox::Vector<ox::UPtr<studio::ItemMaker>> out;
 		out.emplace_back(ox::make<studio::ItemMakerT<TileSheet>>("Tile Sheet", "TileSheets", FileExt_nts));
 		out.emplace_back(ox::make<studio::ItemMakerT<Palette>>("Palette", "Palettes", FileExt_npal, Palette{
 			.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 tileCnt) noexcept:
+		std::size_t const tileIdx,
+		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 src = &p[srcPos];
+	auto const srcPos = m_deletePos + m_deleteSz;
 	auto const dst1 = &p[m_deletePos];
 	auto const dst2 = &p[(p.size() - m_deleteSz)];
-	ox::memmove(dst1, src, p.size() - srcPos);
-	ox::memset(dst2, 0, m_deleteSz * sizeof(decltype(p[0])));
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+	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 tileCnt) noexcept:
-		m_img(img),
-		m_idx(std::move(idx)) {
-	const unsigned bytesPerTile = m_img.bpp == 4 ? PixelsPerTile / 2 : PixelsPerTile;
-	m_insertPos = tileIdx * bytesPerTile;
-	m_insertCnt = tileCnt * bytesPerTile;
+		std::size_t const tileIdx,
+		std::size_t const tileCnt) noexcept:
+		m_img{img},
+		m_idx{std::move(idx)} {
+	m_insertPos = tileIdx * PixelsPerTile;
+	m_insertCnt = tileCnt * PixelsPerTile;
 	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 src = p.begin() + p.size() - m_insertCnt;
+		auto const dst = m_deletedPixels.begin();
+		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_idx(std::move(idx)),
-		m_oldPalette(m_img.defaultPalette),
-		m_newPalette(ox::sfmt<ox::IString<43>>("uuid://{}", newPalette)) {
+		m_img{img},
+		m_idx{std::move(idx)},
+		m_oldPalette{m_img.defaultPalette},
+		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):
-		m_sctx(sctx),
-		m_tctx(m_sctx.tctx),
-		m_path(std::move(path)),
-		m_img(*readObj<TileSheet>(keelCtx(m_tctx), m_path).unwrapThrow()),
+		studio::Context &sctx, ox::StringParam path, studio::UndoStack &undoStack):
+		m_sctx{sctx},
+		m_tctx{m_sctx.tctx},
+		m_path{std::move(path)},
+		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_undoStack(undoStack) {
+		m_pal{readObj<Palette>(keelCtx(m_tctx), m_img.defaultPalette).value},
+		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>(
-		CommandId::Cut, m_img, m_activeSubsSheetIdx, pt1, pt2, blankCb));
+	if (auto const cmd = ox::makeCatch<CutPasteCommand>(
+		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>(
-		CommandId::Paste, m_img, m_activeSubsSheetIdx, pt1, pt2, *cb));
+	if (auto const cmd = ox::makeCatch<CutPasteCommand>(
+		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 pt2,
-		Color32 c,
-		float *vbo,
+		ox::Point const pt1,
+		ox::Point const pt2,
+		Color32 const c,
+		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,
-		float *vbo,
-		GLuint *ebo) const noexcept {
+		Color16 const color,
+		ox::Span<float> const vbo,
+		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 ebo = &m_bufferSet.elements[i * VertexEboLength];
+		auto const vbo = ox::Span{m_bufferSet.vertices} + i * vboLen;
+		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,
-				GLuint *ebo) const noexcept;
+				ox::Span<float> vbo,
+				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::UniquePtr<studio::ItemMaker>> out;
+	ox::Vector<ox::UPtr<studio::ItemMaker>> itemMakers(studio::Context&) const noexcept final {
+		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/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/src/media.cpp

@@ -182,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 {

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 {
-	m_stage = Stage::Opening;
-}
-
-void AboutPopup::close() noexcept {
-	m_stage = Stage::Closed;
-}
-
-bool AboutPopup::isOpen() const noexcept {
-	return m_stage == Stage::Open;
-}
-
-void AboutPopup::draw(StudioContext &sctx) noexcept {
+void AboutPopup::draw(Context &sctx) noexcept {
+	if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
+		close();
+		return;
+	}
 	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 {
-	public:
-		enum class Stage {
-			Closed,
-			Opening,
-			Open,
-		};
-
+class AboutPopup final: public ig::Popup {
 	private:
-		Stage m_stage = Stage::Closed;
 		ox::String m_text;
 
 	public:
 		explicit AboutPopup(turbine::Context &ctx) noexcept;
 
-		void open() noexcept override;
-
-		void close() noexcept override;
-
-		[[nodiscard]]
-		bool isOpen() const noexcept override;
-
-		void draw(studio::StudioContext &sctx) noexcept override;
+		void draw(Context &sctx) noexcept override;
 
 };
 

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

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

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

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

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

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

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

@@ -31,7 +31,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;
 };
 
 }