[ox/std] Make Vector::remove take a MaybeView_t

.gitattributes

@@ -0,0 +1 @@
+sample_project text eol=lf

.gitignore

@@ -6,12 +6,14 @@
 .mypy_cache
 .stfolder
 .stignore
+.vs
 util/scripts/__pycache__
 pyenv
 CMakeLists.txt.user
 ROM.oxfs
 Session.vim
 build
+cmake-build-*
 compile_commands.json
 dist
 graph_info.json

Makefile

@@ -19,7 +19,7 @@ pkg-gba: build
 
 .PHONY: pkg-mac
 pkg-mac: install
-	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-dmg.py
+	${BC_CMD_ENVRUN} ${BC_PY3} ./util/scripts/pkg-dmg.py NostalgiaStudio
 
 .PHONY: generate-studio-rsrc
 generate-studio-rsrc:

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/claw/write.hpp

@@ -39,7 +39,7 @@ struct TypeInfoCatcher {
 	}
 
 	constexpr Error field(...) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	static constexpr auto opType() {

deps/ox/src/ox/event/signal.hpp

@@ -218,7 +218,7 @@ Error Signal<Args...>::emitCheckError(Args... args) const noexcept {
 		for (auto &f : m_slots) {
 			f->call(args...);
 		}
-		return ox::Error(0);
+		return {};
 	} catch (const ox::Exception &ex) {
 		return ox::Error(ex.errCode, ex.msg, ex.src);
 	}
@@ -410,7 +410,7 @@ Error Signal<Error(Args...)>::emitCheckError(Args... args) const noexcept {
 	for (auto &f : m_slots) {
 		OX_RETURN_ERROR(f->call(ox::forward<Args>(args)...));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 }

deps/ox/src/ox/fs/filestore/filestoretemplate.hpp

@@ -230,7 +230,7 @@ template<typename size_t>
 Error FileStoreTemplate<size_t>::incLinks(uint64_t id) {
 	OX_REQUIRE_M(item, find(static_cast<size_t>(id)).validate());
 	++item->links;
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
@@ -240,7 +240,7 @@ Error FileStoreTemplate<size_t>::decLinks(uint64_t id) {
 	if (item->links == 0) {
 		OX_RETURN_ERROR(remove(item));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
@@ -298,7 +298,7 @@ Error FileStoreTemplate<size_t>::write(uint64_t id64, const void *data, FsSize_t
 						        dest->id.get(), dest.offset(), destData.size());
 						fsData->rootNode = dest.offset();
 						oxTracef("ox.fs.FileStoreTemplate.write", "Root inode: {}", dest->id.get());
-						return ox::Error(0);
+						return {};
 					}
 				} else {
 					oxTrace("ox.fs.FileStoreTemplate.write.fail", "Could not place item due to absence of FileStore header.");
@@ -427,7 +427,7 @@ Error FileStoreTemplate<size_t>::resize() {
 	oxTracef("ox.fs.FileStoreTemplate.resize", "resize to: {}", newSize);
 	OX_RETURN_ERROR(m_buffer->setSize(newSize));
 	oxTracef("ox.fs.FileStoreTemplate.resize", "resized to: {}", m_buffer->size());
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
@@ -479,7 +479,7 @@ Error FileStoreTemplate<size_t>::walk(Error(*cb)(uint8_t, uint64_t, uint64_t)) {
 	for (auto i = m_buffer->iterator(); i.valid(); i.next()) {
 		OX_RETURN_ERROR(cb(i->fileType, i.ptr().offset(), i.ptr().end()));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
@@ -503,7 +503,7 @@ Error FileStoreTemplate<size_t>::compact() {
 	return m_buffer->compact([this, &isFirstItem](uint64_t oldAddr, ItemPtr item) -> Error {
 		if (isFirstItem) {
 			isFirstItem = false;
-			return ox::Error(0);
+			return {};
 		}
 		if (!item.valid()) {
 			return ox::Error(1);
@@ -524,7 +524,7 @@ Error FileStoreTemplate<size_t>::compact() {
 				parent->right = item;
 			}
 		}
-		return ox::Error(0);
+		return {};
 	});
 }
 
@@ -552,7 +552,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr item) {
 		item->left = root->left;
 		item->right = root->right;
 		oxTracef("ox.fs.FileStoreTemplate.placeItem", "Overwrote Root Item: {}", item->id.get());
-		return ox::Error(0);
+		return {};
 	} else {
 		return placeItem(root, item);
 	}
@@ -573,7 +573,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr root, ItemPtr item, int depth
 				item->right = right->right;
 			}
 			oxTracef("ox.fs.FileStoreTemplate.placeItem", "Placed Item: {}", item->id.get());
-			return ox::Error(0);
+			return {};
 		} else {
 			return placeItem(right, item, depth + 1);
 		}
@@ -586,7 +586,7 @@ Error FileStoreTemplate<size_t>::placeItem(ItemPtr root, ItemPtr item, int depth
 				item->right = left->right;
 			}
 			oxTracef("ox.fs.FileStoreTemplate.placeItem", "Placed Item: {}", item->id.get());
-			return ox::Error(0);
+			return {};
 		} else {
 			return placeItem(left, item, depth + 1);
 		}
@@ -624,7 +624,7 @@ Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr item) {
 		} else {
 			fsData->rootNode = 0;
 		}
-		return ox::Error(0);
+		return {};
 	} else {
 		return unplaceItem(root, item);
 	}
@@ -661,7 +661,7 @@ Error FileStoreTemplate<size_t>::unplaceItem(ItemPtr root, ItemPtr item, int dep
 	if (item->left) {
 		OX_RETURN_ERROR(placeItem(m_buffer->ptr(item->left)));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t>
@@ -669,7 +669,7 @@ Error FileStoreTemplate<size_t>::remove(ItemPtr item) {
 	if (item.valid()) {
 		OX_RETURN_ERROR(unplaceItem(item));
 		OX_RETURN_ERROR(m_buffer->free(item));
-		return ox::Error(0);
+		return {};
 	}
 	return ox::Error(1);
 }

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

@@ -329,7 +329,7 @@ Error FileSystemTemplate<FileStore, Directory>::format(void *buff, uint64_t buff
 		return ox::Error(1);
 	}
 
-	return ox::Error(0);
+	return {};
 }
 
 template<typename FileStore, typename Directory>
@@ -346,7 +346,7 @@ Error FileSystemTemplate<FileStore, Directory>::move(StringViewCR src, StringVie
 	OX_REQUIRE_M(inode, rootDir.find(src));
 	OX_RETURN_ERROR(rootDir.write(dest, inode));
 	OX_RETURN_ERROR(rootDir.remove(src));
-	return ox::Error(0);
+	return {};
 }
 
 template<typename FileStore, typename Directory>
@@ -407,7 +407,7 @@ Error FileSystemTemplate<FileStore, Directory>::removePath(StringViewCR path, bo
 		oxTrace("FileSystemTemplate.remove.fail", "Tried to remove directory without recursive setting.");
 		return ox::Error(1);
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename FileStore, typename Directory>
@@ -424,7 +424,7 @@ Result<Vector<String>> FileSystemTemplate<FileStore, Directory>::ls(StringViewCR
 	Vector<String> out;
 	OX_RETURN_ERROR(ls(path, [&out](StringViewCR name, typename FileStore::InodeId_t) {
 		out.emplace_back(name);
-		return ox::Error(0);
+		return ox::Error{};
 	}));
 	return out;
 }

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

@@ -60,7 +60,7 @@ Error PassThroughFS::move(StringViewCR src, StringViewCR dest) noexcept {
 	if (ec.value()) {
 		return ox::Error(1);
 	}
-	return ox::Error(0);
+	return {};
 }
 
 Result<Vector<String>> PassThroughFS::ls(StringViewCR dir) const noexcept {
@@ -148,7 +148,7 @@ Error PassThroughFS::readFilePath(StringViewCR path, void *buffer, std::size_t b
 		oxTracef("ox.fs.PassThroughFS.read.error", "Read of {} failed: {}", path, f.what());
 		return ox::Error(2);
 	}
-	return ox::Error(0);
+	return {};
 }
 
 Error PassThroughFS::readFileInode(uint64_t, void*, std::size_t) noexcept {
@@ -197,7 +197,7 @@ Error PassThroughFS::writeFilePath(StringViewCR path, const void *buffer, uint64
 		oxTracef("ox.fs.PassThroughFS.read.error", "Write of {} failed: {}", path, f.what());
 		return ox::Error(1);
 	}
-	return ox::Error(0);
+	return {};
 }
 
 Error PassThroughFS::writeFileInode(uint64_t, const void*, uint64_t, FileType) noexcept {

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

@@ -99,7 +99,7 @@ Error PassThroughFS::ls(StringViewCR dir, F cb) const noexcept {
 	for (auto &p : di) {
 		OX_RETURN_ERROR(cb(p.path().filename().c_str(), 0));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 }

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

@@ -36,7 +36,7 @@ Error PathIterator::dirPath(char *out, std::size_t outSize) {
 	if (idx >= 0 && size < outSize) {
 		ox::memcpy(out, m_path, size);
 		out[size] = 0;
-		return ox::Error(0);
+		return {};
 	} else {
 		return ox::Error(1);
 	}
@@ -85,7 +85,7 @@ Error PathIterator::next(StringView &fileName) {
 	std::size_t size = 0;
 	auto retval = ox::Error(1);
 	if (m_iterator < m_maxSize && ox::strlen(&m_path[m_iterator])) {
-		retval = ox::Error(0);
+		retval = {};
 		if (m_path[m_iterator] == '/') {
 			m_iterator++;
 		}
@@ -118,7 +118,7 @@ Result<std::size_t> PathIterator::nextSize() const {
 	auto retval = ox::Error(1);
 	auto it = m_iterator;
 	if (it < m_maxSize && ox::strlen(&m_path[it])) {
-		retval = ox::Error(0);
+		retval = {};
 		if (m_path[it] == '/') {
 			it++;
 		}

deps/ox/src/ox/fs/ptrarith/nodebuffer.hpp

@@ -354,7 +354,7 @@ Error NodeBuffer<size_t, Item>::free(ItemPtr item) noexcept {
 		}
 	}
 	m_header.bytesUsed -= item.size();
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t, typename Item>
@@ -370,7 +370,7 @@ Error NodeBuffer<size_t, Item>::setSize(std::size_t size) noexcept {
 		m_header.size = static_cast<size_t>(size);
 		auto data = reinterpret_cast<uint8_t*>(this) + end;
 		ox::memset(data, 0, size - end);
-		return ox::Error(0);
+		return {};
 	}
 }
 
@@ -422,7 +422,7 @@ Error NodeBuffer<size_t, Item>::compact(F cb) noexcept {
 		src = ptr(dest->next);
 		dest = uninitializedPtr(dest.offset() + dest->fullSize());
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename size_t, typename Item>

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

@@ -48,7 +48,7 @@ static ox::Error runLs(ox::FileSystem *fs, ox::Span<const char*> args) noexcept
 	for (const auto &file : files) {
 		oxOutf("{}\n", file);
 	}
-	return ox::Error(0);
+	return {};
 }
 
 static ox::Error runRead(ox::FileSystem *fs, ox::Span<const char*> args) noexcept {
@@ -60,7 +60,7 @@ static ox::Error runRead(ox::FileSystem *fs, ox::Span<const char*> args) noexcep
 	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);
+	return {};
 }
 
 static ox::Error run(int argc, const char **argv) noexcept {

deps/ox/src/ox/mc/read.hpp

@@ -197,7 +197,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, bool *val) n
 		OX_RETURN_ERROR(result);
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 // array handler
@@ -256,7 +256,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, HashMap<Stri
 		}
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -330,7 +330,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, BasicString<
 		}
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -370,7 +370,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char
 		data[size] = 0;
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -388,7 +388,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char
 		data[size] = 0;
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -416,7 +416,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::fieldCString(const char*, char
 		}
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -464,7 +464,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::readInteger(I *val) noexcept {
 		}
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>
@@ -487,7 +487,7 @@ constexpr Error MetalClawReaderTemplate<Reader>::field(const char*, CB cb) noexc
 		}
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Reader_c Reader>

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

@@ -122,7 +122,7 @@ class MetalClawWriter {
 			}
 			OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 			++m_field;
-			return ox::Error(0);
+			return {};
 		}
 
 };
@@ -184,7 +184,7 @@ constexpr Error MetalClawWriter<Writer>::field(const char*, const bool *val) noe
 		OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), *val));
 	}
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>
@@ -201,7 +201,7 @@ constexpr Error MetalClawWriter<Writer>::field(const char*, const BasicString<Sm
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>
@@ -229,7 +229,7 @@ constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *c
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>
@@ -255,7 +255,7 @@ constexpr Error MetalClawWriter<Writer>::fieldCString(const char*, const char *v
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>
@@ -319,7 +319,7 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>
@@ -356,7 +356,7 @@ constexpr Error MetalClawWriter<Writer>::field(const char*, const HashMap<String
 	}
 	OX_RETURN_ERROR(m_fieldPresence.set(static_cast<std::size_t>(m_field), fieldSet));
 	++m_field;
-	return ox::Error(0);
+	return {};
 }
 
 template<Writer_c Writer>

deps/ox/src/ox/model/def.hpp

@@ -13,7 +13,7 @@
 // oxModelFwdDecl is necessary because Apple-Clang is broken...
 #define OX_MODEL_FWD_DECL(modelName) constexpr ox::Error model(auto *io, ox::CommonPtrWith<modelName> auto *o) noexcept
 #define OX_MODEL_BEGIN(modelName) constexpr ox::Error model(auto *io, [[maybe_unused]] ox::CommonPtrWith<modelName> auto *o) noexcept { OX_RETURN_ERROR(io->template setTypeInfo<modelName>());
-#define OX_MODEL_END() return ox::Error(0); }
+#define OX_MODEL_END() return {}; }
 #define OX_MODEL_FIELD(fieldName) OX_RETURN_ERROR(io->field(#fieldName, &o->fieldName));
 #define OX_MODEL_FIELD_RENAME(objFieldName, serFieldName) OX_RETURN_ERROR(io->field(#serFieldName, &o->objFieldName));
 #define OX_MODEL_FRIEND(modelName) friend constexpr ox::Error model(auto *io, ox::CommonPtrWith<modelName> auto *o) noexcept

deps/ox/src/ox/model/desctypes.hpp

@@ -244,7 +244,7 @@ constexpr Error model(TypeDescReader<T> *io, CommonPtrWith<DescriptorField> auto
 	// defaultValue is unused now, but placeholder for backwards compatibility
 	int defaultValue = 0;
 	oxReturnError(io->field("defaultValue", &defaultValue));
-	return ox::Error(0);
+	return {};
 }
 #endif
 

deps/ox/src/ox/model/descwrite.hpp

@@ -205,7 +205,7 @@ constexpr Error TypeDescWriter::field(StringViewCR name, T const*, std::size_t,
 		const auto t = type(p);
 		oxAssert(t != nullptr, "field(const char *name, T *val, std::size_t): Type not found or generated");
 		m_type->fieldList.emplace_back(t, String(name), detail::indirectionLevels_v<T> + 1, subscriptStack, buildTypeId(*t));
-		return ox::Error(0);
+		return {};
 	}
 	return ox::Error(1);
 }
@@ -220,7 +220,7 @@ constexpr Error TypeDescWriter::field(StringViewCR name, T const*, std::size_t)
 		auto const lvls = detail::indirectionLevels_v<T> + 1;
 		SubscriptStack subscriptStack{lvls};
 		m_type->fieldList.emplace_back(t, String(name), lvls, subscriptStack, buildTypeId(*t));
-		return ox::Error(0);
+		return {};
 	}
 	return ox::Error(1);
 }
@@ -231,7 +231,7 @@ constexpr Error TypeDescWriter::field(StringViewCR name, UnionView<T, force> val
 		const auto t = type(val);
 		oxAssert(t != nullptr, "field(const char *name, T val): Type not found or generated");
 		m_type->fieldList.emplace_back(t, String(name), 0, SubscriptStack{}, ox::String(t->typeName));
-		return ox::Error(0);
+		return {};
 	}
 	return ox::Error(1);
 }

deps/ox/src/ox/model/fieldcounter.hpp

@@ -31,25 +31,25 @@ class FieldCounter {
 		template<typename U>
 		constexpr ox::Error field(StringViewCR, U) noexcept {
 			++fields;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename U>
 		constexpr ox::Error field(StringViewCR, U, std::size_t) noexcept {
 			++fields;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename U, typename Handler>
 		constexpr Error field(StringViewCR, Handler) {
 			++fields;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename ...Args>
 		constexpr Error fieldCString(Args&&...) noexcept {
 			++fields;
-			return ox::Error(0);
+			return {};
 		}
 
 		static constexpr auto opType() noexcept {

deps/ox/src/ox/model/modelops.hpp

@@ -56,19 +56,19 @@ class MemberList {
 		template<typename T>
 		constexpr Error field(const char*, T *v) noexcept {
 			vars[m_i++] = static_cast<void*>(v);
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename T>
 		constexpr Error field(const char*, T *v, int) noexcept {
 			vars[m_i++] = static_cast<void*>(v);
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename U, bool force = false>
 		constexpr Error field(const char*, UnionView<U, force> u) noexcept {
 			vars[m_i++] = static_cast<void*>(u.get());
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename T>
@@ -107,7 +107,7 @@ class Copier {
 				auto &dst = *cbit_cast<FT*>(m_dst->vars[m_i]);
 				dst = src;
 				++m_i;
-				return ox::Error(0);
+				return {};
 			}
 		}
 
@@ -119,7 +119,7 @@ class Copier {
 				dst = src;
 			}
 			++m_i;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename U, bool force = false>
@@ -128,7 +128,7 @@ class Copier {
 			auto &src = *u.get();
 			dst = src;
 			++m_i;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename T = void>
@@ -168,7 +168,7 @@ class Mover {
 				dst = std::move(src);
 				src = FT{};
 				++m_i;
-				return ox::Error(0);
+				return {};
 			}
 		}
 
@@ -181,7 +181,7 @@ class Mover {
 				src = FT{};
 			}
 			++m_i;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename U, bool force = false>
@@ -190,7 +190,7 @@ class Mover {
 			auto &src = *u.get();
 			dst = std::move(src);
 			++m_i;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename T = void>
@@ -228,7 +228,7 @@ class Equals {
 			const auto &dst = std::bit_cast<FT>(*m_other->vars[m_i]);
 			++m_i;
 			if (dst == src) {
-				return ox::Error(0);
+				return {};
 			} else {
 				this->value = false;
 				return ox::Error(1);
@@ -246,7 +246,7 @@ class Equals {
 				}
 			}
 			++m_i;
-			return ox::Error(0);
+			return {};
 		}
 
 		template<typename U, bool force = false>
@@ -255,7 +255,7 @@ class Equals {
 			const auto &src = *u.get();
 			++m_i;
 			if (dst == src) {
-				return ox::Error(0);
+				return {};
 			} else {
 				this->value = false;
 				return ox::Error(1);

deps/ox/src/ox/model/modelvalue.cpp

@@ -18,6 +18,6 @@ static_assert([]() -> ox::Error {
 	}
 	//oxReturnError(v.set<int32_t>(5));
 	return {};
-}() == ox::Error(0));
+}() == ox::Error{});
 
 }

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

@@ -972,7 +972,7 @@ constexpr Error model(auto *h, CommonPtrWith<ModelObject> auto *obj) noexcept {
 	for (auto &f : obj->m_fieldsOrder) {
 		OX_RETURN_ERROR(h->field(f->name.c_str(), &f->value));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept {
@@ -981,7 +981,7 @@ constexpr Error model(auto *h, CommonPtrWith<ModelUnion> auto *obj) noexcept {
 	for (auto &f : obj->m_fieldsOrder) {
 		OX_RETURN_ERROR(h->field(f->name.c_str(), &f->value));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 constexpr ModelValue::ModelValue(const ModelValue &other) noexcept {
@@ -1129,7 +1129,7 @@ constexpr Error ModelValue::setType(
 		OX_RETURN_ERROR(m_data.uni->setType(type));
 	}
 	oxAssert(m_type != Type::Undefined, "No type set");
-	return ox::Error(0);
+	return {};
 }
 
 template<typename T>
@@ -1184,7 +1184,7 @@ constexpr Error ModelValue::set(const T &v) noexcept {
 		safeDelete(&value);
 	}
 	value = v;
-	return ox::Error(0);
+	return {};
 }
 
 template<typename T>
@@ -1199,7 +1199,7 @@ constexpr Error ModelValue::set(T &&v) noexcept {
 		safeDelete(&value);
 	}
 	value = std::move(v);
-	return ox::Error(0);
+	return {};
 }
 
 constexpr ModelValue &ModelValue::operator=(ModelValue &other) noexcept {

deps/ox/src/ox/model/typenamecatcher.hpp

@@ -38,17 +38,17 @@ struct TypeNameCatcher {
 
 	template<typename T>
 	constexpr Error field(const char*, T*, std::size_t) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	template<typename T>
 	constexpr Error field(const char*, T) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	template<typename ...Args>
 	constexpr Error fieldCString(Args&&...) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	static constexpr auto opType() noexcept {
@@ -77,17 +77,17 @@ struct TypeInfoCatcher {
 
 	template<typename T>
 	constexpr Error field(const char*, T*, std::size_t) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	template<typename T>
 	constexpr Error field(const char*, T) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	template<typename T>
 	constexpr Error fieldCString(const char*, T) noexcept {
-		return ox::Error(0);
+		return {};
 	}
 
 	static constexpr auto opType() noexcept {

deps/ox/src/ox/model/walk.hpp

@@ -127,7 +127,7 @@ static constexpr Error parseField(const DescriptorField &field, Reader *rdr, Dat
 		}
 	}
 	walker->popNamePath();
-	return ox::Error(0);
+	return {};
 }
 
 template<typename Reader, typename FH>
@@ -141,7 +141,7 @@ constexpr Error model(Reader *rdr, DataWalker<Reader, FH> *walker) noexcept {
 	for (const auto &field : fields) {
 		OX_RETURN_ERROR(parseField(field, rdr, walker));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename Reader, typename Handler>

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

@@ -37,7 +37,7 @@ OrganicClawReader::OrganicClawReader(Json::Value json, int unionIdx) noexcept:
 }
 
 Error OrganicClawReader::field(const char *key, bool *val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty()) {
@@ -53,7 +53,7 @@ Error OrganicClawReader::field(const char *key, bool *val) noexcept {
 }
 
 Error OrganicClawReader::fieldCString(const char *key, char *val, std::size_t buffLen) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	if (targetValid()) {
@@ -81,7 +81,7 @@ Error OrganicClawReader::fieldCString(const char *key, char *val, std::size_t bu
 }
 
 Error OrganicClawReader::fieldCString(const char *key, char **val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	auto &data = *val;
@@ -106,7 +106,7 @@ Error OrganicClawReader::fieldCString(const char *key, char **val) noexcept {
 }
 
 Error OrganicClawReader::fieldCString(const char *key, char **val, std::size_t buffLen) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	const char *begin = nullptr, *end = nullptr;
 	const auto &jv = value(key);
 	if (targetValid()) {

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

@@ -137,7 +137,7 @@ class OrganicClawReader {
 
 template<typename T>
 Error OrganicClawReader::field(const char *key, T *val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	try {
 		if constexpr (is_integer_v<T>) {
 			if (targetValid()) {
@@ -190,7 +190,7 @@ Error OrganicClawReader::field(const char *key, T *val) noexcept {
 
 template<typename U, bool force>
 Error OrganicClawReader::field(const char *key, UnionView<U, force> val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty() || jv.isObject()) {
@@ -207,7 +207,7 @@ Error OrganicClawReader::field(const char *key, UnionView<U, force> val) noexcep
 
 template<std::size_t L>
 Error OrganicClawReader::field(const char *key, BasicString<L> *val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty()) {
@@ -224,7 +224,7 @@ Error OrganicClawReader::field(const char *key, BasicString<L> *val) noexcept {
 
 template<std::size_t L>
 Error OrganicClawReader::field(const char *key, IString<L> *val) noexcept {
-	auto err = ox::Error(0);
+	ox::Error err{};
 	if (targetValid()) {
 		const auto &jv = value(key);
 		if (jv.empty()) {
@@ -257,7 +257,7 @@ OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 		OX_RETURN_ERROR(handler.field("", &val[i]));
 OX_ALLOW_UNSAFE_BUFFERS_END
 	}
-	return ox::Error(0);
+	return {};
 }
 
 template<typename T>
@@ -274,7 +274,7 @@ Error OrganicClawReader::field(const char *key, HashMap<String, T> *val) noexcep
 		const auto k = keys[i].c_str();
 		OX_RETURN_ERROR(handler.field(k, &val->operator[](k)));
 	}
-	return ox::Error(0);
+	return {};
 }
 
 Error readOC(BufferView buff, auto &val) noexcept {

deps/ox/src/ox/oc/write.cpp

@@ -23,7 +23,7 @@ Error OrganicClawWriter::fieldCString(const char *key, const char *const*val, in
 		value(key) = *val;
 	}
 	++m_fieldIt;
-	return ox::Error(0);
+	return {};
 }
 
 Error OrganicClawWriter::fieldCString(const char *key, const char *const*val) noexcept {

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

@@ -46,7 +46,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const int16_t *val) noexcept {
@@ -54,7 +54,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const int32_t *val) noexcept {
@@ -62,7 +62,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const int64_t *val) noexcept {
@@ -70,7 +70,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 
@@ -79,7 +79,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const uint16_t *val) noexcept {
@@ -87,7 +87,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const uint32_t *val) noexcept {
@@ -95,7 +95,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(const char *key, const uint64_t *val) noexcept {
@@ -103,7 +103,7 @@ class OrganicClawWriter {
 				value(key) = *val;
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error field(char const*key, bool const*val) noexcept {
@@ -151,7 +151,7 @@ class OrganicClawWriter {
 				value(key) = val->c_str();
 			}
 			++m_fieldIt;
-			return ox::Error(0);
+			return {};
 		}
 
 		Error fieldCString(const char*, const char *const*val, int len) noexcept;
@@ -211,7 +211,7 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 		value(key) = w.m_json;
 	}
 	++m_fieldIt;
-	return ox::Error(0);
+	return {};
 }
 
 template<typename T>
@@ -237,7 +237,7 @@ Error OrganicClawWriter::field(const char *key, const T *val) noexcept {
 		}
 	}
 	++m_fieldIt;
-	return ox::Error(0);
+	return {};
 }
 
 template<typename U, bool force>
@@ -251,7 +251,7 @@ Error OrganicClawWriter::field(const char *key, UnionView<U, force> val) noexcep
 		}
 	}
 	++m_fieldIt;
-	return ox::Error(0);
+	return {};
 }
 
 Result<ox::Buffer> writeOC(const auto &val) noexcept {

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

@@ -146,12 +146,7 @@ class Span {
 			return iterator<const T&, const T*, true>(m_items, MaxValue<size_type>, m_size);
 		}
 
-		constexpr T &operator[](std::size_t i) noexcept {
-			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
-			return m_items[i];
-		}
-
-		constexpr T const&operator[](std::size_t i) const noexcept {
+		constexpr T &operator[](std::size_t i) const noexcept {
 			boundsCheck(__FILE__, __LINE__, i, size(), "Span access overflow");
 			return m_items[i];
 		}

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

@@ -182,7 +182,7 @@ class BasicString {
 			// make sure last element is a null terminator
 			m_buff[currentLen + strLen] = 0;
 			// this can't fail, but it returns an Error to match BString::append
-			return ox::Error(0);
+			return {};
 		}
 
 		constexpr Error append(ox::StringView sv) noexcept {

deps/ox/src/ox/std/stringparam.hpp

@@ -20,6 +20,8 @@ class StringParam {
 		constexpr StringParam(StringParam &&o) noexcept: m_value{std::move(o.m_value)} {}
 		constexpr StringParam(char const*value) noexcept: m_value{value} {}
 		constexpr StringParam(detail::BaseStringView const&value) noexcept: m_value{value} {}
+		template<size_t sz>
+		constexpr StringParam(ox::IString<sz> const&value) noexcept: m_value{value} {}
 		constexpr StringParam(ox::String const&value) noexcept: m_value{value} {}
 		constexpr StringParam(ox::String &&value) noexcept: m_value{std::move(value)} {}
 		constexpr operator ox::String() && noexcept { return std::move(m_value); }

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

@@ -60,7 +60,7 @@ class StringView: public detail::BaseStringView {
 
 };
 
-using StringViewCR = const StringView&;
+using StringViewCR = StringView const&;
 
 constexpr auto operator==(StringViewCR s1, StringViewCR s2) noexcept {
 	if (s2.len() != s1.len()) {
@@ -89,7 +89,7 @@ constexpr auto operator<=>(StringViewCR s1, StringViewCR s2) noexcept {
 	}
 }
 
-constexpr auto write(Writer_c auto &writer, ox::StringViewCR sv) noexcept {
+constexpr auto write(Writer_c auto &writer, StringViewCR sv) noexcept {
 	return writer.write(sv.data(), sv.bytes());
 }
 
@@ -100,7 +100,7 @@ constexpr auto toStdStringView(StringViewCR sv) noexcept {
 #endif
 
 
-constexpr ox::Result<int> strToInt(ox::StringViewCR str) noexcept {
+constexpr ox::Result<int> strToInt(StringViewCR str) noexcept {
 	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 	int total = 0;
 	int multiplier = 1;

deps/ox/src/ox/std/utility.hpp

@@ -32,9 +32,9 @@ constexpr bool cmp_equal(T const t, U const u) noexcept {
 	if constexpr(ox::is_signed_v<T> == ox::is_signed_v<U>) {
 		return t == u;
 	} else if constexpr(ox::is_signed_v<T>) {
-		return ox::Signed<T>{t} == u;
+		return t >= 0 && static_cast<ox::Unsigned<T>>(t) == u;
 	} else {
-		return t == ox::Signed<U>{u};
+		return u >= 0 && t == static_cast<ox::Unsigned<U>>(u);
 	}
 }
 
@@ -43,9 +43,9 @@ constexpr bool cmp_less(T const t, U const u) noexcept {
 	if constexpr(ox::is_signed_v<T> == ox::is_signed_v<U>) {
 		return t < u;
 	} else if constexpr(ox::is_signed_v<T>) {
-		return ox::Signed<T>{t} < u;
+		return t < 0 || static_cast<ox::Unsigned<T>>(t) < u;
 	} else {
-		return t < ox::Signed<U>{u};
+		return u >= 0 && t < static_cast<ox::Unsigned<U>>(u);
 	}
 }
 
@@ -69,6 +69,13 @@ constexpr bool cmp_greater_equal(T const t, U const u) noexcept {
 	return !std::cmp_less(t, u);
 }
 
+static_assert(cmp_less(-1, 5u));
+static_assert(!cmp_less(5u, -1));
+static_assert(cmp_equal(5u, 5));
+static_assert(cmp_equal(5, 5u));
+static_assert(!cmp_equal(-5, 5u));
+static_assert(!cmp_equal(4u, 5u));
+
 }
 #endif
 

deps/ox/src/ox/std/vector.hpp

@@ -311,7 +311,7 @@ class Vector: detail::VectorAllocator<T, Allocator, SmallVectorSize> {
 		 */
 		constexpr Error unordered_erase(std::size_t pos) noexcept(useNoexcept);
 
-		constexpr Error remove(T const &val);
+		constexpr Error remove(MaybeView_t<T> const &val);
 
 		constexpr void reserve(std::size_t cap) noexcept(useNoexcept);
 
@@ -658,11 +658,11 @@ constexpr Error Vector<T, SmallVectorSize, Allocator>::unordered_erase(std::size
 	--m_size;
 	m_items[pos] = std::move(m_items[m_size]);
 	m_items[m_size].~T();
-	return ox::Error(0);
+	return {};
 }
 
 template<typename T, std::size_t SmallVectorSize, typename Allocator>
-constexpr ox::Error Vector<T, SmallVectorSize, Allocator>::remove(T const &val) {
+constexpr ox::Error Vector<T, SmallVectorSize, Allocator>::remove(MaybeView_t<T> const &val) {
 	for (size_t i{}; auto const &v : *this) {
 		if (v == val) {
 			return erase(i).error;

deps/teagba/src/cstartup.cpp

@@ -2,6 +2,8 @@
  * Copyright 2016 - 2024 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
+#ifdef __GNUC__
+
 #include <ox/std/heapmgr.hpp>
 
 #include <teagba/bios.hpp>
@@ -58,3 +60,5 @@ int c_start() {
 }
 
 }
+
+#endif

release-notes.md

@@ -1,19 +1,30 @@
+# d2025.06.0
+
+* PaletteEditor: Add RGB key shortcuts for focusing color channels
+
+# 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
 * 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
+* 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.
+* Mac: Menu bar shortcuts now say Cmd instead of Ctrl.
+* TileSheetEditor: Fix selection clearing to work when clicking outside image.
 * 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
+* TileSheetEditor: Fix Insert Tile functionality, which was completely broken
+* PaletteEditor: Fix color number key range. 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

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

@@ -8,16 +8,12 @@
 
 #include <turbine/context.hpp>
 
-#include "initparams.hpp"
-
 namespace nostalgia::gfx {
 
 class Context;
 
 void safeDelete(Context *ctx) noexcept;
 
-ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params = {}) noexcept;
-
 keel::Context &keelCtx(Context &ctx) noexcept;
 
 turbine::Context &turbineCtx(Context &ctx) noexcept;

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

@@ -1,14 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include "color.hpp"
-#include "context.hpp"
-#include "gfx.hpp"
-#include "initparams.hpp"
-#include "keelmodule.hpp"
-#include "palette.hpp"
-#include "ptidxconv.hpp"
-#include "tilesheet.hpp"

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

@@ -9,8 +9,11 @@
 #include <ox/std/types.hpp>
 #include <ox/model/def.hpp>
 
+#include "color.hpp"
 #include "context.hpp"
+#include "keelmodule.hpp"
 #include "palette.hpp"
+#include "ptidxconv.hpp"
 #include "tilesheet.hpp"
 
 namespace nostalgia::gfx {
@@ -102,6 +105,14 @@ OX_MODEL_BEGIN(TileSheetSet)
 	OX_MODEL_FIELD(entries)
 OX_MODEL_END()
 
+struct InitParams {
+	bool glInstallDrawer = true;
+	uint_t glSpriteCount = 128;
+	uint_t glBlocksPerSprite = 64;
+};
+
+ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params = {}) noexcept;
+
 [[nodiscard]]
 int tileColumns(Context&) noexcept;
 
@@ -223,7 +234,7 @@ bool bgStatus(Context &ctx, unsigned bg) noexcept;
 
 void setBgStatus(Context &ctx, unsigned bg, bool status) noexcept;
 
-void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbb) noexcept;
+void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbbIdx) noexcept;
 
 void setBgPriority(Context &ctx, uint_t bgIdx, uint_t priority) noexcept;
 
@@ -231,10 +242,10 @@ void hideSprite(Context &ctx, unsigned) noexcept;
 
 void showSprite(Context &ctx, unsigned) noexcept;
 
-void setSprite(Context &c, uint_t idx, Sprite const&s) noexcept;
+void setSprite(Context &ctx, uint_t idx, Sprite const&sprite) noexcept;
 
 [[nodiscard]]
-uint_t spriteCount(Context &ctx) noexcept;
+uint_t spriteCount(Context const &ctx) noexcept;
 
 ox::Error initConsole(Context &ctx) noexcept;
 

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

@@ -1,17 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include <ox/std/types.hpp>
-
-namespace nostalgia::gfx {
-
-struct InitParams {
-	bool glInstallDrawer = true;
-	uint_t glSpriteCount = 128;
-	uint_t glBlocksPerSprite = 64;
-};
-
-}

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

@@ -8,6 +8,6 @@
 
 namespace nostalgia::gfx {
 
-const keel::Module *keelModule() noexcept;
+keel::Module const *keelModule() noexcept;
 
 }

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

@@ -8,6 +8,6 @@
 
 namespace nostalgia::gfx {
 
-const studio::Module *studioModule() noexcept;
+studio::Module const *studioModule() noexcept;
 
 }

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

@@ -336,7 +336,7 @@ struct TileSheetV5 {
 [[nodiscard]]
 constexpr bool valid(TileSheetV5::SubSheet const&ss) noexcept {
 	if (ss.subsheets.empty()) {
-		return static_cast<size_t>(ss.columns * ss.rows * PixelsPerTile) == ss.pixels.size();
+		return std::cmp_equal(ss.columns * ss.rows * PixelsPerTile, ss.pixels.size());
 	} else {
 		return ss.pixels.empty() && ox::all_of(ss.subsheets.begin(), ss.subsheets.end(),
 				[](TileSheetV5::SubSheet const&s) {
@@ -426,6 +426,8 @@ ox::Error resizeSubsheet(TileSheet::SubSheet &ss, ox::Size const&sz) noexcept;
 [[nodiscard]]
 TileSheet::SubSheetIdx validateSubSheetIdx(TileSheet const&ts, TileSheet::SubSheetIdx idx) noexcept;
 
+ox::Result<TileSheet::SubSheetIdx> getSubSheetIdx(TileSheet const &ts, SubSheetId pId) noexcept;
+
 [[nodiscard]]
 TileSheet::SubSheet &getSubSheet(
 		ox::SpanView<uint32_t> const&idx,

src/nostalgia/modules/gfx/src/CMakeLists.txt

@@ -4,11 +4,6 @@ add_library(
 		tilesheet.cpp
 )
 
-add_subdirectory(gba)
-if(NOT BUILDCORE_TARGET STREQUAL "gba")
-	add_subdirectory(opengl)
-endif()
-
 target_include_directories(
 	NostalgiaGfx PUBLIC
 		../include
@@ -31,3 +26,38 @@ install(
 		LIBRARY DESTINATION lib
 		ARCHIVE DESTINATION lib
 )
+
+# OpenGL
+
+if(NOT BUILDCORE_TARGET STREQUAL "gba")
+	target_sources(
+		NostalgiaGfx PRIVATE
+			gfx-opengl.cpp
+	)
+	target_link_libraries(
+		NostalgiaGfx PUBLIC
+			GlUtils
+	)
+endif()
+
+# GBA
+
+add_library(
+	NostalgiaGfx-GBA OBJECT
+		gfx-gba.cpp
+)
+target_include_directories(
+	NostalgiaGfx-GBA PUBLIC
+		../include
+)
+target_link_libraries(
+	NostalgiaGfx-GBA PUBLIC
+		TeaGBA
+		Keel
+		Turbine
+)
+
+if(BUILDCORE_TARGET STREQUAL "gba")
+	set_source_files_properties(gfx-gba.cpp PROPERTIES COMPILE_FLAGS -marm)
+	target_link_libraries(NostalgiaGfx PUBLIC NostalgiaGfx-GBA)
+endif()

src/nostalgia/modules/gfx/src/gba/CMakeLists.txt

@@ -1,21 +0,0 @@
-add_library(
-	NostalgiaGfx-GBA OBJECT
-		context.cpp
-		gfx.cpp
-		panic.cpp
-)
-target_include_directories(
-	NostalgiaGfx-GBA PUBLIC
-		../../include
-)
-target_link_libraries(
-	NostalgiaGfx-GBA PUBLIC
-		TeaGBA
-		Keel
-		Turbine
-)
-
-if(BUILDCORE_TARGET STREQUAL "gba")
-	set_source_files_properties(gfx.cpp PROPERTIES COMPILE_FLAGS -marm)
-	target_link_libraries(NostalgiaGfx PUBLIC NostalgiaGfx-GBA)
-endif()

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

@@ -1,36 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#include <turbine/turbine.hpp>
-
-#include <nostalgia/gfx/gfx.hpp>
-
-#include "context.hpp"
-
-namespace nostalgia::gfx {
-
-void safeDelete(Context *ctx) noexcept {
-	delete ctx;
-}
-
-Context::Context(turbine::Context &tctx) noexcept: turbineCtx(tctx) {
-}
-
-ox::Error initGfx(Context &ctx, InitParams const&) noexcept;
-
-ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params) noexcept {
-	auto ctx = ox::make_unique<Context>(tctx);
-	OX_RETURN_ERROR(initGfx(*ctx, params));
-	return ox::UPtr<Context>(std::move(ctx));
-}
-
-keel::Context &keelCtx(Context &ctx) noexcept {
-	return turbine::keelCtx(ctx.turbineCtx);
-}
-
-turbine::Context &turbineCtx(Context &ctx) noexcept {
-	return ctx.turbineCtx;
-}
-
-}

src/nostalgia/modules/gfx/src/gba/context.hpp

@@ -1,34 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include <nostalgia/gfx/context.hpp>
-
-namespace nostalgia::gfx {
-
-struct BgCbbData {
-	unsigned bpp = 4;
-};
-
-class Context {
-
-	public:
-		turbine::Context &turbineCtx;
-		ox::Array<BgCbbData, 4> cbbData;
-
-		explicit Context(turbine::Context &tctx) noexcept;
-		Context(Context &other) noexcept = delete;
-		Context(Context const&other) noexcept = delete;
-		Context(Context const&&other) noexcept = delete;
-		virtual ~Context() noexcept = default;
-
-		[[nodiscard]]
-		ox::MemFS const&rom() const noexcept {
-			return static_cast<ox::MemFS const&>(*turbine::rom(turbineCtx));
-		}
-
-};
-
-}

src/nostalgia/modules/gfx/src/gba/gfx.hpp

@@ -1,11 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include <nostalgia/gfx/context.hpp>
-
-namespace nostalgia::gfx {
-ox::Error initGfx(Context &ctx, InitParams const&) noexcept;
-}

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

@@ -1,58 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-
-#include <ox/std/def.hpp>
-#include <ox/std/realstd.hpp>
-
-#include <keel/media.hpp>
-#include <turbine/turbine.hpp>
-
-#include <teagba/addresses.hpp>
-#include <teagba/bios.hpp>
-
-#include <nostalgia/gfx/core.hpp>
-
-#include "gfx.hpp"
-
-#define HEAP_BEGIN (reinterpret_cast<char*>(MEM_EWRAM_BEGIN))
-#define HEAP_SIZE ((MEM_EWRAM_END - MEM_EWRAM_BEGIN) / 2)
-#define HEAP_END  (reinterpret_cast<char*>(MEM_EWRAM_BEGIN + HEAP_SIZE))
-
-namespace ox {
-
-using namespace nostalgia::gfx;
-
-void panic(const char *file, int line, const char *panicMsg, ox::Error const&err) noexcept {
-	// reset heap to make sure we have enough memory to allocate context data
-OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-	ox::heapmgr::initHeap(HEAP_BEGIN, HEAP_END);
-OX_ALLOW_UNSAFE_BUFFERS_END
-	auto tctx = turbine::init(keel::loadRomFs("").unwrap(), "Nostalgia").unwrap();
-	auto ctx = init(*tctx).unwrap();
-	std::ignore = initGfx(*ctx, {});
-	std::ignore = initConsole(*ctx);
-	setBgStatus(*ctx, 0, true);
-	clearBg(*ctx, 0);
-	auto const serr = ox::sfmt<ox::IString<23>>("Error code: {}", static_cast<int64_t>(err));
-	consoleWrite(*ctx, 32 + 1,  1, "SADNESS...");
-	consoleWrite(*ctx, 32 + 1,  4, "UNEXPECTED STATE:");
-	consoleWrite(*ctx, 32 + 2,  6, panicMsg);
-	if (err) {
-		consoleWrite(*ctx, 32 + 2,  8, serr);
-	}
-	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) {
-		oxErrf("\tError Message:\t{}\n", err.msg);
-	}
-	oxErrf("\tError Code:\t{}\n", static_cast<ErrorCode>(err));
-	if (err.src.file_name() != nullptr) {
-		oxErrf("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
-	}
-	abort();
-}
-
-}

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

@@ -15,15 +15,48 @@
 #include <nostalgia/gfx/gfx.hpp>
 #include <nostalgia/gfx/tilesheet.hpp>
 
-#include "context.hpp"
-
 OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 
 namespace nostalgia::gfx {
 
+struct BgCbbData {
+	unsigned bpp = 4;
+};
+
+class Context {
+
+	public:
+		turbine::Context &turbineCtx;
+		ox::Array<BgCbbData, 4> cbbData;
+
+		explicit Context(turbine::Context &tctx) noexcept: turbineCtx{tctx} {}
+		Context(Context &other) noexcept = delete;
+		Context(Context const&other) noexcept = delete;
+		Context(Context const&&other) noexcept = delete;
+		virtual ~Context() noexcept = default;
+
+		[[nodiscard]]
+		ox::MemFS const&rom() const noexcept {
+			return static_cast<ox::MemFS const&>(*turbine::rom(turbineCtx));
+		}
+
+};
+
+void safeDelete(Context *ctx) noexcept {
+	delete ctx;
+}
+
+keel::Context &keelCtx(Context &ctx) noexcept {
+	return turbine::keelCtx(ctx.turbineCtx);
+}
+
+turbine::Context &turbineCtx(Context &ctx) noexcept {
+	return ctx.turbineCtx;
+}
+
 static constexpr auto SpriteCount = 128;
 
-ox::Error initGfx(Context&, InitParams const&) noexcept {
+static ox::Error initGfx() noexcept {
 	for (auto bgCtl = &REG_BG0CTL; bgCtl <= &REG_BG3CTL; bgCtl += 2) {
 		teagba::bgSetSbb(*bgCtl, 28);
 	}
@@ -34,11 +67,17 @@ ox::Error initGfx(Context&, InitParams const&) noexcept {
 	return {};
 }
 
+ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&) noexcept {
+	auto ctx = ox::make_unique<Context>(tctx);
+	OX_RETURN_ERROR(initGfx());
+	return ctx;
+}
+
 ox::Error loadBgPalette(
 		Context&,
-		size_t palBank,
+		size_t const palBank,
 		CompactPalette const&palette,
-		size_t page) noexcept {
+		size_t const page) noexcept {
 	if (palette.pages.empty()) {
 		return {};
 	}
@@ -52,7 +91,7 @@ ox::Error loadBgPalette(
 ox::Error loadSpritePalette(
 		Context&,
 		CompactPalette const&palette,
-		size_t page) noexcept {
+		size_t const page) noexcept {
 	if (palette.pages.empty()) {
 		return {};
 	}
@@ -133,7 +172,7 @@ ox::Error loadBgTileSheet(
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		unsigned cbb,
+		unsigned const cbb,
 		CompactTileSheet const&ts,
 		ox::Optional<unsigned> const&paletteBank) noexcept {
 	auto const cnt = (ts.pixels.size() * PixelsPerTile) / (1 + (ts.bpp == 4));
@@ -184,7 +223,7 @@ static void setSpritesBpp(unsigned const bpp) noexcept {
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
 		CompactTileSheet const&ts,
-		bool loadDefaultPalette) noexcept {
+		bool const loadDefaultPalette) noexcept {
 	for (size_t i = 0; i < ts.pixels.size(); i += 2) {
 		uint16_t v = ts.pixels[i];
 		v |= static_cast<uint16_t>(ts.pixels[i + 1] << 8);
@@ -206,7 +245,8 @@ ox::Error loadSpriteTileSheet(
 	return {};
 }
 
-void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, BgTile const&tile) noexcept {
+void setBgTile(
+	Context &ctx, uint_t const bgIdx, int const column, int const row, BgTile const&tile) noexcept {
 	auto const tileIdx = static_cast<std::size_t>(row * tileColumns(ctx) + column);
 	// see Tonc 9.3
 	MEM_BG_MAP[bgIdx][tileIdx] =
@@ -216,7 +256,7 @@ void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, BgTile const&til
 			static_cast<uint16_t>(tile.palBank << 0xc);
 }
 
-void clearBg(Context &ctx, uint_t bgIdx) noexcept {
+void clearBg(Context &ctx, uint_t const bgIdx) noexcept {
 	memset(MEM_BG_MAP[bgIdx].data(), 0, static_cast<size_t>(tileRows(ctx) * tileColumns(ctx)));
 }
 
@@ -224,39 +264,39 @@ uint8_t bgStatus(Context&) noexcept {
 	return (REG_DISPCTL >> 8u) & 0b1111u;
 }
 
-void setBgStatus(Context&, uint32_t status) noexcept {
+void setBgStatus(Context&, uint32_t const status) noexcept {
 	constexpr auto BgStatus = 8;
 	REG_DISPCTL = (REG_DISPCTL & ~0b111100000000u) | status << BgStatus;
 }
 
-bool bgStatus(Context&, unsigned bg) noexcept {
+bool bgStatus(Context&, unsigned const bg) noexcept {
 	return (REG_DISPCTL >> (8 + bg)) & 1;
 }
 
-void setBgStatus(Context&, unsigned bg, bool status) noexcept {
+void setBgStatus(Context&, unsigned const bg, bool const status) noexcept {
 	constexpr auto Bg0Status = 8;
 	const auto mask = static_cast<uint32_t>(status) << (Bg0Status + bg);
 	REG_DISPCTL = REG_DISPCTL | ((REG_DISPCTL & ~mask) | mask);
 }
 
-void setBgBpp(Context&, unsigned bgIdx, unsigned bpp) noexcept {
+void setBgBpp(Context&, unsigned const bgIdx, unsigned const bpp) noexcept {
 	auto &bgCtl = regBgCtl(bgIdx);
 	teagba::bgSetBpp(bgCtl, bpp);
 }
 
-void setBgCbb(Context &ctx, unsigned bgIdx, unsigned cbb) noexcept {
+void setBgCbb(Context &ctx, unsigned const bgIdx, unsigned const cbbIdx) noexcept {
 	auto &bgCtl = regBgCtl(bgIdx);
-	const auto &cbbData = ctx.cbbData[cbb];
+	const auto &cbbData = ctx.cbbData[cbbIdx];
 	teagba::bgSetBpp(bgCtl, cbbData.bpp);
-	teagba::bgSetCbb(bgCtl, cbb);
+	teagba::bgSetCbb(bgCtl, cbbIdx);
 }
 
-void setBgPriority(Context&, uint_t bgIdx, uint_t priority) noexcept {
+void setBgPriority(Context&, uint_t const bgIdx, uint_t const priority) noexcept {
 	auto &bgCtl = regBgCtl(bgIdx);
 	bgCtl = (bgCtl & 0b1111'1111'1111'1100u) | (priority & 0b11);
 }
 
-void hideSprite(Context&, unsigned idx) noexcept {
+void hideSprite(Context&, unsigned const idx) noexcept {
 	//oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
 	teagba::addSpriteUpdate({
 		.attr0 = uint16_t{0b11 << 8},
@@ -264,7 +304,7 @@ void hideSprite(Context&, unsigned idx) noexcept {
 	});
 }
 
-void showSprite(Context&, unsigned idx) noexcept {
+void showSprite(Context&, unsigned const idx) noexcept {
 	//oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
 	teagba::addSpriteUpdate({
 		.attr0 = 0,
@@ -272,7 +312,7 @@ void showSprite(Context&, unsigned idx) noexcept {
 	});
 }
 
-void setSprite(Context&, uint_t idx, Sprite const&s) noexcept {
+void setSprite(Context&, uint_t const idx, Sprite const&s) noexcept {
 	//oxAssert(g_spriteUpdates < config::GbaSpriteBufferLen, "Sprite update buffer overflow");
 	uint16_t const eightBpp = s.bpp == 8;
 	teagba::addSpriteUpdate({
@@ -293,10 +333,49 @@ void setSprite(Context&, uint_t idx, Sprite const&s) noexcept {
 	});
 }
 
-uint_t spriteCount(Context&) noexcept {
+uint_t spriteCount(Context const&) noexcept {
 	return SpriteCount;
 }
 
 }
 
+namespace ox {
+
+void panic(const char *file, int line, const char *panicMsg, ox::Error const&err) noexcept {
+	using namespace nostalgia::gfx;
+	// reset heap to make sure we have enough memory to allocate context data
+	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+	const auto heapBegin = reinterpret_cast<char*>(MEM_EWRAM_BEGIN);
+	const auto heapSz = (MEM_EWRAM_END - MEM_EWRAM_BEGIN) / 2;
+	const auto heapEnd = reinterpret_cast<char*>(MEM_EWRAM_BEGIN + heapSz);
+	ox::heapmgr::initHeap(heapBegin, heapEnd);
+	OX_ALLOW_UNSAFE_BUFFERS_END
+		auto tctx = turbine::init(keel::loadRomFs("").unwrap(), "Nostalgia").unwrap();
+	auto ctx = init(*tctx).unwrap();
+	std::ignore = initGfx();
+	std::ignore = initConsole(*ctx);
+	setBgStatus(*ctx, 0, true);
+	clearBg(*ctx, 0);
+	auto const serr = ox::sfmt<ox::IString<23>>("Error code: {}", static_cast<int64_t>(err));
+	consoleWrite(*ctx, 32 + 1,  1, "SADNESS...");
+	consoleWrite(*ctx, 32 + 1,  4, "UNEXPECTED STATE:");
+	consoleWrite(*ctx, 32 + 2,  6, panicMsg);
+	if (err) {
+		consoleWrite(*ctx, 32 + 2,  8, serr);
+	}
+	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) {
+		oxErrf("\tError Message:\t{}\n", err.msg);
+	}
+	oxErrf("\tError Code:\t{}\n", static_cast<ErrorCode>(err));
+	if (err.src.file_name() != nullptr) {
+		oxErrf("\tError Location:\t{}:{}\n", err.src.file_name(), err.src.line());
+	}
+	abort();
+}
+
+}
+
 OX_ALLOW_UNSAFE_BUFFERS_END

src/nostalgia/modules/gfx/src/gfx-opengl.cpp

@@ -4,7 +4,6 @@
 
 #include <ox/std/array.hpp>
 #include <ox/std/fmt.hpp>
-#include <ox/std/vec.hpp>
 
 #include <keel/media.hpp>
 
@@ -15,22 +14,105 @@
 #include <nostalgia/gfx/palette.hpp>
 #include <nostalgia/gfx/tilesheet.hpp>
 
-#include "context.hpp"
-#include "gfx.hpp"
-
 namespace nostalgia::gfx {
 
+namespace renderer {
+
+constexpr uint64_t TileRows = 128;
+constexpr uint64_t TileColumns = 128;
+constexpr uint64_t TileCount = TileRows * TileColumns;
+constexpr uint64_t BgVertexVboRows = 4;
+constexpr uint64_t BgVertexVboRowLength = 7;
+constexpr uint64_t BgVertexVboLength = BgVertexVboRows * BgVertexVboRowLength;
+constexpr uint64_t BgVertexEboLength = 6;
+constexpr uint64_t SpriteVertexVboRows = 4;
+constexpr uint64_t SpriteVertexVboRowLength = 6;
+constexpr uint64_t SpriteVertexVboLength = SpriteVertexVboRows * SpriteVertexVboRowLength;
+constexpr uint64_t SpriteVertexEboLength = 6;
+
+struct CBB: glutils::BufferSet {
+	bool updated = false;
+	ox::Array<uint32_t, 32768> pixels;
+	constexpr CBB() noexcept {
+		vertices.resize(TileCount * BgVertexVboLength);
+		elements.resize(TileCount * BgVertexEboLength);
+	}
+};
+
+struct SpriteBlockset: glutils::BufferSet {
+	bool updated = false;
+	constexpr SpriteBlockset(uint64_t spriteCount, uint64_t blocksPerSprite) noexcept {
+		vertices.resize(spriteCount * SpriteVertexVboLength * blocksPerSprite);
+		elements.resize(spriteCount * SpriteVertexEboLength * blocksPerSprite);
+	}
+};
+
+struct Background {
+	float priority = 0;
+	bool enabled = false;
+	unsigned cbbIdx = 0;
+};
+
+}
+
+class Context {
+	public:
+		class Drawer final: public turbine::gl::Drawer {
+			private:
+				Context &m_ctx;
+			public:
+				explicit Drawer(Context &ctx) noexcept: m_ctx{ctx} {}
+				void draw(turbine::Context &tctx) noexcept override {
+					gl::draw(m_ctx, turbine::getScreenSize(tctx));
+				}
+		};
+
+		turbine::Context &turbineCtx;
+		glutils::GLProgram bgShader;
+		glutils::GLProgram spriteShader;
+		ox::Array<renderer::CBB, 4> cbbs;
+		renderer::SpriteBlockset spriteBlocks;
+		ox::Array<Sprite, 128> spriteStates;
+		ox::Array<GLfloat, 1024> bgPalette;
+		ox::Array<renderer::Background, 4> backgrounds;
+		Drawer drawer;
+		uint_t spriteCount = 0;
+		uint_t blocksPerSprite = 0;
+
+		explicit Context(turbine::Context &tctx, InitParams const &params) noexcept:
+			turbineCtx{tctx},
+			spriteBlocks{params.glSpriteCount, params.glBlocksPerSprite},
+			drawer{*this},
+			spriteCount{params.glSpriteCount},
+			blocksPerSprite{params.glBlocksPerSprite} {
+		}
+		Context(Context const&) = delete;
+		Context(Context&&) = delete;
+		Context &operator=(Context const&) = delete;
+		Context &operator=(Context&&) = delete;
+		~Context() noexcept {
+			turbine::gl::removeDrawer(turbineCtx, &drawer);
+		}
+};
+
+void safeDelete(Context *ctx) noexcept {
+	delete ctx;
+}
+
+keel::Context &keelCtx(Context &ctx) noexcept {
+	return turbine::keelCtx(ctx.turbineCtx);
+}
+
+turbine::Context &turbineCtx(Context &ctx) noexcept {
+	return ctx.turbineCtx;
+}
+
+
 namespace renderer {
 
 static constexpr auto Scale = 1;
 static constexpr auto PriorityScale = 0.01f;
 
-Drawer::Drawer(Context &ctx) noexcept: m_ctx(ctx) {}
-
-void Drawer::draw(turbine::Context &tctx) noexcept {
-	gfx::gl::draw(m_ctx, turbine::getScreenSize(tctx));
-}
-
 static constexpr ox::CStringView bgvshadTmpl = R"glsl(
 	{}
 	in vec2 vTexCoord;
@@ -106,7 +188,7 @@ static constexpr ox::CStringView spritefshadTmpl = R"glsl(
 	})glsl";
 
 [[nodiscard]]
-static constexpr auto bgVertexRow(uint_t x, uint_t y) noexcept {
+static constexpr auto bgVertexRow(uint_t const x, uint_t const y) noexcept {
 	return y * TileRows + x;
 }
 
@@ -183,7 +265,7 @@ static void setTileBufferObject(
 	ox::spancpy<GLuint>(ebo, elms);
 }
 
-static void initSpriteBufferObjects(Context &ctx, glutils::BufferSet &bs) noexcept {
+static void initSpriteBufferObjects(Context const &ctx, glutils::BufferSet &bs) noexcept {
 	for (auto i = 0u; i < ctx.spriteCount; ++i) {
 		auto const vbo = ox::Span{bs.vertices}
 			+ i * static_cast<std::size_t>(SpriteVertexVboLength);
@@ -241,7 +323,13 @@ static void initSpritesBufferset(Context &ctx) noexcept {
 	// in float vEnabled;
 	auto const enabledAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vEnabled"));
 	glEnableVertexAttribArray(enabledAttr);
-	glVertexAttribPointer(enabledAttr, 1, GL_FLOAT, GL_FALSE, SpriteVertexVboRowLength * sizeof(float), nullptr);
+	glVertexAttribPointer(
+		enabledAttr,
+		1,
+		GL_FLOAT,
+		GL_FALSE,
+		SpriteVertexVboRowLength * sizeof(float),
+		nullptr);
 	// in vec3 vPosition;
 	auto const posAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vPosition"));
 	glEnableVertexAttribArray(posAttr);
@@ -250,13 +338,14 @@ static void initSpritesBufferset(Context &ctx) noexcept {
 	// in vec2 vTexCoord;
 	auto const texCoordAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vTexCoord"));
 	glEnableVertexAttribArray(texCoordAttr);
-	glVertexAttribPointer(texCoordAttr, 2, GL_FLOAT, GL_FALSE, SpriteVertexVboRowLength * sizeof(float),
-	                      std::bit_cast<void*>(uintptr_t{4 * sizeof(float)}));
+	glVertexAttribPointer(
+		texCoordAttr, 2, GL_FLOAT, GL_FALSE, SpriteVertexVboRowLength * sizeof(float),
+		std::bit_cast<void*>(uintptr_t{4 * sizeof(float)}));
 	glBindVertexArray(0);
 }
 
 static void initBackgroundBufferset(
-		GLuint shader,
+		GLuint const shader,
 		glutils::BufferSet &bs) noexcept {
 	// vao
 	bs.vao = glutils::generateVertexArrayObject();
@@ -270,7 +359,13 @@ static void initBackgroundBufferset(
 	// vbo layout
 	auto const posAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vPosition"));
 	glEnableVertexAttribArray(posAttr);
-	glVertexAttribPointer(posAttr, 3, GL_FLOAT, GL_FALSE, BgVertexVboRowLength * sizeof(float), nullptr);
+	glVertexAttribPointer(
+		posAttr,
+		3,
+		GL_FLOAT,
+		GL_FALSE,
+		BgVertexVboRowLength * sizeof(float),
+		nullptr);
 	auto const texCoordAttr = static_cast<GLuint>(glGetAttribLocation(shader, "vTexCoord"));
 	glEnableVertexAttribArray(texCoordAttr);
 	glVertexAttribPointer(
@@ -290,8 +385,8 @@ static void initBackgroundBufferset(
 }
 
 static glutils::GLTexture createTexture(
-		GLsizei w,
-		GLsizei h,
+		GLsizei const w,
+		GLsizei const h,
 		void const*pixels) noexcept {
 	GLuint texId = 0;
 	glGenTextures(1, &texId);
@@ -300,7 +395,16 @@ static glutils::GLTexture createTexture(
 	tex.height = h;
 	glActiveTexture(GL_TEXTURE0);
 	glBindTexture(GL_TEXTURE_2D, tex.id);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, tex.width, tex.height, 0, GL_RGBA, GL_UNSIGNED_BYTE, pixels);
+	glTexImage2D(
+		GL_TEXTURE_2D,
+		0,
+		GL_RGBA,
+		tex.width,
+		tex.height,
+		0,
+		GL_RGBA,
+		GL_UNSIGNED_BYTE,
+		pixels);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
@@ -375,10 +479,10 @@ static void drawSprites(Context &ctx, ox::Size const&renderSz) noexcept {
 
 static void loadPalette(
 		ox::Array<GLfloat, 1024> &palette,
-		size_t palOffset,
-		GLuint shaderPgrm,
+		size_t const palOffset,
+		GLuint const shaderPgrm,
 		CompactPalette const&pal,
-		size_t page = 0) noexcept {
+		size_t const page = 0) noexcept {
 	static constexpr std::size_t ColorCnt = 256;
 	for (auto i = palOffset; auto const c : pal.pages[page]) {
 		palette[i++] = redf(c);
@@ -470,28 +574,23 @@ static void setSprite(
 
 }
 
-ox::Error initGfx(
-		Context &ctx,
-		InitParams const&initParams) noexcept {
+ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params) noexcept {
+	auto ctx = ox::make_unique<Context>(tctx, params);
 	const auto bgVshad = ox::sfmt(renderer::bgvshadTmpl, gl::GlslVersion);
 	const auto bgFshad = ox::sfmt(renderer::bgfshadTmpl, gl::GlslVersion);
 	const auto spriteVshad = ox::sfmt(renderer::spritevshadTmpl, gl::GlslVersion);
 	const auto spriteFshad = ox::sfmt(renderer::spritefshadTmpl, gl::GlslVersion);
-	OX_RETURN_ERROR(glutils::buildShaderProgram(bgVshad, bgFshad).moveTo(ctx.bgShader));
+	OX_RETURN_ERROR(glutils::buildShaderProgram(bgVshad, bgFshad).moveTo(ctx->bgShader));
 	OX_RETURN_ERROR(
-			glutils::buildShaderProgram(spriteVshad, spriteFshad).moveTo(ctx.spriteShader));
-	for (auto &cbb : ctx.cbbs) {
-		initBackgroundBufferset(ctx.bgShader, cbb);
+			glutils::buildShaderProgram(spriteVshad, spriteFshad).moveTo(ctx->spriteShader));
+	for (auto &cbb : ctx->cbbs) {
+		initBackgroundBufferset(ctx->bgShader, cbb);
 	}
-	renderer::initSpritesBufferset(ctx);
-	if (initParams.glInstallDrawer) {
-		turbine::gl::addDrawer(ctx.turbineCtx, &ctx.drawer);
+	renderer::initSpritesBufferset(*ctx);
+	if (params.glInstallDrawer) {
+		turbine::gl::addDrawer(ctx->turbineCtx, &ctx->drawer);
 	}
-	return {};
-}
-
-void shutdownGfx(Context &ctx) noexcept {
-	turbine::gl::removeDrawer(ctx.turbineCtx, &ctx.drawer);
+	return ctx;
 }
 
 struct TileSheetData {
@@ -523,14 +622,18 @@ static ox::Result<TileSheetData> normalizeTileSheet(
 			pixels[i * 2 + 1] = ts.pixels[i] >> 4;
 		}
 	}
-	return TileSheetData{std::move(pixels), width, height};
+	return TileSheetData{
+		.pixels = std::move(pixels),
+		.width = width,
+		.height = height
+	};
 }
 
 ox::Error loadBgPalette(
 		Context &ctx,
-		size_t palBank,
+		size_t const palBank,
 		CompactPalette const&palette,
-		size_t page) noexcept {
+		size_t const page) noexcept {
 	renderer::loadPalette(ctx.bgPalette, palBank * 16 * 4, ctx.bgShader, palette, page);
 	return {};
 }
@@ -538,14 +641,14 @@ ox::Error loadBgPalette(
 ox::Error loadSpritePalette(
 		Context &ctx,
 		CompactPalette const&palette,
-		size_t page) noexcept {
+		size_t const page) noexcept {
 	ox::Array<GLfloat, 1024> pal;
 	renderer::loadPalette(pal, 0, ctx.spriteShader, palette, page);
 	return {};
 }
 
 static ox::Result<TileSheetData> buildSetTsd(
-		Context &ctx,
+		Context const &ctx,
 		TileSheetSet const&set) noexcept {
 	auto &kctx = keelCtx(ctx.turbineCtx);
 	TileSheetData setTsd;
@@ -567,7 +670,7 @@ static ox::Result<TileSheetData> buildSetTsd(
 
 static void copyPixels(
 		CompactTileSheet const&ts,
-		ox::Span<uint32_t> dst,
+		ox::Span<uint32_t> const dst,
 		size_t const srcPxIdx,
 		size_t const pxlCnt) noexcept {
 	size_t idx{};
@@ -624,7 +727,7 @@ ox::Error loadBgTileSheet(
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		uint_t cbb,
+		uint_t const cbb,
 		CompactTileSheet const&ts,
 		ox::Optional<unsigned> const&paletteBank) noexcept {
 	auto const bytesPerTile = static_cast<uint64_t>(PixelsPerTile / (1 + (ts.bpp == 4)));
@@ -638,7 +741,7 @@ ox::Error loadBgTileSheet(
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		unsigned cbb,
+		unsigned const cbb,
 		TileSheetSet const&set) noexcept {
 	OX_REQUIRE(setTsd, buildSetTsd(ctx, set));
 	ctx.cbbs[cbb].tex = renderer::createTexture(setTsd.width, setTsd.height, setTsd.pixels.data());
@@ -648,7 +751,7 @@ ox::Error loadBgTileSheet(
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
 		CompactTileSheet const&ts,
-		bool loadDefaultPalette) noexcept {
+		bool const loadDefaultPalette) noexcept {
 	OX_REQUIRE(tsd, normalizeTileSheet(ts));
 	oxTracef("nostalgia.gfx.gl", "loadSpriteTexture: { w: {}, h: {} }", tsd.width, tsd.height);
 	ctx.spriteBlocks.tex = renderer::createTexture(tsd.width, tsd.height, tsd.pixels.data());
@@ -668,9 +771,9 @@ ox::Error loadSpriteTileSheet(
 
 void setBgTile(
 		Context &ctx,
-		uint_t bgIdx,
-		int column,
-		int row,
+		uint_t const bgIdx,
+		int const column,
+		int const row,
 		BgTile const&tile) noexcept {
 	oxTracef(
 			"nostalgia.gfx.setBgTile",
@@ -698,7 +801,7 @@ void setBgTile(
 	cbb.updated = true;
 }
 
-void clearBg(Context &ctx, uint_t bgIdx) noexcept {
+void clearBg(Context &ctx, uint_t const bgIdx) noexcept {
 	auto &cbb = ctx.cbbs[static_cast<std::size_t>(bgIdx)];
 	initBackgroundBufferObjects(cbb);
 	cbb.updated = true;
@@ -714,61 +817,59 @@ uint8_t bgStatus(Context &ctx) noexcept {
 	return out;
 }
 
-void setBgStatus(Context &ctx, uint32_t status) noexcept {
+void setBgStatus(Context &ctx, uint32_t const status) noexcept {
 	for (uint_t i = 0; i < ctx.cbbs.size(); ++i) {
 		ctx.backgrounds[i].enabled = (status >> i) & 1;
 	}
 }
 
-bool bgStatus(Context &ctx, uint_t bg) noexcept {
+bool bgStatus(Context &ctx, uint_t const bg) noexcept {
 	return ctx.backgrounds[bg].enabled;
 }
 
-void setBgStatus(Context&ctx, uint_t bg, bool status) noexcept {
+void setBgStatus(Context&ctx, uint_t const bg, bool const status) noexcept {
 	ctx.backgrounds[bg].enabled = status;
 }
 
-void setBgBpp(Context&, unsigned, unsigned) noexcept {}
-
-void setBgCbb(Context &ctx, uint_t bgIdx, uint_t cbbIdx) noexcept {
+void setBgCbb(Context &ctx, uint_t const bgIdx, uint_t const cbbIdx) noexcept {
 	auto &bg = ctx.backgrounds[bgIdx];
 	bg.cbbIdx = cbbIdx;
 }
 
-void setBgPriority(Context &ctx, uint_t bgIdx, uint_t priority) noexcept {
+void setBgPriority(Context &ctx, uint_t const bgIdx, uint_t const priority) noexcept {
 	auto &bg = ctx.backgrounds[bgIdx];
 	bg.priority = static_cast<float>(priority & 0b11);
 }
 
-void hideSprite(Context &ctx, uint_t idx) noexcept {
+void hideSprite(Context &ctx, uint_t const idx) noexcept {
 	auto &s = ctx.spriteStates[idx];
 	s.enabled = false;
 	renderer::setSprite(ctx, idx, s);
 }
 
-void showSprite(Context &ctx, uint_t idx) noexcept {
+void showSprite(Context &ctx, uint_t const idx) noexcept {
 	auto &s = ctx.spriteStates[idx];
 	s.enabled = true;
 	renderer::setSprite(ctx, idx, s);
 }
 
-void setSprite(Context &ctx, uint_t idx, Sprite const&sprite) noexcept {
+void setSprite(Context &ctx, uint_t const idx, Sprite const&sprite) noexcept {
 	auto &s = ctx.spriteStates[idx];
 	s = sprite;
 	renderer::setSprite(ctx, idx, s);
 }
 
-uint_t spriteCount(Context &ctx) noexcept {
+uint_t spriteCount(Context const &ctx) noexcept {
 	return ctx.spriteCount;
 }
 
 namespace gl {
 
-ox::Size drawSize(int scale) noexcept {
+ox::Size drawSize(int const scale) noexcept {
 	return {240 * scale, 160 * scale};
 }
 
-void draw(gfx::Context &ctx, ox::Size const&renderSz) noexcept {
+void draw(Context &ctx, ox::Size const&renderSz) noexcept {
 	glViewport(0, 0, renderSz.width, renderSz.height);
 	glEnable(GL_DEPTH_TEST);
 	glEnable(GL_BLEND);
@@ -783,7 +884,7 @@ void draw(gfx::Context &ctx, ox::Size const&renderSz) noexcept {
 	glDisable(GL_BLEND);
 }
 
-void draw(gfx::Context &ctx, int scale) noexcept {
+void draw(Context &ctx, int const scale) noexcept {
 	draw(ctx, drawSize(scale));
 }
 

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

@@ -20,7 +20,7 @@ int tileRows(Context&) noexcept {
 
 ox::Error loadBgPalette(
 		Context &ctx,
-		size_t palBank,
+		size_t const palBank,
 		ox::StringViewCR palettePath) noexcept {
 	OX_REQUIRE(pal, keel::readObj<CompactPalette>(keelCtx(ctx), palettePath));
 	return loadBgPalette(ctx, palBank, *pal, 0);
@@ -28,8 +28,8 @@ ox::Error loadBgPalette(
 
 ox::Error loadBgPalette(
 		Context &ctx,
-		size_t palBank,
-		ox::FileAddress const&paletteAddr) noexcept {
+		size_t const palBank,
+		ox::FileAddress const &paletteAddr) noexcept {
 	OX_REQUIRE(pal, keel::readObj<CompactPalette>(keelCtx(ctx), paletteAddr));
 	return loadBgPalette(ctx, palBank, *pal, 0);
 }
@@ -43,18 +43,18 @@ ox::Error loadSpritePalette(
 
 ox::Error loadSpritePalette(
 		Context &ctx,
-		ox::FileAddress const&paletteAddr) noexcept {
+		ox::FileAddress const &paletteAddr) noexcept {
 	OX_REQUIRE(pal, keel::readObj<CompactPalette>(keelCtx(ctx), paletteAddr));
 	return loadSpritePalette(ctx, *pal, 0);
 }
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		unsigned cbb,
+		unsigned const cbb,
 		ox::FileAddress const&tsAddr,
-		size_t dstTileIdx,
-		size_t srcTileIdx,
-		size_t tileCnt) noexcept {
+		size_t const dstTileIdx,
+		size_t const srcTileIdx,
+		size_t const tileCnt) noexcept {
 	OX_REQUIRE(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), tsAddr));
 	return loadBgTileSheet(ctx, cbb, *ts, dstTileIdx, srcTileIdx, tileCnt);
 }
@@ -63,16 +63,16 @@ ox::Error loadBgTileSheet(
 		Context &ctx,
 		unsigned cbb,
 		ox::StringViewCR tsPath,
-		size_t dstTileIdx,
-		size_t srcTileIdx,
-		size_t tileCnt) noexcept {
+		size_t const dstTileIdx,
+		size_t const srcTileIdx,
+		size_t const tileCnt) noexcept {
 	OX_REQUIRE(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), tsPath));
 	return loadBgTileSheet(ctx, cbb, *ts, dstTileIdx, srcTileIdx, tileCnt);
 }
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		unsigned cbb,
+		unsigned const cbb,
 		ox::StringViewCR tilesheetPath,
 		ox::Optional<unsigned> const&paletteBank) noexcept {
 	OX_REQUIRE(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), tilesheetPath));
@@ -81,7 +81,7 @@ ox::Error loadBgTileSheet(
 
 ox::Error loadBgTileSheet(
 		Context &ctx,
-		unsigned cbb,
+		unsigned const cbb,
 		ox::FileAddress const&tilesheetAddr,
 		ox::Optional<unsigned> const&paletteBank) noexcept {
 	OX_REQUIRE(ts, keel::readObj<CompactTileSheet>(keelCtx(ctx), tilesheetAddr));
@@ -91,7 +91,7 @@ ox::Error loadBgTileSheet(
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
 		ox::StringViewCR tilesheetPath,
-		bool loadDefaultPalette) noexcept {
+		bool const loadDefaultPalette) noexcept {
 	OX_REQUIRE(ts, readObj<CompactTileSheet>(keelCtx(ctx), tilesheetPath));
 	return loadSpriteTileSheet(ctx, *ts, loadDefaultPalette);
 }
@@ -99,7 +99,7 @@ ox::Error loadSpriteTileSheet(
 ox::Error loadSpriteTileSheet(
 		Context &ctx,
 		ox::FileAddress const&tilesheetAddr,
-		bool loadDefaultPalette) noexcept {
+		bool const loadDefaultPalette) noexcept {
 	OX_REQUIRE(ts, readObj<CompactTileSheet>(keelCtx(ctx), tilesheetAddr));
 	return loadSpriteTileSheet(ctx, *ts, loadDefaultPalette);
 }
@@ -235,7 +235,13 @@ constexpr ox::Array<char, 128> charMap = {
 	50, // ~
 };
 
-void setBgTile(Context &ctx, uint_t bgIdx, int column, int row, unsigned tile, unsigned palBank) noexcept {
+void setBgTile(
+	Context &ctx,
+	uint_t const bgIdx,
+	int const column,
+	int const row,
+	unsigned const tile,
+	unsigned const palBank) noexcept {
 	setBgTile(ctx, bgIdx, column, row, {
 		.tileIdx = tile,
 		.palBank = palBank,

src/nostalgia/modules/gfx/src/opengl/CMakeLists.txt

@@ -1,9 +0,0 @@
-target_sources(
-	NostalgiaGfx PRIVATE
-		context.cpp
-		gfx.cpp
-)
-target_link_libraries(
-	NostalgiaGfx PUBLIC
-		GlUtils
-)

src/nostalgia/modules/gfx/src/opengl/context.cpp

@@ -1,40 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#include "context.hpp"
-#include "gfx.hpp"
-
-namespace nostalgia::gfx {
-
-void safeDelete(Context *ctx) noexcept {
-	delete ctx;
-}
-
-Context::Context(turbine::Context &tctx, InitParams const&params) noexcept:
-	turbineCtx(tctx),
-	spriteBlocks(params.glSpriteCount, params.glBlocksPerSprite),
-	drawer(*this),
-	spriteCount(params.glSpriteCount),
-	blocksPerSprite(params.glBlocksPerSprite) {
-}
-
-Context::~Context() noexcept {
-	shutdownGfx(*this);
-}
-
-ox::Result<ox::UPtr<Context>> init(turbine::Context &tctx, InitParams const&params) noexcept {
-	auto ctx = ox::make_unique<Context>(tctx, params);
-	OX_RETURN_ERROR(initGfx(*ctx, params));
-	return ox::UPtr<Context>(ctx.release());
-}
-
-keel::Context &keelCtx(Context &ctx) noexcept {
-	return turbine::keelCtx(ctx.turbineCtx);
-}
-
-turbine::Context &turbineCtx(Context &ctx) noexcept {
-	return ctx.turbineCtx;
-}
-
-}

src/nostalgia/modules/gfx/src/opengl/context.hpp

@@ -1,40 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include <ox/std/types.hpp>
-
-#include <glutils/glutils.hpp>
-
-#include <nostalgia/gfx/gfx.hpp>
-#include <nostalgia/gfx/context.hpp>
-
-#include "gfx.hpp"
-
-namespace nostalgia::gfx {
-
-class Context {
-
-	public:
-		turbine::Context &turbineCtx;
-		glutils::GLProgram bgShader;
-		glutils::GLProgram spriteShader;
-		ox::Array<renderer::CBB, 4> cbbs;
-		renderer::SpriteBlockset spriteBlocks;
-		ox::Array<Sprite, 128> spriteStates;
-		ox::Array<GLfloat, 1024> bgPalette;
-		ox::Array<renderer::Background, 4> backgrounds;
-		renderer::Drawer drawer;
-		uint_t spriteCount = 0;
-		uint_t blocksPerSprite = 0;
-		explicit Context(turbine::Context &tctx, InitParams const&params) noexcept;
-		Context(Context const&) = delete;
-		Context(Context&&) = delete;
-		Context &operator=(Context const&) = delete;
-		Context &operator=(Context&&) = delete;
-		~Context() noexcept;
-};
-
-}

src/nostalgia/modules/gfx/src/opengl/gfx.hpp

@@ -1,65 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include <ox/std/types.hpp>
-
-#include <turbine/gfx.hpp>
-
-#include <glutils/glutils.hpp>
-
-#include <nostalgia/gfx/context.hpp>
-
-namespace nostalgia::gfx::renderer {
-
-constexpr uint64_t TileRows = 128;
-constexpr uint64_t TileColumns = 128;
-constexpr uint64_t TileCount = TileRows * TileColumns;
-constexpr uint64_t BgVertexVboRows = 4;
-constexpr uint64_t BgVertexVboRowLength = 7;
-constexpr uint64_t BgVertexVboLength = BgVertexVboRows * BgVertexVboRowLength;
-constexpr uint64_t BgVertexEboLength = 6;
-constexpr uint64_t SpriteVertexVboRows = 4;
-constexpr uint64_t SpriteVertexVboRowLength = 6;
-constexpr uint64_t SpriteVertexVboLength = SpriteVertexVboRows * SpriteVertexVboRowLength;
-constexpr uint64_t SpriteVertexEboLength = 6;
-
-struct CBB: public glutils::BufferSet {
-	bool updated = false;
-	ox::Array<uint32_t, 32768> pixels;
-	constexpr CBB() noexcept {
-		vertices.resize(TileCount * BgVertexVboLength);
-		elements.resize(TileCount * BgVertexEboLength);
-	}
-};
-
-struct SpriteBlockset: public glutils::BufferSet {
-	bool updated = false;
-	constexpr SpriteBlockset(uint64_t spriteCount, uint64_t blocksPerSprite) noexcept {
-		vertices.resize(spriteCount * SpriteVertexVboLength * blocksPerSprite);
-		elements.resize(spriteCount * SpriteVertexEboLength * blocksPerSprite);
-	}
-};
-
-struct Background {
-	float priority = 0;
-	bool enabled = false;
-	unsigned cbbIdx = 0;
-};
-
-class Drawer: public turbine::gl::Drawer {
-	private:
-		Context &m_ctx;
-	public:
-		explicit Drawer(Context &ctx) noexcept;
-		void draw(turbine::Context&) noexcept final;
-};
-
-}
-
-namespace nostalgia::gfx {
-ox::Error initGfx(Context &ctx, InitParams const&) noexcept;
-void shutdownGfx(Context &ctx) noexcept;
-}

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

@@ -118,12 +118,12 @@ void PaletteEditorImGui::navigateTo(ox::StringViewCR arg) noexcept {
 	}
 }
 
-void PaletteEditorImGui::drawColumnLeftAlign(ox::CStringView txt) noexcept {
+void PaletteEditorImGui::drawColumnLeftAlign(ox::CStringViewCR txt) noexcept {
 	ImGui::TableNextColumn();
 	ImGui::Text("%s", txt.c_str());
 }
 
-void PaletteEditorImGui::drawColumn(ox::CStringView txt) noexcept {
+void PaletteEditorImGui::drawColumn(ox::CStringViewCR txt) noexcept {
 	ImGui::TableNextColumn();
 	ImGui::SetCursorPosX(
 			ImGui::GetCursorPosX() + ImGui::GetColumnWidth() - ImGui::CalcTextSize(txt.data()).x);
@@ -143,7 +143,15 @@ void PaletteEditorImGui::numShortcuts(size_t &val, size_t const sizeRange) noexc
 	}
 }
 
-void PaletteEditorImGui::colorInput(ox::CStringView label, int &v, bool &inputFocused) noexcept {
+void PaletteEditorImGui::colorInput(
+	ox::CStringViewCR label,
+	int &v,
+	bool &inputFocused,
+	FocusCmd const colorChannel) noexcept {
+	if (colorChannel == m_focusCmd) [[unlikely]] {
+		ImGui::SetKeyboardFocusHere();
+		m_focusCmd = FocusCmd::None;
+	}
 	ImGui::InputInt(label.c_str(), &v, 1, 5);
 	inputFocused = inputFocused || ImGui::IsItemFocused();
 	v = ox::max(v, 0);
@@ -296,9 +304,9 @@ void PaletteEditorImGui::drawColorEditor() noexcept {
 			"Name", m_pal.colorNames[m_selectedColorRow]);
 	bool inputFocused = ImGui::IsItemFocused();
 	ImGui::Separator();
-	colorInput("Red", r, inputFocused);
-	colorInput("Green", g, inputFocused);
-	colorInput("Blue", b, inputFocused);
+	colorInput("Red", r, inputFocused, FocusCmd::Red);
+	colorInput("Green", g, inputFocused, FocusCmd::Green);
+	colorInput("Blue", b, inputFocused, FocusCmd::Blue);
 	if (ig::PushButton("Apply to all pages", {-1, ig::BtnSz.y})) {
 		std::ignore = pushCommand<ApplyColorAllPagesCommand>(
 				m_pal, m_page, m_selectedColorRow);
@@ -309,6 +317,15 @@ void PaletteEditorImGui::drawColorEditor() noexcept {
 		} else {
 			numShortcuts(m_page, m_pal.pages.size());
 		}
+		if (ImGui::IsKeyDown(ImGuiKey_R)) {
+			m_focusCmd = FocusCmd::Red;
+		}
+		if (ImGui::IsKeyDown(ImGuiKey_G)) {
+			m_focusCmd = FocusCmd::Green;
+		}
+		if (ImGui::IsKeyDown(ImGuiKey_B)) {
+			m_focusCmd = FocusCmd::Blue;
+		}
 	}
 	auto const newColor = color16(r, g, b, a);
 	if (c != newColor) {
@@ -320,7 +337,7 @@ void PaletteEditorImGui::drawColorEditor() noexcept {
 	}
 }
 
-ox::Error PaletteEditorImGui::renamePage(ox::StringView name) noexcept {
+ox::Error PaletteEditorImGui::renamePage(ox::StringViewCR name) noexcept {
 	return pushCommand<RenamePageCommand>(m_pal, m_page, name);
 }
 

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

@@ -36,6 +36,13 @@ class PaletteEditorImGui: public studio::Editor {
 		Palette m_pal;
 		size_t m_selectedColorRow = 0;
 		size_t m_page = 0;
+		enum class FocusCmd {
+			None,
+			Red,
+			Green,
+			Blue,
+		};
+		FocusCmd m_focusCmd;
 
 	public:
 		PaletteEditorImGui(studio::Context &sctx, ox::StringParam path);
@@ -48,9 +55,9 @@ class PaletteEditorImGui: public studio::Editor {
 		void navigateTo(ox::StringViewCR arg) noexcept override;
 
 	private:
-		static void drawColumnLeftAlign(ox::CStringView txt) noexcept;
+		static void drawColumnLeftAlign(ox::CStringViewCR txt) noexcept;
 
-		static void drawColumn(ox::CStringView txt) noexcept;
+		static void drawColumn(ox::CStringViewCR txt) noexcept;
 
 		static void drawColumn(ox::Integer_c auto i) noexcept {
 			drawColumn(ox::intToStr(i));
@@ -58,7 +65,7 @@ class PaletteEditorImGui: public studio::Editor {
 
 		static void numShortcuts(size_t &val, size_t sizeRange) noexcept;
 
-		static void colorInput(ox::CStringView label, int &v, bool &inputFocused) noexcept;
+		void colorInput(ox::CStringViewCR label, int &v, bool &inputFocused, FocusCmd colorChannel) noexcept;
 
 		void drawColorsEditor() noexcept;
 
@@ -66,7 +73,7 @@ class PaletteEditorImGui: public studio::Editor {
 
 		void drawColorEditor() noexcept;
 
-		ox::Error renamePage(ox::StringView name) noexcept;
+		ox::Error renamePage(ox::StringViewCR name) noexcept;
 
 		ox::Error handleCommand(studio::UndoCommand const*) noexcept;
 };

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/tilesheeteditor-imgui.cpp

@@ -388,6 +388,17 @@ ox::Error TileSheetEditorImGui::saveItem() noexcept {
 	return m_model.saveFile();
 }
 
+void TileSheetEditorImGui::navigateTo(ox::StringViewCR arg) noexcept {
+	auto const subSheetId = strToInt(arg);
+	if (subSheetId.error) {
+		return;
+	}
+	if (auto const [val, err] = getSubSheetIdx(m_model.img(), subSheetId.value);
+	    !err) {
+		setActiveSubsheet(val);
+	}
+}
+
 void TileSheetEditorImGui::showSubsheetEditor() noexcept {
 	auto const&sheet = m_model.activeSubSheet();
 	if (!sheet.subsheets.empty()) {
@@ -451,7 +462,10 @@ void TileSheetEditorImGui::drawTileSheet(ox::Vec2 const&fbSize) noexcept {
 		if (wheelh != 0) {
 			m_view.scrollH(fbSize, wheelh);
 		}
-		if (ImGui::IsMouseDown(0) && m_prevMouseDownPos != mousePos) {
+		using ImGui::IsMouseClicked;
+		using ImGui::IsMouseDragging;
+		if ((IsMouseDragging(ImGuiMouseButton_Left) || IsMouseClicked(ImGuiMouseButton_Left))
+			&& m_prevMouseDownPos != mousePos) {
 			m_prevMouseDownPos = mousePos;
 			switch (m_tool) {
 				case TileSheetTool::Draw:

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

@@ -87,6 +87,8 @@ class TileSheetEditorImGui: public studio::Editor {
 	protected:
 		ox::Error saveItem() noexcept override;
 
+		void navigateTo(ox::StringViewCR arg) noexcept override;
+
 	private:
 		void showSubsheetEditor() noexcept;
 

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

@@ -46,13 +46,13 @@ Palette const TileSheetEditorModel::s_defaultPalette = {
 
 TileSheetEditorModel::TileSheetEditorModel(
 		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()),
+		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/tilesheet.cpp

@@ -2,6 +2,8 @@
  * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
+#include "nostalgia/gfx/tilesheet.hpp"
+
 #include <ox/std/size.hpp>
 #include <ox/std/vector.hpp>
 
@@ -187,6 +189,28 @@ TileSheet::SubSheetIdx validateSubSheetIdx(TileSheet const&ts, TileSheet::SubShe
 	return validateSubSheetIdx(std::move(idx), 0, ts.subsheet);
 }
 
+static ox::Error getSubSheetIdx(TileSheet::SubSheet const &ss, SubSheetId const pId, TileSheet::SubSheetIdx &idx) noexcept {
+	if (ss.id == pId) {
+		return {};
+	}
+	for (uint32_t i{}; auto const &sub : ss.subsheets) {
+		idx.emplace_back(i);
+		auto const err = getSubSheetIdx(sub, pId, idx);
+		if (!err) {
+			return {};
+		}
+		idx.pop_back();
+		++i;
+	}
+	return ox::Error{1, "SubSheet not found"};
+}
+
+ox::Result<TileSheet::SubSheetIdx> getSubSheetIdx(TileSheet const &ts, SubSheetId const pId) noexcept {
+	ox::Result<TileSheet::SubSheetIdx> out;
+	OX_RETURN_ERROR(getSubSheetIdx(ts.subsheet, pId, out.value));
+	return out;
+}
+
 #if defined(__GNUC__) && __GNUC__ >= 13
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wdangling-reference"

src/nostalgia/modules/gfx/test/tests.cpp

@@ -6,16 +6,16 @@
 
 #include <map>
 #include <ox/std/error.hpp>
-#include <ox/mc/mc.hpp>
-#include <nostalgia/gfx/core.hpp>
+#include <ox/mc/write.hpp>
+#include <nostalgia/gfx/gfx.hpp>
 
 using namespace nostalgia;
 
 static std::map<ox::StringView, ox::Error(*)()> tests = {
 	{
 		"readWriteTileSheet",
-		[]() -> ox::Error {
-			gfx::TileSheet in;
+		[] -> ox::Error {
+			gfx::TileSheet const in;
 			OX_REQUIRE(buff, ox::writeMC(in));
 			OX_REQUIRE(out, ox::readMC<gfx::TileSheet>(buff));
 			oxAssert(in.subsheet.name == out.subsheet.name, "subsheet.name serialization broken");
@@ -29,7 +29,7 @@ int main(int argc, const char **argv) {
 	if (argc > 0) {
 		auto const args = ox::Span{argv, static_cast<size_t>(argc)};
 		auto const testName = ox::StringView(args[1]);
-		if (tests.find(testName) != tests.end()) {
+		if (tests.contains(testName)) {
 			retval = static_cast<int>(tests[testName]());
 		} else {
 			retval = 1;

src/nostalgia/modules/sound/include/nostalgia/sound/keelmodule.hpp

@@ -8,6 +8,6 @@
 
 namespace nostalgia::sound {
 
-const keel::Module *keelModule() noexcept;
+keel::Module const *keelModule() noexcept;
 
 }

src/nostalgia/modules/sound/include/nostalgia/sound/studiomodule.hpp

@@ -8,6 +8,6 @@
 
 namespace nostalgia::sound {
 
-const studio::Module *studioModule() noexcept;
+studio::Module const *studioModule() noexcept;
 
 }

src/nostalgia/modules/sound/src/keel/keelmodule.cpp

@@ -10,32 +10,30 @@
 
 namespace nostalgia::sound {
 
-static class: public keel::Module {
-	private:
+static struct: keel::Module {
 
-	public:
-		[[nodiscard]]
-		ox::String id() const noexcept override {
-			return ox::String{"net.drinkingtea.nostalgia.sound"};
-		}
+	[[nodiscard]]
+	ox::String id() const noexcept override {
+		return ox::String{"net.drinkingtea.nostalgia.sound"};
+	}
 
-		[[nodiscard]]
-		ox::Vector<keel::TypeDescGenerator> types() const noexcept final {
-			return {
-			};
-		}
+	[[nodiscard]]
+	ox::Vector<keel::TypeDescGenerator> types() const noexcept final {
+		return {
+		};
+	}
 
-		[[nodiscard]]
-		ox::Vector<keel::Converter> converters() const noexcept final {
-			return {
-			};
-		}
+	[[nodiscard]]
+	ox::Vector<keel::Converter> converters() const noexcept final {
+		return {
+		};
+	}
 
-		[[nodiscard]]
-		ox::Vector<keel::PackTransform> packTransforms() const noexcept final {
-			return {
-			};
-		}
+	[[nodiscard]]
+	ox::Vector<keel::PackTransform> packTransforms() const noexcept final {
+		return {
+		};
+	}
 
 } const mod;
 

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

@@ -8,7 +8,8 @@
 
 namespace nostalgia::sound {
 
-static class: public studio::Module {
+static struct: studio::Module {
+
 	ox::Vector<studio::EditorMaker> editors(studio::Context&) const noexcept final {
 		return {
 		};
@@ -18,6 +19,7 @@ static class: public studio::Module {
 		ox::Vector<ox::UPtr<studio::ItemMaker>> out;
 		return out;
 	}
+
 } const mod;
 
 const studio::Module *studioModule() noexcept {

src/nostalgia/player/app.cpp

@@ -5,7 +5,7 @@
 #include <keel/media.hpp>
 #include <turbine/turbine.hpp>
 
-#include <nostalgia/gfx/core.hpp>
+#include <nostalgia/gfx/gfx.hpp>
 
 using namespace nostalgia;
 
@@ -52,7 +52,7 @@ static int testUpdateHandler(turbine::Context &tctx) noexcept {
 }
 
 [[maybe_unused]]
-static void testKeyEventHandler(turbine::Context &tctx, turbine::Key key, bool down) noexcept {
+static void testKeyEventHandler(turbine::Context &tctx, turbine::Key const key, bool const down) noexcept {
 	if (down) {
 		if (key == turbine::Key::Alpha_Q) {
 			turbine::requestShutdown(tctx);

src/olympic/applib/applib.cpp

@@ -38,7 +38,7 @@
 #endif
 
 namespace olympic {
-ox::String appVersion = ox::String(OLYMPIC_APP_VERSION);
+ox::String appVersion{OLYMPIC_APP_VERSION};
 }
 
 ox::Error run(
@@ -57,7 +57,7 @@ int WinMain() {
 	auto const argc = __argc;
 	auto const argv = const_cast<const char**>(__argv);
 #else
-int main(int argc, char const**argv) {
+int main(int const argc, char const **argv) {
 #endif
 	OX_INIT_DEBUG_LOGGER(loggerConn, OLYMPIC_PROJECT_NAME " " OLYMPIC_APP_NAME)
 #if OLYMPIC_LOAD_KEEL_MODULES

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

@@ -154,7 +154,7 @@ class AssetRef: public ox::SignalHandler {
 	private:
 		constexpr ox::Error emitUpdated() const noexcept {
 			updated.emit();
-			return ox::Error(0);
+			return {};
 		}
 };
 

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

@@ -46,47 +46,47 @@ struct GbaPlatSpec {
 	static constexpr PtrType RomStart = 0x08000000;
 
 	[[nodiscard]]
-	static constexpr std::size_t alignOf(const bool) noexcept {
+	static constexpr std::size_t alignOf(bool) noexcept {
 		return 1;
 	}
 
 	[[nodiscard]]
-	static constexpr std::size_t alignOf(const uint8_t) noexcept {
+	static constexpr std::size_t alignOf(uint8_t) noexcept {
 		return 1;
 	}
 
 	[[nodiscard]]
-	static constexpr std::size_t alignOf(const uint16_t) noexcept {
+	static constexpr std::size_t alignOf(uint16_t) noexcept {
 		return 2;
 	}
 
 	[[nodiscard]]
-	static constexpr std::size_t alignOf(const uint32_t) noexcept {
+	static constexpr std::size_t alignOf(uint32_t) noexcept {
 		return 4;
 	}
 
 	[[nodiscard]]
-	static constexpr std::size_t alignOf(const uint64_t) noexcept {
+	static constexpr std::size_t alignOf(uint64_t) noexcept {
 		return 8;
 	}
 
 	[[nodiscard]]
-	static constexpr std::size_t alignOf(const int8_t)  noexcept {
+	static constexpr std::size_t alignOf(int8_t)  noexcept {
 		return 1;
 	}
 
 	[[nodiscard]]
-	static constexpr std::size_t alignOf(const int16_t) noexcept {
+	static constexpr std::size_t alignOf(int16_t) noexcept {
 		return 2;
 	}
 
 	[[nodiscard]]
-	static constexpr std::size_t alignOf(const int32_t) noexcept {
+	static constexpr std::size_t alignOf(int32_t) noexcept {
 		return 4;
 	}
 
 	[[nodiscard]]
-	static constexpr std::size_t alignOf(const int64_t) noexcept {
+	static constexpr std::size_t alignOf(int64_t) noexcept {
 		return 8;
 	}
 

src/olympic/keel/src/CMakeLists.txt

@@ -28,7 +28,7 @@ install(
 	DIRECTORY
 		../include/keel
 	DESTINATION
-		include/keel
+		include
 )
 
 install(
@@ -60,4 +60,11 @@ if(TURBINE_BUILD_TYPE STREQUAL "Native")
 			OxClaw
 			OxLogConn
 	)
+	install(
+		TARGETS
+			KeelPack-AppLib
+		DESTINATION
+			LIBRARY DESTINATION lib
+			ARCHIVE DESTINATION lib
+	)
 endif()

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

@@ -13,8 +13,9 @@ extern ox::String appVersion;
 
 namespace studio {
 
-AboutPopup::AboutPopup(turbine::Context &ctx) noexcept: Popup("About") {
-	m_text = ox::sfmt("{} - {}", keelCtx(ctx).appName, olympic::appVersion);
+AboutPopup::AboutPopup(turbine::Context &ctx) noexcept:
+	Popup("About"),
+	m_text{sfmt("{} - {}", keelCtx(ctx).appName, olympic::appVersion)} {
 }
 
 void AboutPopup::draw(Context &sctx) noexcept {

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

@@ -15,7 +15,7 @@ namespace studio {
 
 class AboutPopup final: public ig::Popup {
 	private:
-		ox::String m_text;
+		ox::String const m_text;
 
 	public:
 		explicit AboutPopup(turbine::Context &ctx) noexcept;

src/olympic/studio/applib/src/filedialogmanager.cpp

@@ -8,7 +8,7 @@
 
 namespace studio {
 
-studio::TaskState FileDialogManager::update(turbine::Context &ctx) noexcept {
+TaskState FileDialogManager::update(turbine::Context &ctx) noexcept {
 	switch (m_state) {
 		case UpdateProjectPathState::EnableSystemCursor: {
 			// switch to system cursor in this update and open file dialog in the next

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

@@ -31,7 +31,15 @@ static bool shutdownHandler(turbine::Context &ctx) {
 }
 
 void navigateTo(Context &ctx, ox::StringParam filePath, ox::StringParam navArgs) noexcept {
-	ctx.ui.navigateTo(std::move(filePath), std::move(navArgs));
+	ox::String path = std::move(filePath);
+	if (beginsWith(path, "uuid://")) {
+		auto [p, err] = keel::uuidUrlToPath(keelCtx(ctx), path);
+		if (err) {
+			return;
+		}
+		path = p;
+	}
+	ctx.ui.navigateTo(std::move(path), std::move(navArgs));
 }
 
 namespace ig {

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

@@ -27,6 +27,6 @@ inline keel::Context &keelCtx(Context &ctx) noexcept {
 	return keelCtx(ctx.tctx);
 }
 
-void navigateTo(Context &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

@@ -6,6 +6,8 @@
 
 #include <ox/event/signal.hpp>
 
+#include <turbine/turbine.hpp>
+
 #include "undostack.hpp"
 #include "widget.hpp"
 

src/olympic/studio/modlib/src/CMakeLists.txt

@@ -44,5 +44,5 @@ install(
 	DIRECTORY
 		../include/studio
 	DESTINATION
-		include/studio
+		include
 )

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

@@ -34,7 +34,7 @@ void setClipboardText(Context &ctx, ox::StringViewCR text) noexcept;
 
 void setClipboardObject(Context &ctx, ox::UPtr<BaseClipboardObject> &&obj) noexcept;
 
-ox::Result<BaseClipboardObject*> getClipboardData(Context &ctx, ox::StringView typeId) noexcept;
+ox::Result<BaseClipboardObject*> getClipboardData(Context &ctx, ox::StringViewCR typeId) noexcept;
 
 template<typename T>
 ox::Result<T*> getClipboardObject(Context &ctx) noexcept {

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

@@ -6,13 +6,9 @@
 
 #include <ox/fs/fs.hpp>
 #include <ox/model/desctypes.hpp>
-#include <ox/std/buffer.hpp>
-#include <ox/std/size.hpp>
 
 #include <keel/context.hpp>
 
-#include "input.hpp"
-
 namespace turbine {
 
 class Context;
@@ -47,10 +43,5 @@ T *applicationData(Context &ctx) noexcept {
 	return applicationDataRaw(ctx).get<T>();
 }
 
-void setKeyEventHandler(Context &ctx, KeyEventHandler h) noexcept;
-
-[[nodiscard]]
-KeyEventHandler keyEventHandler(Context &ctx) noexcept;
-
 }
 

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

@@ -1,17 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-namespace turbine {
-
-class Context;
-
-using UpdateHandler = int(*)(Context&);
-
-// Sets event handler that sleeps for the time given in the return value. The
-// sleep time is a minimum of ~16 milliseconds.
-void setUpdateHandler(Context &ctx, UpdateHandler) noexcept;
-
-}

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

@@ -21,11 +21,9 @@ class Drawer {
 		virtual void draw(Context&) noexcept = 0;
 };
 void addDrawer(Context &ctx, Drawer *cd) noexcept;
-void removeDrawer(Context &ctx, Drawer *cd) noexcept;
+void removeDrawer(Context &ctx, Drawer const *cd) noexcept;
 }
 
-ox::Error initGfx(Context &ctx) noexcept;
-
 ox::Error setWindowIcon(Context &ctx, ox::SpanView<ox::SpanView<uint8_t>> const &iconPngs) noexcept;
 
 void setWindowTitle(Context &ctx, ox::StringViewCR title) noexcept;

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

@@ -1,79 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#pragma once
-
-#include <ox/std/defines.hpp>
-
-namespace turbine {
-
-enum Key {
-	// GBA implementation currently relies on GamePad entry order
-	GamePad_A = 0,
-	GamePad_B,
-	GamePad_Select,
-	GamePad_Start,
-	GamePad_Right,
-	GamePad_Left,
-	GamePad_Up,
-	GamePad_Down,
-	GamePad_R,
-	GamePad_L,
-
-	Num_0,
-	Num_1,
-	Num_2,
-	Num_3,
-	Num_4,
-	Num_5,
-	Num_6,
-	Num_7,
-	Num_8,
-	Num_9,
-
-	Alpha_A,
-	Alpha_B,
-	Alpha_C,
-	Alpha_D,
-	Alpha_E,
-	Alpha_F,
-	Alpha_G,
-	Alpha_H,
-	Alpha_I,
-	Alpha_J,
-	Alpha_K,
-	Alpha_L,
-	Alpha_M,
-	Alpha_N,
-	Alpha_O,
-	Alpha_P,
-	Alpha_Q,
-	Alpha_R,
-	Alpha_S,
-	Alpha_T,
-	Alpha_U,
-	Alpha_V,
-	Alpha_W,
-	Alpha_X,
-	Alpha_Y,
-	Alpha_Z,
-
-	Mod_Alt,
-	Mod_Ctrl,
-	Mod_Super,
-	Mod_Shift,
-
-	Escape,
-
-	End
-};
-
-class Context;
-
-[[nodiscard]]
-bool buttonDown(Context const&ctx, Key) noexcept;
-
-using KeyEventHandler = void(*)(Context&, Key, bool);
-
-}

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

@@ -8,13 +8,85 @@
 #include <ox/fs/fs.hpp>
 
 #include "clipboard.hpp"
-#include "event.hpp"
 #include "gfx.hpp"
-#include "input.hpp"
 
 namespace turbine {
 
+class Context;
+
 using TimeMs = uint64_t;
+using UpdateHandler = int(*)(Context&);
+
+enum Key {
+	// GBA implementation currently relies on GamePad entry order
+	GamePad_A = 0,
+	GamePad_B,
+	GamePad_Select,
+	GamePad_Start,
+	GamePad_Right,
+	GamePad_Left,
+	GamePad_Up,
+	GamePad_Down,
+	GamePad_R,
+	GamePad_L,
+
+	Num_0,
+	Num_1,
+	Num_2,
+	Num_3,
+	Num_4,
+	Num_5,
+	Num_6,
+	Num_7,
+	Num_8,
+	Num_9,
+
+	Alpha_A,
+	Alpha_B,
+	Alpha_C,
+	Alpha_D,
+	Alpha_E,
+	Alpha_F,
+	Alpha_G,
+	Alpha_H,
+	Alpha_I,
+	Alpha_J,
+	Alpha_K,
+	Alpha_L,
+	Alpha_M,
+	Alpha_N,
+	Alpha_O,
+	Alpha_P,
+	Alpha_Q,
+	Alpha_R,
+	Alpha_S,
+	Alpha_T,
+	Alpha_U,
+	Alpha_V,
+	Alpha_W,
+	Alpha_X,
+	Alpha_Y,
+	Alpha_Z,
+
+	Mod_Alt,
+	Mod_Ctrl,
+	Mod_Super,
+	Mod_Shift,
+
+	Escape,
+
+	End
+};
+
+using KeyEventHandler = void(*)(Context&, Key, bool);
+
+void setKeyEventHandler(Context &ctx, KeyEventHandler h) noexcept;
+
+[[nodiscard]]
+KeyEventHandler keyEventHandler(Context &ctx) noexcept;
+
+[[nodiscard]]
+bool buttonDown(Context const&ctx, Key) noexcept;
 
 ox::Result<ox::UPtr<Context>> init(ox::UPtr<ox::FileSystem> &&fs, ox::StringViewCR appName) noexcept;
 
@@ -33,4 +105,8 @@ using ShutdownHandler = bool (*)(Context&);
 
 void setShutdownHandler(Context &ctx, ShutdownHandler handler) noexcept;
 
+// Sets event handler that sleeps for the time given in the return value. The
+// sleep time is a minimum of ~16 milliseconds.
+void setUpdateHandler(Context &ctx, UpdateHandler) noexcept;
+
 }

src/olympic/turbine/src/CMakeLists.txt

@@ -38,7 +38,7 @@ install(
 	DIRECTORY
 		../include/turbine
 	DESTINATION
-		include/turbine
+		include
 )
 
 install(

src/olympic/turbine/src/gba/CMakeLists.txt

@@ -6,8 +6,6 @@ target_sources(
 	Turbine-GBA PRIVATE
 		context.cpp
 		clipboard.cpp
-		event.cpp
-		gfx.cpp
 		irq.arm.cpp
 		turbine.arm.cpp
 		turbine.cpp

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

@@ -5,6 +5,7 @@
 #include <ox/std/string.hpp>
 
 #include <turbine/context.hpp>
+#include <turbine/clipboard.hpp>
 
 namespace turbine {
 
@@ -15,4 +16,8 @@ ox::String getClipboardText(Context&) noexcept {
 void setClipboardText(Context&, ox::StringViewCR) noexcept {
 }
 
+ox::Result<BaseClipboardObject*> getClipboardData(Context&, ox::StringViewCR) noexcept {
+	return ox::Error{1, "not implemented"};
+}
+
 }

src/olympic/turbine/src/gba/context.hpp

@@ -6,9 +6,8 @@
 
 #include <keel/context.hpp>
 
-#include <turbine/clipboard.hpp>
 #include <turbine/context.hpp>
-#include <turbine/event.hpp>
+#include <turbine/turbine.hpp>
 
 namespace turbine {
 

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

@@ -1,23 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#include <turbine/event.hpp>
-
-#include "context.hpp"
-
-namespace turbine {
-
-void setUpdateHandler(Context &ctx, UpdateHandler h) noexcept {
-	ctx.updateHandler = h;
-}
-
-void setKeyEventHandler(Context &ctx, KeyEventHandler h) noexcept {
-	ctx.keyEventHandler = h;
-}
-
-KeyEventHandler keyEventHandler(Context &ctx) noexcept {
-	return ctx.keyEventHandler;
-}
-
-}

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

@@ -1,50 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#include <ox/std/size.hpp>
-#include <ox/std/stringview.hpp>
-
-#include <teagba/addresses.hpp>
-#include <teagba/gfx.hpp>
-#include <teagba/irq.hpp>
-
-#include <turbine/context.hpp>
-
-namespace turbine {
-
-ox::Error initGfx(Context&) noexcept {
-	REG_DISPCTL = teagba::DispCtl_Mode0
-	            | teagba::DispCtl_SpriteMap1D
-	            | teagba::DispCtl_Obj;
-	// tell display to trigger vblank interrupts
-	REG_DISPSTAT = REG_DISPSTAT | teagba::DispStat_irq_vblank;
-	// enable vblank interrupt
-	REG_IE = REG_IE | teagba::Int_vblank;
-	return {};
-}
-
-void setWindowTitle(Context&, ox::StringViewCR) noexcept {
-}
-
-int getScreenWidth(Context const&) noexcept {
-	return 240;
-}
-
-int getScreenHeight(Context const&) noexcept {
-	return 160;
-}
-
-ox::Size getScreenSize(Context const&) noexcept {
-	return {240, 160};
-}
-
-ox::Bounds getWindowBounds(Context const&) noexcept {
-	return {0, 0, 240, 160};
-}
-
-ox::Error setWindowBounds(Context&, ox::Bounds const&) noexcept {
-	return ox::Error(1, "setWindowBounds not supported on GBA");
-}
-
-}

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

@@ -3,8 +3,10 @@
  */
 
 #include <teagba/addresses.hpp>
+#include <teagba/gfx.hpp>
 #include <teagba/irq.hpp>
 
+
 #include <keel/keel.hpp>
 #include <turbine/context.hpp>
 #include <turbine/gfx.hpp>
@@ -58,6 +60,40 @@ OX_ALLOW_UNSAFE_BUFFERS_END
 	return ox::Error(1);
 }
 
+static ox::Error initGfx(Context&) noexcept {
+	REG_DISPCTL = teagba::DispCtl_Mode0
+				| teagba::DispCtl_SpriteMap1D
+				| teagba::DispCtl_Obj;
+	// tell display to trigger vblank interrupts
+	REG_DISPSTAT = REG_DISPSTAT | teagba::DispStat_irq_vblank;
+	// enable vblank interrupt
+	REG_IE = REG_IE | teagba::Int_vblank;
+	return {};
+}
+
+void setWindowTitle(Context&, ox::StringViewCR) noexcept {
+}
+
+int getScreenWidth(Context const&) noexcept {
+	return 240;
+}
+
+int getScreenHeight(Context const&) noexcept {
+	return 160;
+}
+
+ox::Size getScreenSize(Context const&) noexcept {
+	return {240, 160};
+}
+
+ox::Bounds getWindowBounds(Context const&) noexcept {
+	return {0, 0, 240, 160};
+}
+
+ox::Error setWindowBounds(Context&, ox::Bounds const&) noexcept {
+	return ox::Error(1, "setWindowBounds not supported on GBA");
+}
+
 ox::Result<ox::UPtr<Context>> init(
 		ox::UPtr<ox::FileSystem> &&fs, ox::StringViewCR appName) noexcept {
 	auto ctx = ox::make_unique<Context>();
@@ -68,7 +104,7 @@ ox::Result<ox::UPtr<Context>> init(
 	OX_RETURN_ERROR(initGfx(*ctx));
 	initTimer();
 	initIrq();
-	return ox::UPtr<Context>(std::move(ctx));
+	return ctx;
 }
 
 void shutdown(Context&) noexcept {
@@ -89,4 +125,16 @@ void requestShutdown(Context &ctx, bool) noexcept {
 void setShutdownHandler(Context&, ShutdownHandler) noexcept {
 }
 
+void setUpdateHandler(Context &ctx, UpdateHandler h) noexcept {
+	ctx.updateHandler = h;
+}
+
+void setKeyEventHandler(Context &ctx, KeyEventHandler h) noexcept {
+	ctx.keyEventHandler = h;
+}
+
+KeyEventHandler keyEventHandler(Context &ctx) noexcept {
+	return ctx.keyEventHandler;
+}
+
 }

src/olympic/turbine/src/glfw/CMakeLists.txt

@@ -5,8 +5,6 @@ target_sources(
 	Turbine PRIVATE
 		context.cpp
 		clipboard.cpp
-		event.cpp
-		gfx.cpp
 		turbine.cpp
 )
 

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

@@ -28,7 +28,7 @@ void setClipboardObject(Context &ctx, ox::UPtr<BaseClipboardObject> &&obj) noexc
 	ctx.clipboard = std::move(obj);
 }
 
-ox::Result<BaseClipboardObject*> getClipboardData(Context &ctx, ox::StringView typeId) noexcept {
+ox::Result<BaseClipboardObject*> getClipboardData(Context &ctx, ox::StringViewCR typeId) noexcept {
 	if (ctx.clipboard && ctx.clipboard->typeId() == typeId) {
 		return ctx.clipboard.get();
 	}

src/olympic/turbine/src/glfw/context.hpp

@@ -7,7 +7,6 @@
 #include <turbine/clipboard.hpp>
 #include <turbine/context.hpp>
 #include <turbine/gfx.hpp>
-#include <turbine/event.hpp>
 #include <turbine/turbine.hpp>
 
 namespace turbine {

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

@@ -1,23 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#include <turbine/event.hpp>
-
-#include "context.hpp"
-
-namespace turbine {
-
-void setUpdateHandler(Context &ctx, UpdateHandler h) noexcept {
-	ctx.updateHandler = h;
-}
-
-void setKeyEventHandler(Context &ctx, KeyEventHandler h) noexcept {
-	ctx.keyEventHandler = h;
-}
-
-KeyEventHandler keyEventHandler(Context &ctx) noexcept {
-	return ctx.keyEventHandler;
-}
-
-}

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

@@ -1,324 +0,0 @@
-/*
- * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
- */
-
-#include <glad/glad.h>
-#include <GLFW/glfw3.h>
-#include <lodepng.h>
-#if TURBINE_USE_IMGUI
-#include <imgui_impl_glfw.h>
-#include <imgui_impl_opengl3.h>
-#endif
-
-#include "config.hpp"
-
-#include <ox/std/span.hpp>
-
-#include "context.hpp"
-
-namespace turbine {
-
-namespace gl {
-
-void addDrawer(Context &ctx, Drawer *cd) noexcept {
-	ctx.drawers.emplace_back(cd);
-}
-
-void removeDrawer(Context &ctx, Drawer *cd) noexcept {
-	for (auto i = 0u; i < ctx.drawers.size(); ++i) {
-		if (ctx.drawers[i] == cd) {
-			std::ignore = ctx.drawers.erase(i);
-			break;
-		}
-	}
-}
-
-}
-
-static void handleGlfwError(int err, char const*desc) noexcept {
-	oxErrf("GLFW error ({}): {}\n", err, desc);
-}
-
-static auto setKeyDownStatus(Context &ctx, Key key, bool down) noexcept {
-	ctx.keysDown &= ~(1llu << static_cast<int>(key));
-	ctx.keysDown |= static_cast<uint64_t>(down) << static_cast<int>(key);
-}
-
-static void handleKeyPress(Context &ctx, int key, bool down) noexcept {
-	static constexpr auto keyMap = [] {
-		ox::Array<Key, GLFW_KEY_LAST> map = {};
-		for (auto i = 0u; i < 26; ++i) {
-			map[GLFW_KEY_A + i] = static_cast<Key>(static_cast<unsigned>(Key::Alpha_A) + i);
-		}
-		for (auto i = 0u; i < 10; ++i) {
-			map[GLFW_KEY_0 + i] = static_cast<Key>(static_cast<unsigned>(Key::Num_0) + i);
-		}
-		map[GLFW_KEY_LEFT_ALT]      = Key::Mod_Alt;
-		map[GLFW_KEY_RIGHT_ALT]     = Key::Mod_Alt;
-		map[GLFW_KEY_LEFT_CONTROL]  = Key::Mod_Ctrl;
-		map[GLFW_KEY_RIGHT_CONTROL] = Key::Mod_Ctrl;
-		map[GLFW_KEY_LEFT_SUPER]    = Key::Mod_Super;
-		map[GLFW_KEY_RIGHT_SUPER]   = Key::Mod_Super;
-		map[GLFW_KEY_LEFT_SHIFT]    = Key::Mod_Shift;
-		map[GLFW_KEY_RIGHT_SHIFT]   = Key::Mod_Shift;
-		map[GLFW_KEY_ESCAPE]        = Key::Escape;
-		return map;
-	}();
-	auto const eventHandler = keyEventHandler(ctx);
-	auto const keyIdx = static_cast<std::size_t>(key);
-	if (keyIdx < keyMap.size()) {
-		auto const k = keyMap[keyIdx];
-		setKeyDownStatus(ctx, k, down);
-		if (eventHandler) {
-			eventHandler(ctx, k, down);
-		}
-	}
-}
-
-static void handleGlfwCursorPosEvent(GLFWwindow*, double, double) noexcept {
-}
-
-static void handleGlfwMouseButtonEvent(GLFWwindow *window, int, int, int) noexcept {
-	auto &ctx = *static_cast<Context*>(glfwGetWindowUserPointer(window));
-	ctx.mandatoryRefreshPeriodEnd = ticksMs(ctx) + config::MandatoryRefreshPeriod;
-}
-
-static void handleGlfwKeyEvent(GLFWwindow *window, int key, int, int action, int) noexcept {
-	auto &ctx = *static_cast<Context*>(glfwGetWindowUserPointer(window));
-	ctx.mandatoryRefreshPeriodEnd = ticksMs(ctx) + config::MandatoryRefreshPeriod;
-	if (action == GLFW_PRESS) {
-		handleKeyPress(ctx, key, true);
-	} else if (action == GLFW_RELEASE) {
-		handleKeyPress(ctx, key, false);
-	}
-}
-
-static void handleGlfwWindowCloseEvent(GLFWwindow *window) noexcept {
-	auto &ctx = *static_cast<Context*>(glfwGetWindowUserPointer(window));
-	ctx.mandatoryRefreshPeriodEnd = ticksMs(ctx) + config::MandatoryRefreshPeriod;
-	ctx.running = ctx.shutdownHandler ? !ctx.shutdownHandler(ctx) : false;
-	glfwSetWindowShouldClose(window, !ctx.running);
-	glfwPostEmptyEvent();
-}
-
-#if TURBINE_USE_IMGUI
-static void themeImgui() noexcept {
-	// Dark Ruda style by Raikiri from ImThemes
-	auto &style = ImGui::GetStyle();
-	style.Alpha = 1.0;
-	style.DisabledAlpha = 0.6000000238418579;
-	style.WindowPadding = ImVec2(8.0, 8.0);
-	style.WindowRounding = 0.0;
-	style.WindowBorderSize = 1.0;
-	style.WindowMinSize = ImVec2(32.0, 32.0);
-	style.WindowTitleAlign = ImVec2(0.0, 0.5);
-	style.WindowMenuButtonPosition = ImGuiDir_Left;
-	style.ChildRounding = 0.0;
-	style.ChildBorderSize = 1.0;
-	style.PopupRounding = 0.0;
-	style.PopupBorderSize = 1.0;
-	style.FramePadding = ImVec2(4.0, 3.0);
-	// custom value
-	style.FrameRounding = 3.0;
-	style.FrameBorderSize = 0.0;
-	style.ItemSpacing = ImVec2(8.0, 4.0);
-	style.ItemInnerSpacing = ImVec2(4.0, 4.0);
-	style.CellPadding = ImVec2(4.0, 2.0);
-	style.IndentSpacing = 21.0;
-	style.ColumnsMinSpacing = 6.0;
-	style.ScrollbarSize = 14.0;
-	style.ScrollbarRounding = 9.0;
-	style.GrabMinSize = 10.0;
-	style.GrabRounding = 4.0;
-	style.TabRounding = 4.0;
-	style.TabBorderSize = 0.0;
-	style.TabMinWidthForCloseButton = 0.0;
-	style.ColorButtonPosition = ImGuiDir_Right;
-	style.ButtonTextAlign = ImVec2(0.5, 0.5);
-	style.SelectableTextAlign = ImVec2(0.0, 0.0);
-	// colors
-	constexpr auto imVec4 = [](double r, double g, double b, double a) {
-		return ImVec4(
-				static_cast<float>(r),
-				static_cast<float>(g),
-				static_cast<float>(b),
-				static_cast<float>(a));
-	};
-	auto colors = ox::Span(style.Colors);
-	colors[ImGuiCol_Text] = imVec4(0.9490196108818054, 0.95686274766922, 0.9764705896377563, 1.0);
-	colors[ImGuiCol_TextDisabled] = imVec4(0.3568627536296844, 0.4196078479290009, 0.4666666686534882, 1.0);
-	colors[ImGuiCol_WindowBg] = imVec4(0.1098039224743843, 0.1490196138620377, 0.168627455830574, 1.0);
-	colors[ImGuiCol_ChildBg] = imVec4(0.1490196138620377, 0.1764705926179886, 0.2196078449487686, 1.0);
-	colors[ImGuiCol_PopupBg] = imVec4(0.0784313753247261, 0.0784313753247261, 0.0784313753247261, 0.9399999976158142);
-	colors[ImGuiCol_Border] = imVec4(0.0784313753247261, 0.09803921729326248, 0.1176470592617989, 1.0);
-	colors[ImGuiCol_BorderShadow] = imVec4(0.0, 0.0, 0.0, 0.0);
-	colors[ImGuiCol_FrameBg] = imVec4(0.2000000029802322, 0.2470588237047195, 0.2862745225429535, 1.0);
-	colors[ImGuiCol_FrameBgHovered] = imVec4(0.1176470592617989, 0.2000000029802322, 0.2784313857555389, 1.0);
-	colors[ImGuiCol_FrameBgActive] = imVec4(0.08627451211214066, 0.1176470592617989, 0.1372549086809158, 1.0);
-	colors[ImGuiCol_TitleBg] = imVec4(0.08627451211214066, 0.1176470592617989, 0.1372549086809158, 0.6499999761581421);
-	colors[ImGuiCol_TitleBgActive] = imVec4(0.0784313753247261, 0.09803921729326248, 0.1176470592617989, 1.0);
-	colors[ImGuiCol_TitleBgCollapsed] = imVec4(0.0, 0.0, 0.0, 0.5099999904632568);
-	colors[ImGuiCol_MenuBarBg] = imVec4(0.1490196138620377, 0.1764705926179886, 0.2196078449487686, 1.0);
-	colors[ImGuiCol_ScrollbarBg] = imVec4(0.01960784383118153, 0.01960784383118153, 0.01960784383118153, 0.3899999856948853);
-	colors[ImGuiCol_ScrollbarGrab] = imVec4(0.2000000029802322, 0.2470588237047195, 0.2862745225429535, 1.0);
-	colors[ImGuiCol_ScrollbarGrabHovered] = imVec4(0.1764705926179886, 0.2196078449487686, 0.2470588237047195, 1.0);
-	colors[ImGuiCol_ScrollbarGrabActive] = imVec4(0.08627451211214066, 0.2078431397676468, 0.3098039329051971, 1.0);
-	colors[ImGuiCol_CheckMark] = imVec4(0.2784313857555389, 0.5568627715110779, 1.0, 1.0);
-	colors[ImGuiCol_SliderGrab] = imVec4(0.2784313857555389, 0.5568627715110779, 1.0, 1.0);
-	colors[ImGuiCol_SliderGrabActive] = imVec4(0.3686274588108063, 0.6078431606292725, 1.0, 1.0);
-	colors[ImGuiCol_Button] = imVec4(0.2000000029802322, 0.2470588237047195, 0.2862745225429535, 1.0);
-	colors[ImGuiCol_ButtonHovered] = imVec4(0.2784313857555389, 0.5568627715110779, 1.0, 1.0);
-	colors[ImGuiCol_ButtonActive] = imVec4(0.05882352963089943, 0.529411792755127, 0.9764705896377563, 1.0);
-	// custom value
-	colors[ImGuiCol_Header] = imVec4(0.4000000029802322, 0.4470588237047195, 0.4862745225429535, 0.550000011920929);
-	colors[ImGuiCol_HeaderHovered] = imVec4(0.2588235437870026, 0.5882353186607361, 0.9764705896377563, 0.800000011920929);
-	colors[ImGuiCol_HeaderActive] = imVec4(0.2588235437870026, 0.5882353186607361, 0.9764705896377563, 1.0);
-	colors[ImGuiCol_Separator] = imVec4(0.2000000029802322, 0.2470588237047195, 0.2862745225429535, 1.0);
-	colors[ImGuiCol_SeparatorHovered] = imVec4(0.09803921729326248, 0.4000000059604645, 0.7490196228027344, 0.7799999713897705);
-	colors[ImGuiCol_SeparatorActive] = imVec4(0.09803921729326248, 0.4000000059604645, 0.7490196228027344, 1.0);
-	colors[ImGuiCol_ResizeGrip] = imVec4(0.2588235437870026, 0.5882353186607361, 0.9764705896377563, 0.25);
-	colors[ImGuiCol_ResizeGripHovered] = imVec4(0.2588235437870026, 0.5882353186607361, 0.9764705896377563, 0.6700000166893005);
-	colors[ImGuiCol_ResizeGripActive] = imVec4(0.2588235437870026, 0.5882353186607361, 0.9764705896377563, 0.949999988079071);
-	colors[ImGuiCol_Tab] = imVec4(0.1098039224743843, 0.1490196138620377, 0.168627455830574, 1.0);
-	colors[ImGuiCol_TabHovered] = imVec4(0.2588235437870026, 0.5882353186607361, 0.9764705896377563, 0.800000011920929);
-	colors[ImGuiCol_TabActive] = imVec4(0.2000000029802322, 0.2470588237047195, 0.2862745225429535, 1.0);
-	colors[ImGuiCol_TabUnfocused] = imVec4(0.1098039224743843, 0.1490196138620377, 0.168627455830574, 1.0);
-	colors[ImGuiCol_TabUnfocusedActive] = imVec4(0.1098039224743843, 0.1490196138620377, 0.168627455830574, 1.0);
-	colors[ImGuiCol_PlotLines] = imVec4(0.6078431606292725, 0.6078431606292725, 0.6078431606292725, 1.0);
-	colors[ImGuiCol_PlotLinesHovered] = imVec4(1.0, 0.4274509847164154, 0.3490196168422699, 1.0);
-	colors[ImGuiCol_PlotHistogram] = imVec4(0.8980392217636108, 0.6980392336845398, 0.0, 1.0);
-	colors[ImGuiCol_PlotHistogramHovered] = imVec4(1.0, 0.6000000238418579, 0.0, 1.0);
-	colors[ImGuiCol_TableHeaderBg] = imVec4(0.1882352977991104, 0.1882352977991104, 0.2000000029802322, 1.0);
-	colors[ImGuiCol_TableBorderStrong] = imVec4(0.3098039329051971, 0.3098039329051971, 0.3490196168422699, 1.0);
-	colors[ImGuiCol_TableBorderLight] = imVec4(0.2274509817361832, 0.2274509817361832, 0.2470588237047195, 1.0);
-	colors[ImGuiCol_TableRowBg] = imVec4(0.0, 0.0, 0.0, 0.0);
-	colors[ImGuiCol_TableRowBgAlt] = imVec4(1.0, 1.0, 1.0, 0.05999999865889549);
-	colors[ImGuiCol_TextSelectedBg] = imVec4(0.2588235437870026, 0.5882353186607361, 0.9764705896377563, 0.3499999940395355);
-	colors[ImGuiCol_DragDropTarget] = imVec4(1.0, 1.0, 0.0, 0.8999999761581421);
-	colors[ImGuiCol_NavHighlight] = imVec4(0.2588235437870026, 0.5882353186607361, 0.9764705896377563, 1.0);
-	colors[ImGuiCol_NavWindowingHighlight] = imVec4(1.0, 1.0, 1.0, 0.699999988079071);
-	colors[ImGuiCol_NavWindowingDimBg] = imVec4(0.800000011920929, 0.800000011920929, 0.800000011920929, 0.2000000029802322);
-	colors[ImGuiCol_ModalWindowDimBg] = imVec4(0.800000011920929, 0.800000011920929, 0.800000011920929, 0.3499999940395355);
-}
-#endif
-
-ox::Error initGfx(Context &ctx) noexcept {
-	glfwSetErrorCallback(handleGlfwError);
-	glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
-	glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 3);
-	glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-	glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE);
-	glfwWindowHint(GLFW_RESIZABLE, GLFW_TRUE);
-	constexpr auto Scale = 5;
-	ctx.window = glfwCreateWindow(240 * Scale, 160 * Scale, ctx.keelCtx.appName.c_str(), nullptr, nullptr);
-	//ctx.window = glfwCreateWindow(876, 743, ctx.keelCtx.appName.c_str(), nullptr, nullptr);
-	if (ctx.window == nullptr) {
-		return ox::Error(1, "Could not open GLFW window");
-	}
-	glfwSetCursorPosCallback(ctx.window, handleGlfwCursorPosEvent);
-	glfwSetMouseButtonCallback(ctx.window, handleGlfwMouseButtonEvent);
-	glfwSetKeyCallback(ctx.window, handleGlfwKeyEvent);
-	glfwSetWindowCloseCallback(ctx.window, handleGlfwWindowCloseEvent);
-	glfwSetWindowUserPointer(ctx.window, &ctx);
-	glfwMakeContextCurrent(ctx.window);
-	if (!gladLoadGLES2Loader(reinterpret_cast<GLADloadproc>(glfwGetProcAddress))) {
-		return ox::Error(2, "Could not init Glad");
-	}
-#if TURBINE_USE_IMGUI
-	IMGUI_CHECKVERSION();
-	ImGui::CreateContext();
-	auto &io = ImGui::GetIO();
-	io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard;
-	//io.MouseDrawCursor = true;
-	ImGui_ImplGlfw_InitForOpenGL(ctx.window, true);
-	ImGui_ImplOpenGL3_Init();
-	io.IniFilename = nullptr;
-	themeImgui();
-#endif
-	return {};
-}
-
-struct IconData {
-	std::vector<uint8_t> pixels;
-	int w{}, h{};
-};
-
-[[nodiscard]]
-[[maybe_unused]]
-static ox::Result<IconData> toGlfwImgPixels(ox::SpanView<uint8_t> const &iconPng) noexcept {
-	ox::Result<IconData> out;
-	unsigned w{}, h{};
-	if (lodepng::decode(out.value.pixels, w, h, iconPng.data(), iconPng.size())) {
-		return ox::Error{1, "unable to decode window icon PNG data"};
-	}
-	out.value.w = static_cast<int>(w);
-	out.value.h = static_cast<int>(h);
-	return out;
-}
-
-ox::Error setWindowIcon(Context &ctx, ox::SpanView<ox::SpanView<uint8_t>> const &iconPngs) noexcept {
-	if constexpr(ox::defines::OS != ox::OS::Darwin) {
-		ox::Vector<IconData, 8> src;
-		ox::Vector<GLFWimage, 8> imgs;
-		for (auto const &iconPng : iconPngs) {
-			OX_RETURN_ERROR(toGlfwImgPixels(iconPng).moveTo(src.emplace_back()));
-			auto &icon = *src.back().unwrap();
-			imgs.emplace_back(GLFWimage{
-				.width = icon.w,
-				.height = icon.h,
-				.pixels = icon.pixels.data(),
-			});
-		}
-		glfwSetWindowIcon(ctx.window, static_cast<int>(imgs.size()), imgs.data());
-	}
-	return {};
-}
-
-void setWindowTitle(Context &ctx, ox::StringViewCR title) noexcept {
-	auto cstr = ox_malloca(title.bytes() + 1, char);
-	OX_ALLOW_UNSAFE_BUFFERS_BEGIN
-	ox::strncpy(cstr.get(), title.data(), title.bytes());
-	OX_ALLOW_UNSAFE_BUFFERS_END
-	glfwSetWindowTitle(ctx.window, cstr.get());
-}
-
-void focusWindow(Context &ctx) noexcept {
-	glfwFocusWindow(ctx.window);
-}
-
-int getScreenWidth(Context const &ctx) noexcept {
-	int w = 0, h = 0;
-	glfwGetFramebufferSize(ctx.window, &w, &h);
-	return w;
-}
-
-int getScreenHeight(Context const &ctx) noexcept {
-	int w = 0, h = 0;
-	glfwGetFramebufferSize(ctx.window, &w, &h);
-	return h;
-}
-
-ox::Size getScreenSize(Context const &ctx) noexcept {
-	int w = 0, h = 0;
-	glfwGetFramebufferSize(ctx.window, &w, &h);
-	return {w, h};
-}
-
-ox::Bounds getWindowBounds(Context const &ctx) noexcept {
-	ox::Bounds bnds;
-	glfwGetWindowPos(ctx.window, &bnds.x, &bnds.y);
-	glfwGetWindowSize(ctx.window, &bnds.width, &bnds.height);
-	return bnds;
-}
-
-ox::Error setWindowBounds(Context &ctx, ox::Bounds const&bnds) noexcept {
-	glfwSetWindowPos(ctx.window, bnds.x, bnds.y);
-	glfwSetWindowSize(ctx.window, bnds.width, bnds.height);
-	return {};
-}
-
-void setRefreshWithin(Context &ctx, int ms) noexcept {
-	ctx.refreshWithinMs = ox::min(ms, ctx.refreshWithinMs);
-}
-
-}