Replace hoehrmann_utf8 with SheenBidi

diasurgical · Feb 2, 2025 · f6bc014 · f6bc014
1 parent be6998c
commit f6bc014
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 85 deletions.
diff --git a/3rdParty/hoehrmann_utf8/CMakeLists.txt b/3rdParty/hoehrmann_utf8/CMakeLists.txt
diff --git a/3rdParty/hoehrmann_utf8/hoehrmann_utf8.h b/3rdParty/hoehrmann_utf8/hoehrmann_utf8.h
diff --git a/CMake/Dependencies.cmake b/CMake/Dependencies.cmake
@@ -207,8 +207,6 @@ endif()
 
 add_subdirectory(3rdParty/tl)
 
-add_subdirectory(3rdParty/hoehrmann_utf8)
-
 if(NOT DEFINED DEVILUTIONX_SYSTEM_SHEENBIDI)
   find_package(SheenBidi QUIET)
   if(SheenBidi_FOUND)

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -522,7 +522,7 @@ add_devilutionx_object_library(libdevilutionx_utf8
   utils/utf8.cpp
 )
 target_link_dependencies(libdevilutionx_utf8 PRIVATE
-  hoehrmann_utf8
+  SheenBidi::sheenbidi
 )
 
 if(NOSOUND)

diff --git a/Source/utils/utf8.cpp b/Source/utils/utf8.cpp
@@ -3,28 +3,25 @@
 #include <cstddef>
 #include <cstdint>
 #include <cstring>
+#include <string_view>
 
-#include <hoehrmann_utf8.h>
+extern "C" {
+#include <SheenBidi.h>
+}
 
 namespace devilution {
 
 char32_t DecodeFirstUtf8CodePoint(std::string_view input, std::size_t *len)
 {
-	uint32_t codepoint = 0;
-	uint8_t state = UTF8_ACCEPT;
-	for (std::size_t i = 0; i < input.size(); ++i) {
-		state = utf8_decode_step(state, static_cast<uint8_t>(input[i]), &codepoint);
-		if (state == UTF8_ACCEPT) {
-			*len = i + 1;
-			return codepoint;
-		}
-		if (state == UTF8_REJECT) {
-			*len = i + 1;
-			return Utf8DecodeError;
-		}
-	}
-	*len = input.size();
-	return Utf8DecodeError;
+	SBCodepointSequence seq {
+		.stringEncoding = SBStringEncodingUTF8,
+		.stringBuffer = const_cast<void *>(static_cast<const void *>(input.data())),
+		.stringLength = static_cast<SBUInteger>(input.size())
+	};
+	SBUInteger index = 0;
+	SBCodepoint result = SBCodepointSequenceGetCodepointAt(&seq, &index);
+	*len = index;
+	return result;
 }
 
 std::string_view TruncateUtf8(std::string_view str, std::size_t len)

diff --git a/Source/utils/utf8.hpp b/Source/utils/utf8.hpp
@@ -6,7 +6,7 @@
 
 namespace devilution {
 
-constexpr char32_t Utf8DecodeError = 0xD83F;
+constexpr char32_t Utf8DecodeError = 0xFFFD;
 
 /**
  * Decodes the first code point from UTF8-encoded input.

diff --git a/uwp-project/devilutionx.vcxproj b/uwp-project/devilutionx.vcxproj
@@ -93,7 +93,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <Link>
       <AdditionalDependencies>sdl_image.lib;libpng16_static.lib;pkware.lib;fmt.lib;zlibstatic.lib;bzip2.lib;libsmackerdec.lib;libmpq.lib;libdevilutionx.lib;lua_static.lib;sdl2.lib;sdl_audiolib.lib;asio.lib;sodium.lib;zt.lib;lwip_pic.lib;miniupnpc_pic.lib;natpmp_pic.lib;zt_pic.lib;zto_pic.lib;shlwapi.lib;shell32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <AdditionalLibraryDirectories>..\build\SDL\VisualC-WinRT\x64\Release\SDL-UWP;..\build\3rdParty\SDL_image\Release;..\build\_deps\zlib-build\Release;..\build\3rdParty\PKWare\Release;..\build\3rdParty\bzip2\Release;..\build\3rdParty\libsmackerdec\Release;..\build\3rdParty\libmpq\Release;..\build\_deps\lua-build\lua-5.4.6\Release;..\build\_deps\sdl_audiolib-build\Release;..\build\3rdParty\asio\Release;..\build\_deps\libsodium-build\Release;..\build\_deps\libzt-build\lib\Release;..\build\_deps\libfmt-build\Release;..\build\_deps\libpng-build\Release;..\build\Source\libdevilutionx.dir\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalLibraryDirectories>..\build\SDL\VisualC-WinRT\x64\Release\SDL-UWP;..\build\3rdParty\SDL_image\Release;..\build\_deps\zlib-build\Release;..\build\3rdParty\PKWare\Release;..\build\3rdParty\bzip2\Release;..\build\3rdParty\libsmackerdec\Release;..\build\3rdParty\libmpq\Release;..\build\_deps\lua-build\lua-5.4.6\Release;..\build\_deps\sdl_audiolib-build\Release;..\build\3rdParty\asio\Release;..\build\_deps\libsodium-build\Release;..\build\_deps\libzt-build\lib\Release;..\build\_deps\libfmt-build\Release;..\build\_deps\libpng-build\Release;..\build\_deps\sheenbidi-build\Release;..\build\Source\libdevilutionx.dir\Release;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
     </Link>
     <ClCompile>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>