[studio] Add subcommands output on invalid subcommand dispatch

a787fef61 Uncomment code that from Pico fix
298184d58 Fix build warning
51999199c [ox] Fix build problems on Raspberry Pi Pico
682fc5b85 Merge commit 'c286e3794d9d4cc571671548ad765ce370bcfcb4'
94209fd74 [ox/std] Make is_integral use raw types

git-subtree-dir: deps/oxlib
git-subtree-split: a787fef6147dcd11519c24f992289349f0ec355d

CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.25)
 set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19
 
 if(BUILDCORE_TARGET STREQUAL "gba")
@@ -52,7 +52,7 @@ if(NOT BUILDCORE_TARGET STREQUAL "gba")
 	set(GLFW_BUILD_TESTS OFF)
 	set(GLFW_BUILD_DOCS OFF)
 	if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
-		set(GLFW_BUILD_WAYLAND OFF)
+		set(GLFW_BUILD_WAYLAND ON)
 	endif()
 	add_subdirectory(deps/glfw)
 	add_subdirectory(deps/glutils)

deps/oxlib/.gitignore

@@ -3,6 +3,7 @@ build/gba
 build/*-asan
 build/*-debug
 build/*-release
+dist
 .current_build
 tags
 compile_commands.json

deps/oxlib/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.19)
+cmake_minimum_required(VERSION 3.25)
 set(CMAKE_POLICY_DEFAULT_CMP0110 NEW) # requires CMake 3.19
 
 project(Ox CXX)

deps/oxlib/src/claw/include/ox/claw/write.hpp

@@ -120,4 +120,24 @@ Result<Buffer> writeClaw(
 	return out;
 }
 
+Error writeClaw(
+		auto const &obj,
+		Writer_c auto &writer,
+		ClawFormat const fmt = ClawFormat::Metal) noexcept {
+	OX_RETURN_ERROR(detail::writeClawHeader(writer, &obj, fmt));
+#ifdef OX_USE_STDLIB
+	if (fmt == ClawFormat::Metal) {
+		OX_RETURN_ERROR(writeMC(writer, obj));
+	} else if (fmt == ClawFormat::Organic) {
+		OX_RETURN_ERROR(writeOC(writer, obj));
+	}
+#else
+	if (fmt != ClawFormat::Metal) {
+		return ox::Error(1, "OC is not supported in this build");
+	}
+	OX_RETURN_ERROR(writeMC(writer, obj));
+#endif
+	return {};
+}
+
 }

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

@@ -38,17 +38,6 @@ const std::map<ox::StringView, std::function<ox::Error(ox::StringView)>> tests =
 				auto a1 = buffer->malloc(sizeof(String)).value;
 				auto a2 = buffer->malloc(sizeof(String)).value;
 				oxAssert(a1.valid(), "Allocation 1 failed.");
-				oxAssert(a2.valid(), "Allocation 2 failed.");
-				auto s1Buff = buffer->dataOf<String>(a1);
-				auto s2Buff = buffer->dataOf<String>(a2);
-				oxAssert(s1Buff.valid(), "s1 allocation 1 failed.");
-				oxAssert(s2Buff.valid(), "s2 allocation 2 failed.");
-				auto &s1 = *new (s1Buff) String("asdf");
-				auto &s2 = *new (s2Buff) String("aoeu");
-				oxTrace("test") << "s1: " << s1.c_str();
-				oxTrace("test") << "s2: " << s2.c_str();
-				oxAssert(s1 == "asdf", "Allocation 1 not as expected.");
-				oxAssert(s2 == "aoeu", "Allocation 2 not as expected.");
 				oxAssert(buffer->free(a1), "Free failed.");
 				oxAssert(buffer->free(a2), "Free failed.");
 				oxAssert(buffer->setSize(buffer->size() - buffer->available()), "Resize failed.");

deps/oxlib/src/logconn/src/logconn.cpp

@@ -6,7 +6,9 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-#ifdef OX_USE_STDLIB
+#include <ox/std/defines.hpp>
+
+#ifndef OX_OS_BareMetal
 #include <cstdio>
 
 #ifndef _WIN32

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

@@ -44,15 +44,7 @@ class MetalClawWriter: public ModelHandlerBase<MetalClawWriter<Writer>, OpType::
 
 		constexpr ~MetalClawWriter() noexcept = default;
 
-		constexpr Error field(CString, int8_t const *val) noexcept;
-		constexpr Error field(CString, int16_t const *val) noexcept;
-		constexpr Error field(CString, int32_t const *val) noexcept;
-		constexpr Error field(CString, int64_t const *val) noexcept;
-
-		constexpr Error field(CString, uint8_t const *val) noexcept;
-		constexpr Error field(CString, uint16_t const *val) noexcept;
-		constexpr Error field(CString, uint32_t const *val) noexcept;
-		constexpr Error field(CString, uint64_t const *val) noexcept;
+		constexpr Error field(CString, Integer_c auto const *val) noexcept;
 
 		constexpr Error field(CString, bool const *val) noexcept;
 
@@ -133,42 +125,7 @@ constexpr MetalClawWriter<Writer>::MetalClawWriter(Writer &writer, Optional<int>
 }
 
 template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, int8_t const *val) noexcept {
-	return appendInteger(*val);
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, int16_t const *val) noexcept {
-	return appendInteger(*val);
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, int32_t const *val) noexcept {
-	return appendInteger(*val);
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, int64_t const *val) noexcept {
-	return appendInteger(*val);
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, uint8_t const *val) noexcept {
-	return appendInteger(*val);
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, uint16_t const *val) noexcept {
-	return appendInteger(*val);
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, uint32_t const *val) noexcept {
-	return appendInteger(*val);
-}
-
-template<Writer_c Writer>
-constexpr Error MetalClawWriter<Writer>::field(CString, uint64_t const *val) noexcept {
+constexpr Error MetalClawWriter<Writer>::field(CString, Integer_c auto const *val) noexcept {
 	return appendInteger(*val);
 }
 

deps/oxlib/src/mc/test/tests.cpp

@@ -43,14 +43,14 @@ struct TestStruct {
 	int32_t Int6 = 0;
 	int32_t Int7 = 0;
 	int32_t Int8 = 0;
-	int unionIdx = 1;
+	int32_t unionIdx = 1;
 	TestUnion Union;
 	ox::String String;
 	ox::IString<32> IString = "";
 	uint32_t List[4] = {0, 0, 0, 0};
 	ox::Vector<uint32_t> Vector = {1, 2, 3, 4, 5};
 	ox::Vector<uint32_t> Vector2 = {1, 2, 3, 4, 5};
-	ox::HashMap<ox::String, int> Map;
+	ox::HashMap<ox::String, int32_t> Map;
 	TestStructNest EmptyStruct;
 	TestStructNest Struct;
 	constexpr ~TestStruct() noexcept {
@@ -204,7 +204,8 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 						std::cout << "val.length: " << val.length << '\n';
 						return ox::Error(1);
 					}
-					ox::LittleEndian<decltype(expected)> decoded = *reinterpret_cast<decltype(expected)*>(&val.data[1]);
+					ox::LittleEndian<decltype(expected)> decoded;
+					ox::memcpy(&decoded, &val.data[1], sizeof(decoded));
 					if (expected != decoded) {
 						std::cout << "decoded: " << decoded << ", expected: " << expected << '\n';
 						return ox::Error(1);
@@ -370,7 +371,7 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 				 const auto [type, typeErr] = ox::buildTypeDef(typeStore, testIn);
 				 oxAssert(typeErr, "Descriptor write failed");
 				 ox::BufferReader br({dataBuff, dataBuffLen});
-				 OX_RETURN_ERROR(ox::walkModel<ox::MetalClawReader>(type, br,
+				 return ox::walkModel<ox::MetalClawReader>(type, br,
 					[](const ox::Vector<ox::FieldName>&, const ox::Vector<ox::String>&, const ox::DescriptorField &f, ox::MetalClawReader *rdr) -> ox::Error {
 						//std::cout << f.fieldName.c_str() << '\n';
 						auto fieldName = f.fieldName.c_str();
@@ -455,8 +456,7 @@ std::map<ox::StringView, ox::Error(*)()> tests = {
 						}
 						return ox::Error(0);
 					}
-				));
-				return ox::Error(0);
+				);
 			}
 		},
 	}

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

@@ -126,22 +126,7 @@ class TypeDescWriter {
 
 	private:
 		[[nodiscard]]
-		constexpr const DescriptorType *type(const int8_t *val) const noexcept;
-		[[nodiscard]]
-		constexpr const DescriptorType *type(const int16_t *val) const noexcept;
-		[[nodiscard]]
-		constexpr const DescriptorType *type(const int32_t *val) const noexcept;
-		[[nodiscard]]
-		constexpr const DescriptorType *type(const int64_t *val) const noexcept;
-
-		[[nodiscard]]
-		constexpr const DescriptorType *type(const uint8_t *val) const noexcept;
-		[[nodiscard]]
-		constexpr const DescriptorType *type(const uint16_t *val) const noexcept;
-		[[nodiscard]]
-		constexpr const DescriptorType *type(const uint32_t *val) const noexcept;
-		[[nodiscard]]
-		constexpr const DescriptorType *type(const uint64_t *val) const noexcept;
+		constexpr const DescriptorType *type(const Integer_c auto *val) const noexcept;
 
 		[[nodiscard]]
 		constexpr const DescriptorType *type(const bool *val) const noexcept;
@@ -295,52 +280,26 @@ constexpr const DescriptorType *TypeDescWriter::type(UnionView<U> val) const noe
 	return t;
 }
 
-constexpr const DescriptorType *TypeDescWriter::type(const int8_t*) const noexcept {
-	constexpr auto PT = PrimitiveType::SignedInteger;
-	constexpr auto Bytes = 1;
-	return getType(types::Int8, 0, PT, Bytes);
-}
-
-constexpr const DescriptorType *TypeDescWriter::type(const int16_t*) const noexcept {
-	constexpr auto PT = PrimitiveType::SignedInteger;
-	constexpr auto Bytes = 2;
-	return getType(types::Int16, 0, PT, Bytes);
-}
-
-constexpr const DescriptorType *TypeDescWriter::type(const int32_t*) const noexcept {
-	constexpr auto PT = PrimitiveType::SignedInteger;
-	constexpr auto Bytes = 4;
-	return getType(types::Int32, 0, PT, Bytes);
-}
-
-constexpr const DescriptorType *TypeDescWriter::type(const int64_t*) const noexcept {
-	constexpr auto PT = PrimitiveType::SignedInteger;
-	constexpr auto Bytes = 8;
-	return getType(types::Int64, 0, PT, Bytes);
-}
-
-constexpr const DescriptorType *TypeDescWriter::type(const uint8_t*) const noexcept {
-	constexpr auto PT = PrimitiveType::UnsignedInteger;
-	constexpr auto Bytes = 1;
-	return getType(types::Uint8, 0, PT, Bytes);
-}
-
-constexpr const DescriptorType *TypeDescWriter::type(const uint16_t*) const noexcept {
-	constexpr auto PT = PrimitiveType::UnsignedInteger;
-	constexpr auto Bytes = 2;
-	return getType(types::Uint16, 0, PT, Bytes);
-}
-
-constexpr const DescriptorType *TypeDescWriter::type(const uint32_t*) const noexcept {
-	constexpr auto PT = PrimitiveType::UnsignedInteger;
-	constexpr auto Bytes = 4;
-	return getType(types::Uint32, 0, PT, Bytes);
-}
-
-constexpr const DescriptorType *TypeDescWriter::type(const uint64_t*) const noexcept {
-	constexpr auto PT = PrimitiveType::UnsignedInteger;
-	constexpr auto Bytes = 8;
-	return getType(types::Uint64, 0, PT, Bytes);
+constexpr const DescriptorType *TypeDescWriter::type(Integer_c auto const *val) const noexcept {
+	constexpr auto isSigned = ox::is_signed_v<decltype(*val)>;
+	constexpr auto PT = isSigned ?
+		PrimitiveType::SignedInteger :
+		PrimitiveType::UnsignedInteger;
+	constexpr auto sz = sizeof(*val);
+	constexpr auto bytes = sizeof(*val);
+	return getType([] {
+			switch (sz) {
+				case 1:
+					return isSigned ? types::Int8 : types::Uint8;
+				case 2:
+					return isSigned ? types::Int16 : types::Uint16;
+				case 4:
+					return isSigned ? types::Int32 : types::Uint32;
+				case 8:
+					return isSigned ? types::Int64 : types::Uint64;
+			}
+			return types::Int32;
+		}(), 0, PT, bytes);
 }
 
 constexpr const DescriptorType *TypeDescWriter::type(const bool*) const noexcept {

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

@@ -282,7 +282,7 @@ Error readOC(BufferView const buff, auto &val) noexcept {
 	try {
 		Json::Value doc;
 		Json::CharReaderBuilder parserBuilder;
-		auto parser = UPtr<Json::CharReader>(parserBuilder.newCharReader());
+		auto const parser = UPtr<Json::CharReader>(parserBuilder.newCharReader());
 OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 		if (!parser->parse(buff.data(), buff.data() + buff.size(), &doc, nullptr)) {
 OX_ALLOW_UNSAFE_BUFFERS_END

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

@@ -28,6 +28,7 @@ namespace ox {
 
 class OrganicClawWriter {
 
+	friend Error writeOC(Writer_c auto &writer, auto const &val) noexcept;
 	friend Result<Buffer> writeOC(const auto &val) noexcept;
 	friend Result<String> writeOCString(const auto &val) noexcept;
 
@@ -59,7 +60,7 @@ class OrganicClawWriter {
 
 		Error field(CString const key, int32_t const *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
-				value(key) = *val;
+				value(key) = static_cast<Json::Int>(*val);
 			}
 			++m_fieldIt;
 			return {};
@@ -92,7 +93,7 @@ class OrganicClawWriter {
 
 		Error field(CString const key, uint32_t const *val) noexcept {
 			if (targetValid() && (*val || m_json.isArray())) {
-				value(key) = *val;
+				value(key) = static_cast<Json::UInt>(*val);
 			}
 			++m_fieldIt;
 			return {};
@@ -221,9 +222,9 @@ Error OrganicClawWriter::field(CString key, T const *val) noexcept {
 			// the int type needs to be normalized because jsoncpp doesn't
 			// factor in every permutation unsigned long, etc.
 			if constexpr(is_signed_v<T>) {
-				value(key) = static_cast<Int<8 * sizeof(*val)>>(*val);
+				value(key) = static_cast<Json::Int64>(*val);
 			} else {
-				value(key) = static_cast<Uint<8 * sizeof(*val)>>(*val);
+				value(key) = static_cast<Json::UInt64>(*val);
 			}
 		}
 	} else if constexpr(isVector_v<T> || isArray_v<T>) {
@@ -254,9 +255,19 @@ Error OrganicClawWriter::field(CString key, UnionView<U, force> val) noexcept {
 	return {};
 }
 
+Error writeOC(Writer_c auto &writer, auto const &val) noexcept {
+	OrganicClawWriter ocWriter;
+	ModelHandlerInterface handler(ocWriter);
+	OX_RETURN_ERROR(model(&handler, &val));
+	Json::StreamWriterBuilder const jsonBuilder;
+	auto const str = Json::writeString(jsonBuilder, ocWriter.m_json);
+	OX_RETURN_ERROR(writer.write(str.data(), str.size()));
+	return writer.put('\0');
+}
+
 Result<Buffer> writeOC(auto const &val) noexcept {
 	OrganicClawWriter writer;
-	ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler(writer);
+	ModelHandlerInterface handler(writer);
 	OX_RETURN_ERROR(model(&handler, &val));
 	Json::StreamWriterBuilder const jsonBuilder;
 	auto const str = Json::writeString(jsonBuilder, writer.m_json);
@@ -270,7 +281,7 @@ Result<Buffer> writeOC(auto const &val) noexcept {
 
 Result<String> writeOCString(auto const &val) noexcept {
 	OrganicClawWriter writer;
-	ModelHandlerInterface<OrganicClawWriter, OpType::Write> handler(writer);
+	ModelHandlerInterface handler(writer);
 	OX_RETURN_ERROR(model(&handler, &val));
 	Json::StreamWriterBuilder const jsonBuilder;
 	auto const str = Json::writeString(jsonBuilder, writer.m_json);

deps/oxlib/src/std/CMakeLists.txt

@@ -78,10 +78,10 @@ target_compile_definitions(
 		$<$<BOOL:${OX_NODEBUG}>:OX_NODEBUG>
 )
 
-if(NOT WIN32)
+if(NOT WIN32 AND NOT OX_BARE_METAL)
 	target_link_libraries(
 		OxStd PUBLIC
-			$<$<CXX_COMPILER_ID:GNU>:$<$<BOOL:${OX_USE_STDLIB}>:dl>>
+			dl
 	)
 endif()
 target_link_libraries(

deps/oxlib/src/std/include/ox/std/def.hpp

@@ -63,6 +63,7 @@ constexpr void oxAssert(const ox::Error&, const char*) noexcept {}
 #if defined(_MSC_VER)
 #define ox_alloca(size) _alloca(size)
 #elif OX_USE_STDLIB
+#include <alloca.h>
 #define ox_alloca(size) alloca(size)
 #else
 #define ox_alloca(size) __builtin_alloca(size)

deps/oxlib/src/std/include/ox/std/error.hpp

@@ -345,6 +345,21 @@ struct [[nodiscard]] Result {
 		return *this;
 	}
 
+	constexpr Result reoriginate(
+		ErrorCode const pErrCode,
+		CString const pMsg = nullptr,
+		std::source_location const &pSrc = std::source_location::current()) const && noexcept {
+		if (error) {
+			return {std::move(value), Error{pErrCode, pMsg, pSrc}};
+		}
+		return {std::move(value)};
+	}
+
+	constexpr Result reoriginate(
+		std::source_location const &pSrc = std::source_location::current()) const && noexcept {
+		return {std::move(value), Error{error.errCode, error.msg, pSrc}};
+	}
+
 };
 
 namespace detail {

deps/oxlib/src/std/include/ox/std/strops.hpp

@@ -36,6 +36,27 @@ constexpr StringView substr(StringViewCR str, std::size_t const start, std::size
 	return {};
 }
 
+[[nodiscard]]
+constexpr char toUpper(char const c) noexcept {
+	return c & static_cast<char>(0b1101'1111);
+}
+
+[[nodiscard]]
+constexpr int caseInsensitiveStrCmp(StringViewCR a, StringViewCR b) noexcept {
+	auto const sz = ox::min(a.size(), b.size());
+	for (size_t i{}; i < sz; ++i) {
+		auto const ac = toUpper(a[i]);
+		auto const bc = toUpper(b[i]);
+		if (ac < bc) {
+			return -1;
+		}
+		if (ac > bc) {
+			return 1;
+		}
+	}
+	return 0;
+}
+
 [[nodiscard]]
 constexpr bool beginsWith(StringViewCR base, char const beginning) noexcept {
 	return base.size() && base[0] == beginning;

deps/oxlib/src/std/include/ox/std/typetraits.hpp

@@ -103,32 +103,33 @@ constexpr bool is_const_v<const T> = true;
 // is_integral /////////////////////////////////////////////////////////////////
 
 template<typename T> struct is_integral: false_type {};
-template<> struct is_integral<bool>    : true_type {};
-template<> struct is_integral<wchar_t> : true_type {};
-template<> struct is_integral<int8_t>  : true_type {};
-template<> struct is_integral<uint8_t> : true_type {};
-template<> struct is_integral<int16_t> : true_type {};
-template<> struct is_integral<uint16_t>: true_type {};
-template<> struct is_integral<int32_t> : true_type {};
-template<> struct is_integral<uint32_t>: true_type {};
-template<> struct is_integral<const bool>    : true_type {};
-template<> struct is_integral<const wchar_t> : true_type {};
-template<> struct is_integral<const int8_t>  : true_type {};
-template<> struct is_integral<const uint8_t> : true_type {};
-template<> struct is_integral<const int16_t> : true_type {};
-template<> struct is_integral<const uint16_t>: true_type {};
-template<> struct is_integral<const int32_t> : true_type {};
-template<> struct is_integral<const uint32_t>: true_type {};
 
 // some of these need to be done with the actual language syntax because no one
 // can agree on what an (u)int64_t is...
-template<> struct is_integral<long>: true_type {};
-template<> struct is_integral<long long>: true_type {};
-template<> struct is_integral<unsigned long>: true_type {};
-template<> struct is_integral<unsigned long long>: true_type {};
-template<> struct is_integral<const long>: true_type {};
-template<> struct is_integral<const long long>: true_type {};
-template<> struct is_integral<const unsigned long>: true_type {};
+template<> struct is_integral<bool>                    : true_type {};
+template<> struct is_integral<wchar_t>                 : true_type {};
+template<> struct is_integral<signed char>             : true_type {};
+template<> struct is_integral<unsigned char>           : true_type {};
+template<> struct is_integral<short>                   : true_type {};
+template<> struct is_integral<unsigned short>          : true_type {};
+template<> struct is_integral<int>                     : true_type {};
+template<> struct is_integral<unsigned int>            : true_type {};
+template<> struct is_integral<long>                    : true_type {};
+template<> struct is_integral<long long>               : true_type {};
+template<> struct is_integral<unsigned long>           : true_type {};
+template<> struct is_integral<unsigned long long>      : true_type {};
+
+template<> struct is_integral<const bool>              : true_type {};
+template<> struct is_integral<const wchar_t>           : true_type {};
+template<> struct is_integral<const signed char>       : true_type {};
+template<> struct is_integral<const unsigned char>     : true_type {};
+template<> struct is_integral<const short>             : true_type {};
+template<> struct is_integral<const unsigned short>    : true_type {};
+template<> struct is_integral<const int>               : true_type {};
+template<> struct is_integral<const unsigned int>      : true_type {};
+template<> struct is_integral<const long>              : true_type {};
+template<> struct is_integral<const long long>         : true_type {};
+template<> struct is_integral<const unsigned long>     : true_type {};
 template<> struct is_integral<const unsigned long long>: true_type {};
 
 template<typename T>
@@ -138,29 +139,26 @@ constexpr bool is_integral_v = is_integral<T>::value;
 // is_integer /////////////////////////////////////////////////////////////////
 
 template<typename T> struct is_integer: false_type {};
-template<> struct is_integer<int8_t>  : true_type {};
-template<> struct is_integer<uint8_t> : true_type {};
-template<> struct is_integer<int16_t> : true_type {};
-template<> struct is_integer<uint16_t>: true_type {};
-template<> struct is_integer<int32_t> : true_type {};
-template<> struct is_integer<uint32_t>: true_type {};
-template<> struct is_integer<int8_t const>  : true_type {};
-template<> struct is_integer<uint8_t const> : true_type {};
-template<> struct is_integer<int16_t const> : true_type {};
-template<> struct is_integer<uint16_t const>: true_type {};
-template<> struct is_integer<int32_t const> : true_type {};
-template<> struct is_integer<uint32_t const>: true_type {};
-
-// some of these need to be done with the actual language syntax because no one
-// can agree on what an (u)int64_t is...
-template<> struct is_integer<long>: true_type {};
-template<> struct is_integer<long long>: true_type {};
-template<> struct is_integer<unsigned long>: true_type {};
-template<> struct is_integer<unsigned long long>: true_type {};
-template<> struct is_integer<long const>: true_type {};
-template<> struct is_integer<long long const>: true_type {};
-template<> struct is_integer<unsigned long const>: true_type {};
-template<> struct is_integer<unsigned long long const>: true_type {};
+template<> struct is_integer<signed char>             : true_type {};
+template<> struct is_integer<unsigned char>           : true_type {};
+template<> struct is_integer<short>                   : true_type {};
+template<> struct is_integer<unsigned short>          : true_type {};
+template<> struct is_integer<int>                     : true_type {};
+template<> struct is_integer<unsigned int>            : true_type {};
+template<> struct is_integer<long>                    : true_type {};
+template<> struct is_integer<long long>               : true_type {};
+template<> struct is_integer<unsigned long>           : true_type {};
+template<> struct is_integer<unsigned long long>      : true_type {};
+template<> struct is_integer<const signed char>             : true_type {};
+template<> struct is_integer<const unsigned char>           : true_type {};
+template<> struct is_integer<const short>                   : true_type {};
+template<> struct is_integer<const unsigned short>          : true_type {};
+template<> struct is_integer<const int>                     : true_type {};
+template<> struct is_integer<const unsigned int>            : true_type {};
+template<> struct is_integer<const long>                    : true_type {};
+template<> struct is_integer<const long long>               : true_type {};
+template<> struct is_integer<const unsigned long>           : true_type {};
+template<> struct is_integer<const unsigned long long>      : true_type {};
 
 template<typename T>
 constexpr bool is_integer_v = is_integer<T>::value;

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

@@ -54,10 +54,21 @@ struct VectorAllocator {
 			// this totally idiotic redundant check (&& count <= Size) is required to address a bug in devkitARM,
 			// try removing it later
 			if (!std::is_constant_evaluated()) {
+#if defined(__GNUC__) && !defined(__clang__)
+	#pragma GCC diagnostic push
+	#pragma GCC diagnostic ignored "-Wstringop-overflow="
+#endif
 				if (cap <= m_data.size() && count <= m_data.size()) {
 					for (auto i = 0u; i < count; ++i) {
 						auto const srcItem = std::launder(reinterpret_cast<T*>(&src->m_data[i]));
+#if defined(__GNUC__) && __GNUC__ >= 12
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wstringop-overflow="
+#endif
 						new (&m_data[i]) T(std::move(*srcItem));
+#if defined(__GNUC__) && __GNUC__ >= 12
+#pragma GCC diagnostic pop
+#endif
 					}
 					if (count) {
 						*items = std::launder(reinterpret_cast<T*>(m_data.data()));
@@ -65,6 +76,9 @@ struct VectorAllocator {
 						*items = reinterpret_cast<T*>(m_data.data());
 					}
 				}
+#if defined(__GNUC__) && !defined(__clang__)
+	#pragma GCC diagnostic pop
+#endif
 			}
 		}
 

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

@@ -43,7 +43,7 @@ uint64_t timeMapStrToUuid(int const elemCnt, int const lookups, uint64_t seed =
 	// start
 	auto const startTime = steadyNowMs();
 	for (int i = 0; i < lookups; ++i) {
-		auto const &k = keys[rand.gen() % keys.size()];
+		auto const &k = keys[static_cast<size_t>(rand.gen() % keys.size())];
 		map[k];
 		ox::expect(map[k], ox::UUID::fromString(k).unwrap());
 	}
@@ -65,7 +65,7 @@ uint64_t timeMapUuidToStr(int const elemCnt, int const lookups, uint64_t seed =
 	// start
 	auto const startTime = steadyNowMs();
 	for (int i = 0; i < lookups; ++i) {
-		auto const &k = keys[rand.gen() % keys.size()];
+		auto const &k = keys[static_cast<size_t>(rand.gen() % keys.size())];
 		ox::expect(map[k], k.toString());
 	}
 	return steadyNowMs() - startTime;

release-notes.md

@@ -1,5 +1,6 @@
-# NEXT
+# d2026.05.0
 
+* Add HiDPI support
 * Add Get Info file dialog option in project explorer
 
 # d2025.07.0

src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/addcolorcommand.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <studio/studio.hpp>
+#include <studio/undocommand.hpp>
 
 #include <nostalgia/gfx/palette.hpp>
 

src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/addpagecommand.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <studio/studio.hpp>
+#include <studio/undocommand.hpp>
 
 #include <nostalgia/gfx/palette.hpp>
 

src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/applycolorallpagescommand.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <studio/studio.hpp>
+#include <studio/undocommand.hpp>
 
 #include <nostalgia/gfx/palette.hpp>
 

src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/duplicatepagecommand.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <studio/studio.hpp>
+#include <studio/undocommand.hpp>
 
 #include <nostalgia/gfx/palette.hpp>
 

src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/movecolorcommand.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <studio/studio.hpp>
+#include <studio/undocommand.hpp>
 
 #include <nostalgia/gfx/palette.hpp>
 

src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/movepagecommand.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <studio/studio.hpp>
+#include <studio/undocommand.hpp>
 
 #include <nostalgia/gfx/palette.hpp>
 

src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/removecolorcommand.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <studio/studio.hpp>
+#include <studio/undocommand.hpp>
 
 #include <nostalgia/gfx/palette.hpp>
 

src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/removepagecommand.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <studio/studio.hpp>
+#include <studio/undocommand.hpp>
 
 #include <nostalgia/gfx/palette.hpp>
 

src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/renamepagecommand.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <studio/studio.hpp>
+#include <studio/undocommand.hpp>
 
 #include <nostalgia/gfx/palette.hpp>
 

src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/updatecolorcommand.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <studio/studio.hpp>
+#include <studio/undocommand.hpp>
 
 #include <nostalgia/gfx/palette.hpp>
 

src/nostalgia/modules/gfx/src/studio/paletteeditor/commands/updatecolorinfocommand.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <studio/studio.hpp>
+#include <studio/undocommand.hpp>
 
 #include <nostalgia/gfx/palette.hpp>
 

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

@@ -45,11 +45,11 @@ OX_MODEL_BEGIN(PageDragDrop)
 	OX_MODEL_FIELD(page)
 OX_MODEL_END()
 
-void PaletteEditorImGui::PageRenameDialog::draw(turbine::Context &tctx) noexcept {
+void PaletteEditorImGui::PageRenameDialog::draw() noexcept {
 	if (!m_show) {
 		return;
 	}
-	if (ig::BeginPopup(tctx, "Rename Page", m_show)) {
+	if (ig::BeginPopup("Rename Page", m_show)) {
 		if (ImGui::IsWindowAppearing()) {
 			ImGui::SetKeyboardFocusHere();
 		}
@@ -71,26 +71,26 @@ void PaletteEditorImGui::PageRenameDialog::draw(turbine::Context &tctx) noexcept
 PaletteEditorImGui::PaletteEditorImGui(studio::Context &sctx, ox::StringParam path):
 		Editor(sctx, std::move(path)),
 		m_sctx(sctx),
-		m_tctx(sctx.tctx),
 		m_pal(m_sctx.project->loadObj<Palette>(itemPath()).unwrapThrow()) {
 	undoStack()->changeTriggered.connect(this, &PaletteEditorImGui::handleCommand);
 	m_pageRenameDlg.inputSubmitted.connect(this, &PaletteEditorImGui::renamePage);
 }
 
 void PaletteEditorImGui::draw(studio::Context&) noexcept {
+	auto const scale = ig::dpiScale();
 	auto const paneSize = ImGui::GetContentRegionAvail();
 	{
-		ImGui::BeginChild("Pages", {280, paneSize.y}, true);
+		ImGui::BeginChild("Pages", {scale * 280, paneSize.y}, true);
 		drawPagesEditor();
 		ImGui::EndChild();
 	}
 	ImGui::SameLine();
 	{
-		ImGui::BeginChild("Colors", {-1, paneSize.y}, true);
+		ImGui::BeginChild("Colors", {scale * -1, paneSize.y}, true);
 		drawColorsEditor();
 		ImGui::EndChild();
 	}
-	m_pageRenameDlg.draw(m_tctx);
+	m_pageRenameDlg.draw();
 }
 
 ox::Error PaletteEditorImGui::saveItem() noexcept {
@@ -165,7 +165,7 @@ void PaletteEditorImGui::drawColorsEditor() noexcept {
 	static constexpr auto toolbarHeight = 40;
 	{
 		auto constexpr sz = ImVec2{70, 24};
-		if (ImGui::Button("Add", sz)) {
+		if (ig::PushButton("Add", sz)) {
 			auto const colorSz = colorCnt(m_pal, m_page);
 			constexpr Color16 c = 0;
 			std::ignore = pushCommand<AddColorCommand>(m_pal, c, colorSz);
@@ -173,7 +173,7 @@ void PaletteEditorImGui::drawColorsEditor() noexcept {
 		ImGui::SameLine();
 		ImGui::BeginDisabled(m_selectedColorRow >= colorCnt(m_pal, m_page));
 		{
-			if (ImGui::Button("Remove", sz)) {
+			if (ig::PushButton("Remove", sz)) {
 				std::ignore = pushCommand<RemoveColorCommand>(m_pal, m_selectedColorRow);
 				m_selectedColorRow = ox::min(colorCnt(m_pal, m_page) - 1, m_selectedColorRow);
 				colorEditor = m_selectedColorRow < colorCnt(m_pal, m_page);
@@ -183,17 +183,18 @@ void PaletteEditorImGui::drawColorsEditor() noexcept {
 	}
 	auto const tblWidth = (colorsSz.x - static_cast<float>(colorEditorWidth) - 8.f)
 			* static_cast<float>(colorEditor);
+	auto const scale = ig::dpiScale();
 	ImGui::BeginTable(
 			"Colors",
 			6,
 			tableFlags,
-			{tblWidth, colorsSz.y - (toolbarHeight + 5)});
+			{tblWidth * scale, colorsSz.y - (toolbarHeight + 5) * scale});
 	{
-		ImGui::TableSetupColumn("Idx", ImGuiTableColumnFlags_WidthFixed, 25);
-		ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed, 100);
-		ImGui::TableSetupColumn("Red", ImGuiTableColumnFlags_WidthFixed, 40);
-		ImGui::TableSetupColumn("Green", ImGuiTableColumnFlags_WidthFixed, 40);
-		ImGui::TableSetupColumn("Blue", ImGuiTableColumnFlags_WidthFixed, 40);
+		ImGui::TableSetupColumn("Idx", ImGuiTableColumnFlags_WidthFixed, 25 * scale);
+		ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed, 100 * scale);
+		ImGui::TableSetupColumn("Red", ImGuiTableColumnFlags_WidthFixed, 40 * scale);
+		ImGui::TableSetupColumn("Green", ImGuiTableColumnFlags_WidthFixed, 40 * scale);
+		ImGui::TableSetupColumn("Blue", ImGuiTableColumnFlags_WidthFixed, 40 * scale);
 		ImGui::TableSetupColumn("Preview", ImGuiTableColumnFlags_NoHide);
 		ImGui::TableHeadersRow();
 		if (m_page < m_pal.pages.size()) {
@@ -236,10 +237,11 @@ void PaletteEditorImGui::drawColorsEditor() noexcept {
 }
 
 void PaletteEditorImGui::drawPagesEditor() noexcept {
+	auto const scale = ig::dpiScale();
 	constexpr auto tableFlags = ImGuiTableFlags_RowBg;
 	auto const paneSz = ImGui::GetContentRegionAvail();
 	constexpr auto toolbarHeight = 40;
-	auto const btnSz = ImVec2{paneSz.x / 4 - 5.5f, 24};
+	auto const btnSz = ImVec2{paneSz.x / 4 - 5.5f * scale, 24 * scale};
 	if (ImGui::Button("Add", btnSz)) {
 		if (m_pal.pages.empty()) {
 			std::ignore = pushCommand<AddPageCommand>(m_pal);
@@ -265,7 +267,7 @@ void PaletteEditorImGui::drawPagesEditor() noexcept {
 			"PageSelect",
 			2,
 			tableFlags,
-			{paneSz.x, paneSz.y - (toolbarHeight + 5)});
+			{paneSz.x, paneSz.y - (toolbarHeight + 5) * scale});
 	{
 		ImGui::TableSetupColumn("Page", ImGuiTableColumnFlags_WidthFixed, 60);
 		ImGui::TableSetupColumn("Name", ImGuiTableColumnFlags_WidthFixed, 200);

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

@@ -29,10 +29,9 @@ class PaletteEditorImGui: public studio::Editor {
 				}
 				[[nodiscard]]
 				constexpr bool isOpen() const noexcept { return m_show; }
-				void draw(turbine::Context &tctx) noexcept;
+				void draw() noexcept;
 		} m_pageRenameDlg;
 		studio::Context &m_sctx;
-		turbine::Context &m_tctx;
 		Palette m_pal;
 		size_t m_selectedColorRow = 0;
 		size_t m_page = 0;

src/nostalgia/modules/gfx/src/studio/subcommands/export-tilesheet/export-tilesheet.cpp

@@ -7,6 +7,7 @@
 #include <ox/clargs/clargs.hpp>
 #include <ox/std/trace.hpp>
 
+#include <studio/context.hpp>
 #include <studio/project.hpp>
 
 #include <nostalgia/gfx/palette.hpp>
@@ -14,10 +15,6 @@
 
 #include "export-tilesheet.hpp"
 
-#include "nostalgia/gfx/tilesheet.hpp"
-#include "studio/context.hpp"
-
-
 namespace nostalgia::gfx {
 
 static ox::Vector<uint32_t> normalizePixelSizes(

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

@@ -23,7 +23,7 @@ struct SubSheetRef {
 	TileSheet::SubSheetIdx subsheet{};
 };
 
-OX_MODEL_BEGIN(SubSheetRef)
+static OX_MODEL_BEGIN(SubSheetRef)
 	OX_MODEL_FIELD(subsheet)
 OX_MODEL_END()
 
@@ -33,7 +33,7 @@ struct TileSheetEditorConfig {
 	TileSheet::SubSheetIdx activeSubsheet{};
 };
 
-OX_MODEL_BEGIN(TileSheetEditorConfig)
+static OX_MODEL_BEGIN(TileSheetEditorConfig)
 	OX_MODEL_FIELD_RENAME(activeSubsheet, active_subsheet)
 OX_MODEL_END()
 
@@ -149,27 +149,30 @@ void TileSheetEditorImGui::draw(studio::Context&) noexcept {
 		if (ImGui::IsKeyDown(ImGuiKey_ModCtrl) && !m_palPathFocused) {
 			if (ImGui::IsKeyPressed(ImGuiKey_A)) {
 				auto const &img = m_model.activeSubSheet();
-				m_model.setSelection({{}, {img.columns * TileWidth - 1, img.rows * TileHeight - 1}});
+				m_model.setSelection({
+					{},
+					{img.columns * TileWidth - 1, img.rows * TileHeight - 1}});
 			} else if (ImGui::IsKeyPressed(ImGuiKey_G)) {
 				m_model.clearSelection();
 			}
 		}
 	}
+	auto const scale = ig::dpiScale();
 	auto const paneSize = ImGui::GetContentRegionAvail();
-	auto const tileSheetParentSize = ImVec2{paneSize.x - s_palViewWidth, paneSize.y};
-	auto const fbSize = ox::Vec2{tileSheetParentSize.x - 16, tileSheetParentSize.y - 16};
+	auto const tileSheetParentSize = ImVec2{paneSize.x - s_palViewWidth * scale, paneSize.y};
+	auto const fbSize = ox::Vec2{tileSheetParentSize.x - 16 * scale, tileSheetParentSize.y - 16 * scale};
 	ImGui::BeginChild("TileSheetView", tileSheetParentSize, true);
 	{
 		drawTileSheet(fbSize);
 	}
 	ImGui::EndChild();
 	ImGui::SameLine();
-	ImGui::BeginChild("Controls", {s_palViewWidth - 8, paneSize.y}, true);
+	ImGui::BeginChild("Controls", {(s_palViewWidth - 8) * scale, paneSize.y}, true);
 	{
 		auto const controlsSize = ImGui::GetContentRegionAvail();
-		ImGui::BeginChild("ToolBox", {0, 32}, true);
+		ImGui::BeginChild("ToolBox", {0, 32 * scale}, true);
 		{
-			auto const btnSz = ImVec2{45, 14};
+			auto const btnSz = ImVec2{45 * scale, 14 * scale};
 			if (ImGui::Selectable("Select", m_tool == TileSheetTool::Select, 0, btnSz)) {
 				m_tool = TileSheetTool::Select;
 			}
@@ -193,7 +196,7 @@ void TileSheetEditorImGui::draw(studio::Context&) noexcept {
 			//ig::ComboBox("##Operations", ox::Array<ox::CStringView, 1>{"Operations"}, i);
 		}
 		ImGui::EndChild();
-		ImGui::BeginChild("OperationsBox", {0, 35}, ImGuiWindowFlags_NoTitleBar);
+		ImGui::BeginChild("OperationsBox", {0, 35 * scale}, ImGuiWindowFlags_NoTitleBar);
 		{
 			if (ImGui::BeginCombo("##Operations", "Operations", 0)) {
 				if (ImGui::Selectable("Flip X", false)) {
@@ -214,17 +217,17 @@ void TileSheetEditorImGui::draw(studio::Context&) noexcept {
 			}
 		}
 		ImGui::EndChild();
-		auto const ySize = controlsSize.y - (38 + ig::BtnSz.y + 21);
+		auto const ySize = controlsSize.y - (38 + ig::BtnSz.y + 21) * scale;
 		// draw palette/color picker
-		ImGui::BeginChild("Palette", {s_palViewWidth - 24, ySize / 2.f}, true);
+		ImGui::BeginChild("Palette", {(s_palViewWidth - 24) * scale, ySize / 2.f}, true);
 		{
 			drawPaletteMenu();
 		}
 		ImGui::EndChild();
-		ImGui::BeginChild("SubSheets", {s_palViewWidth - 24, ySize / 2.f}, true);
+		ImGui::BeginChild("SubSheets", {(s_palViewWidth - 24) * scale, ySize / 2.f}, true);
 		{
-			static constexpr auto btnHeight = ig::BtnSz.y;
-			auto constexpr btnSize = ImVec2{btnHeight, btnHeight};
+			auto constexpr btnHeight = ig::BtnSz.y;
+			auto const btnSize = ImVec2{btnHeight, btnHeight};
 			if (ig::PushButton("+", btnSize)) {
 				auto insertOnIdx = m_model.activeSubSheetIdx();
 				auto const &parent = m_model.activeSubSheet();
@@ -247,16 +250,16 @@ void TileSheetEditorImGui::draw(studio::Context&) noexcept {
 			if (ig::PushButton("Export")) {
 				m_exportMenu.show();
 			}
-			TileSheet::SubSheetIdx path;
 			static constexpr auto flags =
 				ImGuiTableFlags_RowBg |
                 ImGuiTableFlags_NoBordersInBody |
                 ImGuiTableFlags_ScrollY;
             if (ImGui::BeginTable("Subsheets", 4, flags)) {
+                TileSheet::SubSheetIdx path;
                 ImGui::TableSetupColumn("Subsheet", ImGuiTableColumnFlags_NoHide);
-                ImGui::TableSetupColumn("ID", ImGuiTableColumnFlags_WidthFixed, 25);
-                ImGui::TableSetupColumn("Columns", ImGuiTableColumnFlags_WidthFixed, 50);
-                ImGui::TableSetupColumn("Rows", ImGuiTableColumnFlags_WidthFixed, 50);
+                ImGui::TableSetupColumn("ID", ImGuiTableColumnFlags_WidthFixed, 25 * scale);
+                ImGui::TableSetupColumn("Columns", ImGuiTableColumnFlags_WidthFixed, 50 * scale);
+                ImGui::TableSetupColumn("Rows", ImGuiTableColumnFlags_WidthFixed, 50 * scale);
                 ImGui::TableHeadersRow();
                 drawSubsheetSelector(m_view.img().subsheet, path);
                 ImGui::EndTable();
@@ -265,8 +268,8 @@ void TileSheetEditorImGui::draw(studio::Context&) noexcept {
 		ImGui::EndChild();
 	}
 	ImGui::EndChild();
-	m_subsheetEditor.draw(m_tctx);
-	m_exportMenu.draw(m_tctx);
+	m_subsheetEditor.draw();
+	m_exportMenu.draw();
 	if (auto pal = m_palPicker.draw(m_sctx)) {
 		if (*pal != m_model.palPath()) {
 			oxLogError(m_model.setPalette(*pal));
@@ -445,10 +448,11 @@ void TileSheetEditorImGui::drawTileSheet(ox::Vec2 const &fbSize) noexcept {
 
 void TileSheetEditorImGui::drawPaletteMenu() noexcept {
 	ig::IDStackItem const idStackItem{"PaletteMenu"};
-	auto constexpr comboWidthSub = 62;
+	auto const scale = ig::dpiScale();
+	auto const comboWidthSub = 62 * scale;
 	ImGui::SetNextItemWidth(ImGui::GetContentRegionAvail().x - comboWidthSub);
-	auto constexpr palTags = ImGuiInputTextFlags_ReadOnly;
-	if (ig::InputTextWithHint("##Palette", "Path to Palette", m_model.palPath(), palTags)) {
+	auto constexpr palFlags = ImGuiInputTextFlags_ReadOnly;
+	if (ig::InputTextWithHint("##Palette", "Path to Palette", m_model.palPath(), palFlags)) {
 		oxLogError(m_model.setPalette(m_model.palPath()));
 	}
 	m_palPathFocused = ImGui::IsItemFocused();
@@ -556,7 +560,7 @@ void TileSheetEditorImGui::SubSheetEditor::show(ox::StringViewCR name, int const
 	m_rows = rows;
 }
 
-void TileSheetEditorImGui::SubSheetEditor::draw(turbine::Context &tctx) noexcept {
+void TileSheetEditorImGui::SubSheetEditor::draw() noexcept {
 	constexpr auto popupName = "Edit Subsheet";
 	if (!m_show) {
 		return;
@@ -565,13 +569,13 @@ void TileSheetEditorImGui::SubSheetEditor::draw(turbine::Context &tctx) noexcept
 	auto constexpr popupWidth = 235.f;
 	auto const popupHeight = modSize ? 130.f : 85.f;
 	auto const popupSz = ImVec2{popupWidth, popupHeight};
-	if (ig::BeginPopup(tctx, popupName, m_show, popupSz)) {
+	if (ig::BeginPopup(popupName, m_show, popupSz)) {
 		ig::InputText("Name", m_name);
 		if (modSize) {
 			ImGui::InputInt("Columns", &m_cols);
 			ImGui::InputInt("Rows", &m_rows);
 		}
-		if (ig::PopupControlsOkCancel(popupWidth, m_show) == ig::PopupResponse::OK) {
+		if (ig::PopupControlsOkCancel(m_show) == ig::PopupResponse::OK) {
 			inputSubmitted.emit(m_name, m_cols, m_rows);
 		}
 		ImGui::EndPopup();
@@ -588,18 +592,18 @@ void TileSheetEditorImGui::ExportMenu::show() noexcept {
 	m_scale = 5;
 }
 
-void TileSheetEditorImGui::ExportMenu::draw(turbine::Context &tctx) noexcept {
+void TileSheetEditorImGui::ExportMenu::draw() noexcept {
 	constexpr auto popupName = "Export Tile Sheet";
 	if (!m_show) {
 		return;
 	}
-	constexpr auto popupWidth = 235.f;
-	constexpr auto popupHeight = 85.f;
-	constexpr auto popupSz = ImVec2{popupWidth, popupHeight};
-	if (ig::BeginPopup(tctx, popupName, m_show, popupSz)) {
+	auto constexpr popupWidth = 235.f;
+	auto constexpr popupHeight = 85.f;
+	auto constexpr popupSz = ImVec2{popupWidth, popupHeight};
+	if (ig::BeginPopup(popupName, m_show, popupSz)) {
 		ImGui::InputInt("Scale", &m_scale);
 		m_scale = ox::clamp(m_scale, 1, 135);
-		if (ig::PopupControlsOkCancel(popupWidth, m_show) == ig::PopupResponse::OK) {
+		if (ig::PopupControlsOkCancel(m_show) == ig::PopupResponse::OK) {
 			inputSubmitted.emit(m_scale);
 		}
 		ImGui::EndPopup();

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

@@ -27,7 +27,7 @@ class TileSheetEditorImGui: public studio::Editor {
 			public:
 				ox::Signal<ox::Error(ox::StringViewCR name, int cols, int rows)> inputSubmitted;
 				void show(ox::StringViewCR name, int cols, int rows) noexcept;
-				void draw(turbine::Context &tctx) noexcept;
+				void draw() noexcept;
 				void close() noexcept;
 				[[nodiscard]]
 				constexpr bool isOpen() const noexcept { return m_show; }
@@ -39,7 +39,7 @@ class TileSheetEditorImGui: public studio::Editor {
 			public:
 				ox::Signal<ox::Error(int scale)> inputSubmitted;
 				void show() noexcept;
-				void draw(turbine::Context &tctx) noexcept;
+				void draw() noexcept;
 				void close() noexcept;
 				[[nodiscard]]
 				constexpr bool isOpen() const noexcept { return m_show; }

src/nostalgia/studio/CMakeLists.txt

@@ -16,6 +16,7 @@ target_link_libraries(
 target_compile_definitions(
 	NostalgiaStudio PUBLIC
 		OLYMPIC_APP_VERSION="dev build"
+		OLYMPIC_APP_ID="net.drinkingtea.nostalgia.NostalgiaStudio"
 )
 
 install(

src/olympic/applib/applib.cpp

@@ -9,6 +9,10 @@
 #define OLYMPIC_PROJECT_NAME "OlympicProject"
 #endif
 
+#ifndef OLYMPIC_APP_ID
+#define OLYMPIC_APP_ID "AppID"
+#endif
+
 #ifndef OLYMPIC_APP_NAME
 #define OLYMPIC_APP_NAME "App"
 #endif
@@ -38,7 +42,8 @@
 #endif
 
 namespace olympic {
-ox::String appVersion{OLYMPIC_APP_VERSION};
+ox::StringLiteral appVersion{OLYMPIC_APP_VERSION};
+ox::StringLiteral appId{OLYMPIC_APP_ID};
 }
 
 ox::Error run(
@@ -72,7 +77,7 @@ int main(int const argc, char const **argv) {
 			OLYMPIC_PROJECT_DATADIR,
 			{argv, static_cast<size_t>(argc)});
 	oxAssert(err, "Something went wrong...");
-	if (err) {
+	if (ox::defines::Debug && err) {
 		oxErrf("Failure: {}\n", toStr(err));
 	}
 	return static_cast<int>(err);

src/olympic/studio/applib/src/CMakeLists.txt

@@ -47,3 +47,5 @@ install(
 		LIBRARY DESTINATION lib
 		ARCHIVE DESTINATION lib
 )
+
+add_subdirectory(subcommands)

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

@@ -14,24 +14,77 @@
 #include <studio/context.hpp>
 #include <studioapp/studioapp.hpp>
 
+#include "subcommands/change-format/change-format.hpp"
+
+#include "configfile.hpp"
+#include "font.hpp"
 #include "studioui.hpp"
 
+namespace olympic {
+extern ox::StringLiteral appId;
+}
+
 namespace studio {
 
+static ox::Error convertStudioConfigV1ToStudioConfigV2(
+		keel::Context&,
+		StudioConfigV1 &src,
+		StudioConfigV2 &dst) noexcept {
+	dst.projects.emplace_back(StudioConfigV2::ProjectConfig{
+		.projectPath = std::move(src.projectPath),
+		.activeTabItemName = std::move(src.activeTabItemName),
+		.openFiles = std::move(src.openFiles),
+	});
+	dst.showProjectExplorer = src.showProjectExplorer;
+	return {};
+}
+
+static struct: Module {
+	ox::String id() const noexcept final {
+		return ox::String{"net.drinkingtea.studio"};
+	}
+
+	ox::Vector<Command> commands() const final {
+		return {
+			{
+				"change-format",
+				cmdChangeFormat,
+			}
+		};
+	}
+} constexpr mod;
+
+static struct: keel::Module {
+	ox::String id() const noexcept override {
+		return ox::String{"net.drinkingtea.studio"};
+	}
+
+	ox::Vector<keel::Converter> converters() const noexcept override {
+		return {
+			keel::Converter::make<convertStudioConfigV1ToStudioConfigV2>(),
+		};
+	}
+} constexpr kmod;
+
+
 class StudioUIDrawer: public turbine::gl::Drawer {
 	private:
 		StudioUI &m_ui;
 	public:
 		explicit StudioUIDrawer(StudioUI &ui) noexcept: m_ui(ui) {
 		}
-	protected:
+
+		void preDraw(turbine::Context &) noexcept final {
+			m_ui.preDraw();
+		}
+
 		void draw(turbine::Context&) noexcept final {
 			m_ui.draw();
 		}
 };
 
-static void keyEventHandler(turbine::Context &ctx, turbine::Key key, bool down) noexcept {
-	auto const sctx = turbine::applicationData<studio::Context>(ctx);
+static void keyEventHandler(turbine::Context &ctx, turbine::Key const key, bool const down) noexcept {
+	auto const sctx = turbine::applicationData<Context>(ctx);
 	sctx->ui.handleKeyEvent(key, down);
 }
 
@@ -47,7 +100,9 @@ static ox::Error runStudio(
 		ox::StringViewCR appName,
 		ox::StringViewCR projectDataDir,
 		ox::UPtr<ox::FileSystem> &&fs) noexcept {
-	OX_REQUIRE_M(ctx, turbine::init(std::move(fs), appName));
+	OX_REQUIRE_M(
+		ctx,
+		turbine::init(std::move(fs), appName, olympic::appId));
 	oxLogError(turbine::setWindowIcon(*ctx, WindowIcons()));
 	turbine::setWindowTitle(*ctx, keelCtx(*ctx).appName);
 	turbine::setKeyEventHandler(*ctx, keyEventHandler);
@@ -61,10 +116,26 @@ static ox::Error runStudio(
 	return err;
 }
 
+static void listCmds() noexcept {
+	oxOut("Insufficient arguments for sub-command\n\nValid commands:\n\n");
+	for (auto const m : modules()) {
+		if (m->commands().empty()) {
+			continue;
+		}
+		oxOutf("\t{}\n", m->id());
+		for (auto const &c : m->commands()) {
+			oxOutf("\t\t{}\n", c.name);
+		}
+		oxOut("\n");
+	}
+}
+
 static ox::Error run(
 		ox::StringViewCR appName,
 		ox::StringViewCR projectDataDir,
 		ox::SpanView<ox::CString> const &args) {
+	keel::registerModule(kmod);
+	registerModule(&mod);
 	// seed UUID generator
 	auto const time = std::time(nullptr);
 	ox::UUID::seedGenerator({
@@ -73,7 +144,8 @@ static ox::Error run(
 	});
 	if (args.size() > 1 && ox::StringView{args[1]} == "cmd") {
 		if (args.size() < 5) {
-			return ox::Error{1, "insufficient arguments for sub-command"};
+			listCmds();
+			return ox::Error{1};
 		}
 		auto constexpr numCmdArgs = 5;
 		ox::StringView const projectDir = args[2];
@@ -83,7 +155,7 @@ static ox::Error run(
 			if (m->id() == moduleId) {
 				for (auto const &c : m->commands()) {
 					if (c.name == subCmd) {
-						auto kctx = keel::init(
+						auto const kctx = keel::init(
 							ox::make_unique<ox::PassThroughFS>(projectDir),
 							c.name);
 						if (kctx.error) {

src/olympic/studio/applib/src/configfile.hpp

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ */
+
+#pragma once
+
+#include <ox/std/string.hpp>
+#include <ox/std/vector.hpp>
+
+#include <ox/model/def.hpp>
+
+namespace studio {
+
+struct StudioConfigV1 {
+	static constexpr auto TypeName = "net.drinkingtea.studio.StudioConfig";
+	static constexpr auto TypeVersion = 1;
+	ox::String projectPath;
+	ox::String activeTabItemName;
+	ox::Vector<ox::String> openFiles;
+	bool showProjectExplorer = true;
+};
+
+OX_MODEL_BEGIN(StudioConfigV1)
+	OX_MODEL_FIELD_RENAME(activeTabItemName, active_tab_item_name)
+	OX_MODEL_FIELD_RENAME(projectPath, project_path)
+	OX_MODEL_FIELD_RENAME(openFiles, open_files)
+	OX_MODEL_FIELD_RENAME(showProjectExplorer, show_project_explorer)
+OX_MODEL_END()
+
+
+struct StudioConfigV2 {
+	static constexpr auto TypeName = "net.drinkingtea.studio.StudioConfig";
+	static constexpr auto TypeVersion = 2;
+	struct ProjectConfig {
+		static constexpr auto TypeName = "net.drinkingtea.studio.ProjectConfig";
+		static constexpr auto TypeVersion = 2;
+		ox::String projectPath;
+		ox::String activeTabItemName;
+		ox::Vector<ox::String> openFiles;
+	};
+	ox::Vector<ProjectConfig> projects;
+	bool showProjectExplorer = true;
+
+	[[nodiscard]]
+	constexpr ProjectConfig const *project() const {
+		return projects.empty() ? nullptr : &projects[0];
+	}
+
+	[[nodiscard]]
+	constexpr ProjectConfig *project() {
+		return projects.empty() ? nullptr : &projects[0];
+	}
+};
+
+OX_MODEL_BEGIN(StudioConfigV2::ProjectConfig)
+	OX_MODEL_FIELD_RENAME(activeTabItemName, active_tab_item_name)
+	OX_MODEL_FIELD_RENAME(projectPath, project_path)
+	OX_MODEL_FIELD_RENAME(openFiles, open_files)
+OX_MODEL_END()
+
+OX_MODEL_BEGIN(StudioConfigV2)
+	OX_MODEL_FIELD(projects)
+	OX_MODEL_FIELD_RENAME(showProjectExplorer, show_project_explorer)
+OX_MODEL_END()
+
+using StudioConfig = StudioConfigV2;
+
+}

src/olympic/studio/applib/src/font.hpp

@@ -1,5 +1,7 @@
 // Generated
 
+#pragma once
+
 #include <ox/std/span.hpp>
 
 namespace studio::files {

src/olympic/studio/applib/src/popups/about.cpp

@@ -8,7 +8,7 @@
 #include "about.hpp"
 
 namespace olympic {
-extern ox::String appVersion;
+extern ox::StringLiteral appVersion;
 }
 
 namespace studio {
@@ -22,7 +22,7 @@ AboutPopup::AboutPopup(turbine::Context &ctx) noexcept:
 #endif
 }
 
-void AboutPopup::draw(Context &sctx) noexcept {
+void AboutPopup::draw(Context&) noexcept {
 	if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
 		close();
 		return;
@@ -37,12 +37,12 @@ void AboutPopup::draw(Context &sctx) noexcept {
 		case Stage::Open: {
 			constexpr auto modalFlags =
 					ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize;
-			ig::centerNextWindow(sctx.tctx);
+			ig::centerNextWindow();
 			auto open = true;
 			if (ImGui::BeginPopupModal("About", &open, modalFlags)) {
 				ImGui::Text("%s\n\nBuild date: %s", m_text.c_str(), __DATE__);
 				ImGui::NewLine();
-				ImGui::Dummy({148.0f, 0.0f});
+				ig::Dummy({148.0f, 0.0f});
 				ImGui::SameLine();
 				if (ig::PushButton("Close")) {
 					ImGui::CloseCurrentPopup();

src/olympic/studio/applib/src/popups/fileinfo.cpp

@@ -37,7 +37,7 @@ ox::Error FileInfo::open(ox::StringParam filePath) noexcept {
 	return {};
 }
 
-void FileInfo::draw(Context &sctx) noexcept {
+void FileInfo::draw(Context&) noexcept {
 	if (ImGui::IsKeyPressed(ImGuiKey_Escape)) {
 		close();
 		return;
@@ -52,7 +52,7 @@ void FileInfo::draw(Context &sctx) noexcept {
 		case Stage::Open: {
 			constexpr auto modalFlags =
 					ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize;
-			ig::centerNextWindow(sctx.tctx);
+			ig::centerNextWindow();
 			auto open = true;
 			if (ImGui::BeginPopupModal(m_title.c_str(), &open, modalFlags)) {
 				drawTable();
@@ -79,13 +79,14 @@ void FileInfo::draw(Context &sctx) noexcept {
 }
 
 void FileInfo::drawTable() const noexcept {
+	auto const scale = ig::dpiScale();
 	ig::IDStackItem const idStackItem{"FileInfo"};
 	ImGui::Text("%s", m_filePath.c_str());
 	if (m_fileInfo && ImGui::BeginTable(
 		"Table", 2,
 			ImGuiTableFlags_Borders |
 			ImGuiTableFlags_RowBg)) {
-		ImGui::TableSetupColumn("Field", ImGuiTableColumnFlags_WidthFixed, 70);
+		ImGui::TableSetupColumn("Field", ImGuiTableColumnFlags_WidthFixed, 70 * scale);
 		ImGui::TableSetupColumn("Value", ImGuiTableColumnFlags_NoHide);
 		// asset id
 		ImGui::TableNextRow();

src/olympic/studio/applib/src/popups/makecopy.cpp

@@ -37,9 +37,10 @@ void MakeCopyPopup::draw(Context &ctx) noexcept {
 			m_stage = Stage::Open;
 			m_open = true;
 		[[fallthrough]];
-		case Stage::Open:
-			ig::centerNextWindow(ctx.tctx);
-			ImGui::SetNextWindowSize({250, 0});
+		case Stage::Open: {
+			auto const scale = ig::dpiScale();
+			ig::centerNextWindow();
+			ImGui::SetNextWindowSize({250 * scale, 0});
 			constexpr auto modalFlags =
 				ImGuiWindowFlags_NoCollapse |
 				ImGuiWindowFlags_NoMove |
@@ -68,6 +69,7 @@ void MakeCopyPopup::draw(Context &ctx) noexcept {
 			}
 			break;
 		}
+	}
 }
 
 void MakeCopyPopup::accept(Context const &ctx) noexcept {

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

@@ -134,9 +134,10 @@ void NewMenu::drawNewItemPath(Context &sctx) noexcept {
 }
 
 void NewMenu::drawButtons(Stage const next) noexcept {
-	ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 198);
-	ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 20);
-	constexpr ImVec2 btnSz{60, 20};
+	auto const scale = ig::dpiScale();
+	ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 198 * scale);
+	ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 22 * scale);
+	ImVec2 const btnSz{60 * scale, ig::BtnSz.y * scale};
 	if (ImGui::Button("Back", btnSz)) {
 		if (auto const p = m_prev.back(); p.ok()) {
 			m_stage = *p.value;
@@ -156,9 +157,10 @@ void NewMenu::drawButtons(Stage const next) noexcept {
 }
 
 void NewMenu::drawFirstPageButtons(Stage const next) noexcept {
-	ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 130);
-	ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 20);
-	constexpr ImVec2 btnSz{60, 20};
+	auto const scale = ig::dpiScale();
+	ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 130 * scale);
+	ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 22 * scale);
+	ImVec2 const btnSz{60 * scale, ig::BtnSz.y * scale};
 	if (ImGui::Button("Next", btnSz)) {
 		m_prev.emplace_back(m_stage);
 		m_stage = next;
@@ -171,9 +173,10 @@ void NewMenu::drawFirstPageButtons(Stage const next) noexcept {
 }
 
 void NewMenu::drawLastPageButtons(Context &sctx) noexcept {
-	ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 198);
-	ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 20);
-	constexpr ImVec2 btnSz{60, 20};
+	auto const scale = ig::dpiScale();
+	ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 198 * scale);
+	ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 22 * scale);
+	ImVec2 const btnSz{60 * scale, ig::BtnSz.y * scale};
 	if (ImGui::Button("Back", btnSz)) {
 		if (auto const p = m_prev.back(); p.ok()) {
 			m_stage = *p.value;

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

@@ -65,8 +65,9 @@ void NewProject::drawNewProjectName(Context &sctx) noexcept {
 }
 
 void NewProject::drawLastPageButtons(Context&) noexcept {
-	ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 110);
-	ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 22);
+	auto const scale = ig::dpiScale();
+	ImGui::SetCursorPosX(ImGui::GetCursorPosX() + ImGui::GetContentRegionAvail().x - 110 * scale);
+	ImGui::SetCursorPosY(ImGui::GetCursorPosY() + ImGui::GetContentRegionAvail().y - 22 * scale);
 	if (ig::PushButton("Finish")) {
 		finish();
 	}

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

@@ -43,7 +43,7 @@ ox::Vector<Module const*> const &modules() noexcept {
 	return g_modules;
 }
 
-void registerModule(Module const*mod) noexcept {
+void registerModule(Module const *mod) noexcept {
 	if (mod) {
 		g_modules.emplace_back(mod);
 	}
@@ -121,19 +121,6 @@ using StudioConfig = StudioConfigV2;
 StudioUI::StudioUI(turbine::Context &tctx, ox::StringParam projectDataDir) noexcept:
 		m_sctx{*this, tctx},
 		m_projectDataDir{std::move(projectDataDir)} {
-	{
-		ImFontConfig fontCfg;
-		fontCfg.FontDataOwnedByAtlas = false;
-		auto const &io = ImGui::GetIO();
-		auto const font = files::RobotoMedium_ttf();
-		// const_cast is needed because this data is definitely const,
-		// but AddFontFromMemoryTTF requires a mutable buffer.
-		// However, setting fontCfg.FontDataOwnedByAtlas ensures
-		// that it will still be treated as const.
-		// ImGui documentation recognizes that this is a bad design,
-		// and hopefully it will change at some point.
-		io.Fonts->AddFontFromMemoryTTF(const_cast<uint8_t*>(font.data()), static_cast<int>(font.size()), 13, &fontCfg);
-	}
 	auto &kctx = keelCtx(m_tctx);
 	kctx.converters.emplace_back(keel::Converter::make<convertStudioConfigV1ToStudioConfigV2>());
 	oxLogError(headerizeConfigFile<StudioConfigV1>(kctx));
@@ -196,7 +183,16 @@ void StudioUI::handleNavigationChange(ox::StringParam path, ox::StringParam navA
 	m_navAction.emplace(std::move(path), std::move(navArgs));
 }
 
+void StudioUI::preDraw() noexcept {
+	loadFont();
+}
+
 void StudioUI::draw() noexcept {
+	if (turbine::isWayland() || ox::defines::OS == ox::OS::Darwin) {
+		ig::setDpiScale(1.f);
+	} else {
+		ig::setDpiScale(ImGui::GetWindowDpiScale());
+	}
 	glutils::clearScreen();
 	drawMenu();
 	auto const &viewport = *ImGui::GetMainViewport();
@@ -215,7 +211,7 @@ void StudioUI::draw() noexcept {
 			ImGuiFocusedFlags_RootAndChildWindows | ImGuiFocusedFlags_NoPopupHierarchy);
 		if (m_showProjectExplorer) {
 			auto const v = ImGui::GetContentRegionAvail();
-			m_projectExplorer.draw(m_sctx, {300, v.y});
+			m_projectExplorer.draw(m_sctx, {300 * ig::dpiScale(), v.y});
 			ImGui::SameLine();
 		}
 		drawTabBar();
@@ -229,6 +225,29 @@ void StudioUI::draw() noexcept {
 	procFileMoves();
 }
 
+void StudioUI::loadFont() noexcept {
+	auto const scale = turbine::isWayland() || ox::defines::OS == ox::OS::Darwin ?
+		1.f : turbine::scale(m_tctx);
+	if (m_fontScale != scale) {
+		m_fontScale = scale;
+		ImFontConfig fontCfg;
+		fontCfg.FontDataOwnedByAtlas = false;
+		auto const &io = ImGui::GetIO();
+		auto const font = files::RobotoMedium_ttf();
+		// const_cast is needed because this data is definitely const,
+		// but AddFontFromMemoryTTF requires a mutable buffer.
+		// However, setting fontCfg.FontDataOwnedByAtlas ensures
+		// that it will still be treated as const.
+		// ImGui documentation recognizes that this is a bad design,
+		// and hopefully it will change at some point.
+		io.Fonts->AddFontFromMemoryTTF(
+			const_cast<uint8_t*>(font.data()),
+			static_cast<int>(font.size()),
+			13 * scale,
+			&fontCfg);
+	}
+}
+
 bool StudioUI::handleShutdown() noexcept {
 	auto const out = ox::all_of(m_editors.begin(), m_editors.end(), [](ox::UPtr<BaseEditor> const &e) {
 		return !e->unsavedChanges();

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

@@ -84,6 +84,7 @@ class StudioUI final: public ox::SignalHandler {
 			ox::String args;
 		};
 		ox::Optional<NavAction> m_navAction;
+		float m_fontScale{};
 
 	public:
 		explicit StudioUI(turbine::Context &tctx, ox::StringParam projectDataDir) noexcept;
@@ -102,9 +103,13 @@ class StudioUI final: public ox::SignalHandler {
 		bool handleShutdown() noexcept;
 
 	protected:
+		void preDraw() noexcept;
+
 		void draw() noexcept;
 
 	private:
+		void loadFont() noexcept;
+
 		void drawMenu() noexcept;
 
 		void drawTabBar() noexcept;

src/olympic/studio/applib/src/subcommands/CMakeLists.txt

@@ -0,0 +1,10 @@
+
+target_sources(
+	StudioAppLib PRIVATE
+		change-format/change-format.cpp
+)
+
+target_link_libraries(
+	StudioAppLib PUBLIC
+		OxClArgs
+)

src/olympic/studio/applib/src/subcommands/change-format/change-format.cpp

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2016 - 2026 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ */
+
+#include <ox/clargs/clargs.hpp>
+#include <ox/std/trace.hpp>
+
+#include <studio/project.hpp>
+
+#include "change-format.hpp"
+
+namespace studio {
+
+static ox::Error convertFile(
+	ox::FileSystem &fs,
+	ox::TypeStore &ts,
+	ox::StringViewCR path,
+	ox::ClawFormat const fmt) noexcept {
+	OX_REQUIRE_M(buff, fs.read(path).reoriginate(1, "unable to read file"));
+	OX_REQUIRE(uuid, keel::readUuidHeader(buff));
+	OX_REQUIRE(obj, keel::readAsset(ts, buff).reoriginate(1, "unable to parse file"));
+	buff.clear();
+	ox::BufferWriter writer{&buff};
+	OX_RETURN_ERROR(keel::writeUuidHeader(writer, uuid));
+	OX_RETURN_ERROR(ox::writeClaw(obj, writer, fmt));
+	if (fmt == ox::ClawFormat::Organic) {
+		*buff.back().value = '\n';
+	}
+	OX_RETURN_ERROR(fs.write(path, buff).reoriginate(1, "unable to write file"));
+	return {};
+}
+
+static void printUsage() noexcept {
+	oxErr("usage: change-format {mc,oc} [files...]\n");
+}
+
+[[nodiscard]]
+static constexpr ox::Result<ox::ClawFormat> getFmt(ox::StringViewCR fmtStr) noexcept {
+	if (caseInsensitiveStrCmp(fmtStr, "mc") == 0) {
+		return ox::ClawFormat::Metal;
+	} else if (caseInsensitiveStrCmp(fmtStr, "oc") == 0) {
+		return ox::ClawFormat::Organic;
+	}
+	return ox::Error{1, "invalid format"};
+}
+
+ox::Error cmdChangeFormat(Project &project, ox::SpanView<ox::CString> const args) noexcept {
+	if (args.size() < 2) {
+		printUsage();
+		return ox::Error{1, "invalid input"};
+	}
+	auto const [fmt, fmtErr] = getFmt(args[0]);
+	if (fmtErr) {
+		printUsage();
+	}
+	auto &fs = project.romFs();
+	auto &ts = project.typeStore();
+	for (auto const &file : args + 1) {
+		auto const err = convertFile(fs, ts, file, fmt);
+		if (err) {
+			oxErrf("Failed to convert {}: {}\n", file, err.msg);
+		}
+	}
+	return {};
+}
+
+}

src/olympic/studio/applib/src/subcommands/change-format/change-format.hpp

@@ -0,0 +1,13 @@
+/*
+ * Copyright 2016 - 2026 Gary Talent (gary@drinkingtea.net). All rights reserved.
+ */
+
+#pragma once
+
+#include <studio/project.hpp>
+
+namespace studio {
+
+ox::Error cmdChangeFormat(Project &project, ox::SpanView<ox::CString> args) noexcept;
+
+}

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

@@ -27,6 +27,10 @@ namespace studio::ig {
 
 inline constexpr auto BtnSz = ImVec2{52, 22};
 
+void setDpiScale(float scale) noexcept;
+
+[[nodiscard]]
+float dpiScale() noexcept;
 
 constexpr ImTextureID toImTextureID(ox::Unsigned_c auto id) noexcept
 	requires(sizeof(id) <= sizeof(ox::Uint<sizeof(ImTextureID)*8>)) {
@@ -133,7 +137,7 @@ auto dragDropTarget(auto const &cb) noexcept {
 
 class ChildStackItem {
 	public:
-		explicit ChildStackItem(ox::CStringViewCR id, ImVec2 const &sz = {}) noexcept;
+		explicit ChildStackItem(ox::CStringViewCR id, ImVec2 sz = {}) noexcept;
 		~ChildStackItem() noexcept;
 };
 
@@ -153,7 +157,12 @@ class IndentStackItem {
 		~IndentStackItem() noexcept;
 };
 
-void centerNextWindow(turbine::Context &ctx) noexcept;
+void centerNextWindow() noexcept;
+
+inline void Dummy(ImVec2 const &sz) noexcept {
+	auto const scale = dpiScale();
+	ImGui::Dummy({sz.x * scale, sz.y * scale});
+}
 
 bool PushButton(ox::CStringViewCR lbl, ImVec2 const &btnSz = BtnSz) noexcept;
 
@@ -173,10 +182,10 @@ TextInput<ox::IString<MaxChars>> InputText(
 		ox::StringViewCR currentText,
 		ImGuiInputTextFlags const flags = 0,
 		ImGuiInputTextCallback const callback = nullptr,
-		void *user_data = nullptr) noexcept {
+		void *const userData = nullptr) noexcept {
 	TextInput<ox::IString<MaxChars>> out = {.text = currentText};
 	out.changed = ImGui::InputText(
-			label.c_str(), out.text.data(), MaxChars + 1, flags, callback, user_data);
+			label.c_str(), out.text.data(), MaxChars + 1, flags, callback, userData);
 	if (out.changed) {
 		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 		std::ignore = out.text.unsafeResize(ox::strlen(out.text.c_str()));
@@ -192,10 +201,10 @@ TextInput<ox::IString<MaxChars>> InputTextWithHint(
 		ox::StringViewCR currentText,
 		ImGuiInputTextFlags const flags = 0,
 		ImGuiInputTextCallback const callback = nullptr,
-		void *user_data = nullptr) noexcept {
+		void *userData = nullptr) noexcept {
 	TextInput<ox::IString<MaxChars>> out = {.text = currentText};
 	out.changed = ImGui::InputTextWithHint(
-			label.c_str(), hint.c_str(), out.text.data(), MaxChars + 1, flags, callback, user_data);
+			label.c_str(), hint.c_str(), out.text.data(), MaxChars + 1, flags, callback, userData);
 	if (out.changed) {
 		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 		std::ignore = out.text.unsafeResize(ox::strlen(out.text.c_str()));
@@ -210,9 +219,9 @@ bool InputText(
 	ox::IString<StrCap> &text,
 	ImGuiInputTextFlags const flags = 0,
 	ImGuiInputTextCallback const callback = nullptr,
-	void *user_data = nullptr) noexcept {
+	void *userData = nullptr) noexcept {
 	auto const out = ImGui::InputText(
-		label.c_str(), text.data(), StrCap + 1, flags, callback, user_data);
+		label.c_str(), text.data(), StrCap + 1, flags, callback, userData);
 	if (out) {
 		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
 		std::ignore = text.unsafeResize(ox::strlen(text.c_str()));
@@ -243,7 +252,7 @@ PopupResponse PopupControlsOk(
 	ox::CStringViewCR ok);
 
 [[nodiscard]]
-bool BeginPopup(turbine::Context &ctx, ox::CStringViewCR popupName, bool &show, ImVec2 const &sz = {285, 0});
+bool BeginPopup(ox::CStringViewCR popupName, bool &show, ImVec2 sz = {285, 0});
 
 /**
  *
@@ -290,7 +299,7 @@ bool ListBox(
 		std::function<ox::CStringView(size_t)> const &f,
 		size_t strCnt,
 		size_t &selIdx,
-		ImVec2 const &sz = {0, 0}) noexcept;
+		ImVec2 sz = {0, 0}) noexcept;
 
 /**
  *

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

@@ -122,6 +122,16 @@ class Project: public ox::SignalHandler {
 
 		ox::Error writeTypeStore() noexcept;
 
+		[[nodiscard]]
+		constexpr ox::TypeStore &typeStore() noexcept {
+			return m_typeStore;
+		}
+
+		[[nodiscard]]
+		constexpr ox::TypeStore const &typeStore() const noexcept {
+			return m_typeStore;
+		}
+
 	private:
 		void buildFileIndex() noexcept;
 
@@ -155,7 +165,7 @@ template<typename T>
 ox::Error Project::writeObj(ox::StringViewCR path, T const &obj, ox::ClawFormat fmt) noexcept {
 	OX_REQUIRE_M(buff, ox::writeClaw(obj, fmt));
 	if (fmt == ox::ClawFormat::Organic) {
-		buff.pop_back();
+		*buff.back().value = '\n';
 	}
 	// write to FS
 	OX_RETURN_ERROR(mkdir(parentDir(path)));

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

@@ -2,6 +2,8 @@
  * Copyright 2016 - 2025 Gary Talent (gary@drinkingtea.net). All rights reserved.
  */
 
+#include <turbine/turbine.hpp>
+
 #include <studio/imguiutil.hpp>
 
 #include <studio/filepickerpopup.hpp>
@@ -83,9 +85,10 @@ ox::Optional<ox::String> FilePickerPopup::draw(Context &ctx) noexcept {
 	if (!m_open) {
 		return out;
 	}
-	if (ig::BeginPopup(ctx.tctx, m_name, m_open, {380, 340})) {
+	auto const scale = turbine::scale(ctx.tctx);
+	if (ig::BeginPopup(m_name, m_open, {380, 340})) {
 		auto const vp = ImGui::GetContentRegionAvail();
-		m_explorer.draw(ctx, {vp.x, vp.y - 30});
+		m_explorer.draw(ctx, {vp.x, vp.y - 30 * scale});
 		if (ig::PopupControlsOkCancel(m_open) == ig::PopupResponse::OK || m_explorer.opened) {
 			out = handlePick();
 		}

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

@@ -10,7 +10,25 @@
 
 namespace studio::ig {
 
-ChildStackItem::ChildStackItem(ox::CStringViewCR id, ImVec2 const &sz) noexcept {
+static constexpr void scaleSz(ImVec2 &sz) noexcept {
+	auto const scale = dpiScale();
+	sz.x *= scale;
+	sz.y *= scale;
+}
+
+static thread_local float g_dpiScale = 1.f;
+
+void setDpiScale(float const scale) noexcept {
+	g_dpiScale = scale;
+}
+
+[[nodiscard]]
+float dpiScale() noexcept {
+	return g_dpiScale;
+}
+
+ChildStackItem::ChildStackItem(ox::CStringViewCR id, ImVec2 sz) noexcept {
+	scaleSz(sz);
 	ImGui::BeginChild(id.c_str(), sz);
 }
 
@@ -33,7 +51,7 @@ IDStackItem::~IDStackItem() noexcept {
 }
 
 
-IndentStackItem::IndentStackItem(float indent) noexcept: m_indent(indent) {
+IndentStackItem::IndentStackItem(float id) noexcept: m_indent(id) {
 	ImGui::Indent(m_indent);
 }
 
@@ -42,16 +60,18 @@ IndentStackItem::~IndentStackItem() noexcept {
 }
 
 
-void centerNextWindow(turbine::Context &ctx) noexcept {
-	auto const sz = turbine::getScreenSize(ctx);
-	auto const screenW = static_cast<float>(sz.width);
-	auto const screenH = static_cast<float>(sz.height);
-	auto const mod = ImGui::GetWindowDpiScale() * 2;
-	ImGui::SetNextWindowPos(ImVec2(screenW / mod, screenH / mod), ImGuiCond_Always, ImVec2(0.5f, 0.5f));
+void centerNextWindow() noexcept {
+    auto const &io = ImGui::GetIO();
+    auto const sz = io.DisplaySize;
+    ImGui::SetNextWindowPos(
+    	{sz.x * 0.5f, sz.y * 0.5f},
+    	ImGuiCond_Always,
+    	{0.5f, 0.5f});
 }
 
 bool PushButton(ox::CStringViewCR lbl, ImVec2 const &btnSz) noexcept {
-	return ImGui::Button(lbl.c_str(), btnSz);
+	auto const scale = dpiScale();
+	return ImGui::Button(lbl.c_str(), {btnSz.x * scale, btnSz.y * scale});
 }
 
 PopupResponse PopupControlsOkCancel(
@@ -60,9 +80,10 @@ PopupResponse PopupControlsOkCancel(
 	ox::CStringViewCR ok,
 	ox::CStringViewCR cancel) {
 	auto out = PopupResponse::None;
-	constexpr auto btnSz = ImVec2{50, BtnSz.y};
+	auto const scale = dpiScale();
+	auto const btnSz = ImVec2{50 * scale, BtnSz.y * scale};
 	ImGui::Separator();
-	ImGui::SetCursorPosX(popupWidth - 118);
+	ImGui::SetCursorPosX(popupWidth - 118 * scale);
 	if (ImGui::Button(ok.c_str(), btnSz)) {
 		popupOpen = false;
 		out = PopupResponse::OK;
@@ -79,16 +100,18 @@ PopupResponse PopupControlsOkCancel(
 	bool &popupOpen,
 	ox::CStringViewCR ok,
 	ox::CStringViewCR cancel) {
-	return PopupControlsOkCancel(ImGui::GetContentRegionAvail().x + 17, popupOpen, ok, cancel);
+	auto const scale = dpiScale();
+	return PopupControlsOkCancel(ImGui::GetContentRegionAvail().x + 17 * scale, popupOpen, ok, cancel);
 }
 
 PopupResponse PopupControlsOk(
 	bool &popupOpen,
 	ox::CStringViewCR ok) {
+	auto const scale = dpiScale();
 	auto out = PopupResponse::None;
-	constexpr auto btnSz = ImVec2{50, BtnSz.y};
+	auto const btnSz = ImVec2{50 * scale, BtnSz.y * scale};
 	ImGui::Separator();
-	ImGui::SetCursorPosX(ImGui::GetContentRegionAvail().x - 42);
+	ImGui::SetCursorPosX(ImGui::GetContentRegionAvail().x - 42 * scale);
 	if (ImGui::Button(ok.c_str(), btnSz)) {
 		popupOpen = false;
 		out = PopupResponse::OK;
@@ -101,23 +124,24 @@ PopupResponse PopupControlsOk(
 	return out;
 }
 
-bool BeginPopup(turbine::Context &ctx, ox::CStringViewCR popupName, bool &show, ImVec2 const &sz) {
+bool BeginPopup(ox::CStringViewCR popupName, bool &show, ImVec2 sz) {
+	scaleSz(sz);
 	constexpr auto modalFlags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize;
-	centerNextWindow(ctx);
+	centerNextWindow();
 	ImGui::OpenPopup(popupName.c_str());
 	ImGui::SetNextWindowSize(sz);
 	return ImGui::BeginPopupModal(popupName.c_str(), &show, modalFlags);
 }
 
 bool ComboBox(
-		ox::CStringView const &lbl,
+		ox::CStringViewCR lbl,
 		ox::SpanView<ox::CStringView> const list,
 		size_t &selectedIdx) noexcept {
 	bool out{};
 	auto const first = selectedIdx < list.size() ? list[selectedIdx].c_str() : "";
 	if (ImGui::BeginCombo(lbl.c_str(), first, 0)) {
 		for (auto i = 0u; i < list.size(); ++i) {
-			auto const selected = (selectedIdx == i);
+			auto const selected = selectedIdx == i;
 			if (ImGui::Selectable(list[i].c_str(), selected) && selectedIdx != i) {
 				selectedIdx = i;
 				out = true;
@@ -129,14 +153,14 @@ bool ComboBox(
 }
 
 bool ComboBox(
-		ox::CStringView const &lbl,
+		ox::CStringViewCR lbl,
 		ox::Span<ox::String const> const list,
 		size_t &selectedIdx) noexcept {
 	bool out{};
 	auto const first = selectedIdx < list.size() ? list[selectedIdx].c_str() : "";
 	if (ImGui::BeginCombo(lbl.c_str(), first, 0)) {
 		for (auto i = 0u; i < list.size(); ++i) {
-			auto const selected = (selectedIdx == i);
+			auto const selected = selectedIdx == i;
 			if (ImGui::Selectable(list[i].c_str(), selected) && selectedIdx != i) {
 				selectedIdx = i;
 				out = true;
@@ -181,12 +205,14 @@ bool ListBox(
 		std::function<ox::CStringView(size_t)> const &f,
 		size_t const strCnt,
 		size_t &selIdx,
-		ImVec2 const &sz) noexcept {
+		ImVec2 sz) noexcept {
+	auto const scale = dpiScale();
+	sz = {sz.x * scale, sz.y * scale};
 	auto out = false;
 	if (ImGui::BeginListBox(name.c_str(), sz)) {
 		for (size_t i = 0; i < strCnt; ++i) {
-			auto str = f(i);
-			ig::IDStackItem const idStackItem2(static_cast<int>(i));
+			auto const str = f(i);
+			IDStackItem const idStackItem2(static_cast<int>(i));
 			if (ImGui::Selectable(str.c_str(), selIdx == i)) {
 				if (i != selIdx) {
 					selIdx = i;
@@ -200,13 +226,13 @@ bool ListBox(
 }
 
 bool ListBox(ox::CStringViewCR name, ox::SpanView<ox::String> const &list, size_t &selIdx) noexcept {
-	return ListBox(name, [list](size_t i) -> ox::CStringView {
+	return ListBox(name, [list](size_t const i) -> ox::CStringView {
 		return list[i];
 	}, list.size(), selIdx);
 }
 
 bool ListBox(ox::CStringViewCR name, ox::SpanView<ox::CStringView> const &list, size_t &selIdx) noexcept {
-	return ListBox(name, [list](size_t i) -> ox::CStringView {
+	return ListBox(name, [list](size_t const i) -> ox::CStringView {
 		return list[i];
 	}, list.size(), selIdx);
 }
@@ -229,7 +255,7 @@ void FilePicker::draw() noexcept {
 	}
 	auto constexpr popupSz = ImVec2{450.f, 0};
 	IDStackItem const idStackItem(m_title);
-	if (BeginPopup(m_sctx.tctx, m_title, m_show, popupSz)) {
+	if (BeginPopup(m_title, m_show, popupSz)) {
 		auto const &list = m_sctx.project->fileList(m_fileExt);
 		size_t selIdx{};
 		ComboBox(m_title, list, selIdx);
@@ -284,7 +310,7 @@ void QuestionPopup::draw(Context &ctx) noexcept {
 			turbine::requireRefreshFor(ctx.tctx, 1000);
 		[[fallthrough]];
 		case Stage::Open:
-			centerNextWindow(ctx.tctx);
+			centerNextWindow();
 			ImGui::SetNextWindowSize({});
 			constexpr auto modalFlags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize;
 			if (ImGui::BeginPopupModal(m_title.c_str(), &m_open, modalFlags)) {
@@ -319,7 +345,7 @@ void MessagePopup::show(ox::StringParam msg) noexcept {
 	open();
 }
 
-void MessagePopup::draw(Context &ctx) noexcept {
+void MessagePopup::draw(Context&) noexcept {
 	switch (m_stage) {
 		case Stage::Closed:
 			break;
@@ -329,7 +355,7 @@ void MessagePopup::draw(Context &ctx) noexcept {
 			m_open = true;
 		[[fallthrough]];
 		case Stage::Open:
-			centerNextWindow(ctx.tctx);
+			centerNextWindow();
 			ImGui::SetNextWindowSize({});
 			constexpr auto modalFlags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize;
 			if (ImGui::BeginPopupModal(m_title.c_str(), &m_open, modalFlags)) {

src/olympic/studio/modlib/src/popup.cpp

@@ -7,9 +7,9 @@
 
 namespace studio {
 
-void Popup::drawWindow(turbine::Context &ctx, bool &open, std::function<void()> const &drawContents) {
-	ig::centerNextWindow(ctx);
-	ImGui::SetNextWindowSize(static_cast<ImVec2>(m_size));
+void Popup::drawWindow(turbine::Context&, bool &open, std::function<void()> const &drawContents) {
+	ig::centerNextWindow();
+	ImGui::SetNextWindowSize(static_cast<ImVec2>(m_size * ig::dpiScale()));
 	constexpr auto modalFlags = ImGuiWindowFlags_NoCollapse | ImGuiWindowFlags_NoMove | ImGuiWindowFlags_NoResize;
 	if (ImGui::BeginPopupModal(m_title.c_str(), &open, modalFlags)) {
 		drawContents();

src/olympic/studio/modlib/src/project.cpp

@@ -14,13 +14,15 @@
 namespace studio {
 
 static_assert(fileExt("main.c").value == "c");
+static_assert(fileExt("main.cc").value == "cc");
+static_assert(fileExt("main.cpp").value == "cpp");
 static_assert(fileExt("a.b.c").value == "c");
 static_assert(parentDir("/a/b/c") == "/a/b");
 static_assert(parentDir("/a/b/c/") == "/a/b");
 
 static void generateTypes(ox::TypeStore &ts) noexcept {
 	for (auto const mod : keel::modules()) {
-		for (auto gen : mod->types()) {
+		for (auto const gen : mod->types()) {
 			oxLogError(gen(ts));
 		}
 	}

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

@@ -18,6 +18,7 @@ namespace gl {
 class Drawer {
 	public:
 		virtual ~Drawer() = default;
+		virtual void preDraw(Context&) noexcept {}
 		virtual void draw(Context&) noexcept = 0;
 };
 void addDrawer(Context &ctx, Drawer *cd) noexcept;

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

@@ -11,7 +11,6 @@
 #include "gfx.hpp"
 
 namespace turbine {
-
 class Context;
 
 using TimeMs = uint64_t;
@@ -91,9 +90,15 @@ KeyEventHandler keyEventHandler(Context const &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;
+ox::Result<ox::UPtr<Context>> init(
+	ox::UPtr<ox::FileSystem> &&fs,
+	ox::StringViewCR appName,
+	ox::StringViewCR appId = {}) noexcept;
 
-ox::Result<ox::UPtr<Context>> init(ox::StringViewCR fsPath, ox::StringViewCR appName) noexcept;
+ox::Result<ox::UPtr<Context>> init(
+	ox::StringViewCR fsPath,
+	ox::StringViewCR appName,
+	ox::StringViewCR appId = {}) noexcept;
 
 ox::Error run(Context &ctx) noexcept;
 
@@ -112,4 +117,10 @@ void setShutdownHandler(Context &ctx, ShutdownHandler handler) noexcept;
 // sleep time is a minimum of ~16 milliseconds.
 void setUpdateHandler(Context &ctx, UpdateHandler) noexcept;
 
+[[nodiscard]]
+float scale(Context const &ctx) noexcept;
+
+[[nodiscard]]
+bool isWayland() noexcept;
+
 }

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

@@ -95,7 +95,7 @@ ox::Error setWindowBounds(Context&, ox::Bounds const&) noexcept {
 }
 
 ox::Result<ox::UPtr<Context>> init(
-		ox::UPtr<ox::FileSystem> &&fs, ox::StringViewCR appName) noexcept {
+		ox::UPtr<ox::FileSystem> &&fs, ox::StringViewCR appName, ox::StringViewCR) noexcept {
 	auto ctx = ox::make_unique<Context>();
 	OX_RETURN_ERROR(keel::init(ctx->keelCtx, std::move(fs), appName));
 #ifdef OX_BARE_METAL
@@ -139,4 +139,12 @@ KeyEventHandler keyEventHandler(Context const &ctx) noexcept {
 	return ctx.keyEventHandler;
 }
 
+float scale(Context const&) noexcept {
+	return 1;
+}
+
+bool isWayland() noexcept {
+	return false;
+}
+
 }

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

@@ -32,6 +32,7 @@ class Context {
 		uint64_t draws = 0;
 		bool running{};
 		ShutdownHandler shutdownHandler{};
+		float scale{};
 
 		Context() noexcept = default;
 

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

@@ -235,12 +235,15 @@ void requireRefreshFor(Context &ctx, int ms) noexcept {
 
 static void draw(Context &ctx) noexcept {
 	// draw start
+	for (auto const d : ctx.drawers) {
+		d->preDraw(ctx);
+	}
 #if TURBINE_USE_IMGUI
 	ImGui_ImplOpenGL3_NewFrame();
 	ImGui_ImplGlfw_NewFrame();
 	ImGui::NewFrame();
 #endif
-	for (auto d : ctx.drawers) {
+	for (auto const d : ctx.drawers) {
 		d->draw(ctx);
 	}
 #if TURBINE_USE_IMGUI
@@ -330,7 +333,9 @@ static void handleGlfwWindowCloseEvent(GLFWwindow *window) noexcept {
 }
 
 ox::Result<ox::UPtr<Context>> init(
-		ox::UPtr<ox::FileSystem> &&fs, ox::StringViewCR appName) noexcept {
+		ox::UPtr<ox::FileSystem> &&fs,
+		ox::StringViewCR appName,
+		ox::StringViewCR appId) noexcept {
 	auto ctx = ox::make_unique<Context>();
 	OX_RETURN_ERROR(keel::init(ctx->keelCtx, std::move(fs), appName));
 	using namespace std::chrono;
@@ -339,12 +344,20 @@ ox::Result<ox::UPtr<Context>> init(
 	setMandatoryRefreshPeriod(*ctx, ticksMs(*ctx) + config::MandatoryRefreshPeriod);
 	// init GLFW context
 	glfwInit();
+	glfwWindowHint(GLFW_SCALE_TO_MONITOR, GLFW_TRUE);
 	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);
+	{
+		auto appIdCstr = ox_malloca(appId.bytes() + 1, char);
+		OX_ALLOW_UNSAFE_BUFFERS_BEGIN
+		ox::strncpy(appIdCstr.get(), appId.data(), appId.bytes());
+		OX_ALLOW_UNSAFE_BUFFERS_END
+		glfwWindowHintString(GLFW_WAYLAND_APP_ID, appIdCstr.get());
+	}
 	constexpr auto Scale = 5;
 	ctx->window = glfwCreateWindow(
 		240 * Scale, 160 * Scale, ctx->keelCtx.appName.c_str(), nullptr, nullptr);
@@ -373,6 +386,13 @@ ox::Result<ox::UPtr<Context>> init(
 	ImGui_ImplOpenGL3_Init();
 	io.IniFilename = nullptr;
 	themeImgui();
+	float xscale{}, yscale{};
+	glfwGetWindowContentScale(ctx->window, &xscale, &yscale);
+	ctx->scale = isWayland() || ox::defines::OS == ox::OS::Darwin ?
+		1.f : ox::max(xscale, yscale);
+	io.DisplayFramebufferScale = ImVec2{ctx->scale, ctx->scale};
+	auto &style = ImGui::GetStyle();
+	style.ScaleAllSizes(ctx->scale);
 #endif
 	return ctx;
 }
@@ -471,4 +491,14 @@ KeyEventHandler keyEventHandler(Context const &ctx) noexcept {
 	return ctx.keyEventHandler;
 }
 
+float scale(Context const &ctx) noexcept {
+	float x{}, y{};
+	glfwGetWindowContentScale(ctx.window, &x, &y);
+	return y;
+}
+
+bool isWayland() noexcept {
+	return glfwGetPlatform() == GLFW_PLATFORM_WAYLAND;
+}
+
 }

src/olympic/turbine/src/turbine.cpp

@@ -8,9 +8,12 @@
 
 namespace turbine {
 
-ox::Result<ox::UPtr<Context>> init(ox::StringViewCR fsPath, ox::StringViewCR appName) noexcept {
+ox::Result<ox::UPtr<Context>> init(
+	ox::StringViewCR fsPath,
+	ox::StringViewCR appName,
+	ox::StringViewCR appId) noexcept {
 	OX_REQUIRE_M(fs, keel::loadRomFs(fsPath));
-	return init(std::move(fs), appName);
+	return init(std::move(fs), appName, appId);
 }
 
 }

util/scripts/file-to-cpp.py

@@ -64,7 +64,7 @@ def proc_rsrc_file(rsrc_path: str):# Open and read the JSON file
         pop_ns = ''
     cpp = '// Generated\n\n#include <ox/std/array.hpp>\n'
     cpp += '#include <ox/std/span.hpp>\n\n'
-    hpp = '// Generated\n\n#include <ox/std/span.hpp>\n\n'
+    hpp = '// Generated\n\n#pragma once\n\n#include <ox/std/span.hpp>\n\n'
     cpp += push_ns
     hpp += push_ns
     all_files_func_decl = ''