Merge branch 'main' of https://github.com/stergiotis/imzero_client_cpp

Author: stergiotis

common/env.sh

@@ -1,3 +1,3 @@
 here=$(dirname "$(readlink -f "$BASH_SOURCE")")
-export IMZERO_CPP_BINDING_DIR="$here/src/binding"
+export IMZERO_CPP_BINDING_DIR="$here/../skia/src/binding"
 export IMZERO_DOXYGEN="$HOME/Downloads/doxygen-1.10.0/bin/doxygen"

dhall/cmakelists.dhall

@@ -75,7 +75,7 @@ let cmakelistsToText = \(m : cmakelists.Type) ->
 			++ prelude.Text.concatSep "\n" out
 			++ "\n# end ${p.name}\n")
 	let recursiveLinking = prelude.Text.concatSep "\n" (if m.recursiveLinking then
-	[, "if(CMAKE_C_COMPILER_ID STREQUAL \"GNU\" AND CMAKE_SYSTEM_NAME STREQUAL \"Linux\")"
+	[, "if(CMAKE_CXX_COMPILER_ID STREQUAL \"Clang\" AND CMAKE_SYSTEM_NAME STREQUAL \"Linux\")"
 	, "add_link_options(-Wl,--start-group)"
 	, "endif()"] else [] : List Text)
 	let targets = prelude.Text.concatMapSep "\n" lib.sourceTreePart.Type composeTarget m.sourceTreeParts

go.mod

@@ -13,6 +13,7 @@ require (
 )
 
 require (
+	github.com/AfterShip/clickhouse-sql-parser v0.4.2 // indirect
 	github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
 	github.com/brianvoe/gofakeit/v7 v7.1.2 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
@@ -21,6 +22,7 @@ require (
 	github.com/fxamacker/cbor/v2 v2.7.0 // indirect
 	github.com/google/flatbuffers v24.12.23+incompatible // indirect
 	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
+	github.com/matoous/go-nanoid/v2 v2.1.0 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/philip-peterson/go-mutablestring v1.0.7 // indirect
@@ -37,4 +39,5 @@ require (
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect
 	golang.org/x/tools v0.28.0 // indirect
+	lukechampine.com/blake3 v1.4.0 // indirect
 )

go.sum

@@ -1,3 +1,5 @@
+github.com/AfterShip/clickhouse-sql-parser v0.4.2 h1:naPEXg2Ketks0VuwGXw2uHczYIhc8KAZd/KCvIkudFQ=
+github.com/AfterShip/clickhouse-sql-parser v0.4.2/go.mod h1:W0Z82wJWkJxz2RVun/RMwxue3g7ut47Xxl+SFqdJGus=
 github.com/antlr4-go/antlr/v4 v4.13.1 h1:SqQKkuVZ+zWkMMNkjy5FZe5mr5WURWnlpmOuzYWrPrQ=
 github.com/antlr4-go/antlr/v4 v4.13.1/go.mod h1:GKmUxMtwp6ZgGwZSva4eWPC5mS6vUAmOABFgjdkM7Nw=
 github.com/brianvoe/gofakeit/v7 v7.1.2 h1:vSKaVScNhWVpf1rlyEKSvO8zKZfuDtGqoIHT//iNNb8=
@@ -18,6 +20,8 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
 github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY=
 github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8=
+github.com/matoous/go-nanoid/v2 v2.1.0 h1:P64+dmq21hhWdtvZfEAofnvJULaRR1Yib0+PnU669bE=
+github.com/matoous/go-nanoid/v2 v2.1.0/go.mod h1:KlbGNQ+FhrUNIHUxZdL63t7tl4LaPkZNpUULS8H4uVM=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
@@ -68,3 +72,5 @@ golang.org/x/tools v0.28.0 h1:WuB6qZ4RPCQo5aP3WdKZS7i595EdWqWR8vqJTlwTVK8=
 golang.org/x/tools v0.28.0/go.mod h1:dcIOrVd3mfQKTgrDVQHqCPMWy6lnhfhtX3hLXYVLfRw=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+lukechampine.com/blake3 v1.4.0 h1:xDbKOZCVbnZsfzM6mHSYcGRHZ3YrLDzqz8XnV4uaD5w=
+lukechampine.com/blake3 v1.4.0/go.mod h1:MQJNQCTnR+kwOP/JEZSxj3MaQjp80FOFSNMMHXcSeX0=

imgui_skia/CMakeLists.txt

@@ -1,135 +1,135 @@
-# generated using cmakelists.dhall
-cmake_minimum_required(VERSION 3.24)
-project(imgui_skia)
-set(CMAKE_LINKER clang++)
-set(CMAKE_CXX_COMPILER clang++)
-set(CMAKE_BUILD_TYPE Release)
-
-add_compile_definitions(MESA_EGL_NO_X11_HEADERS
-NOMINMAX
-NDEBUG
-SK_CODEC_DECODES_BMP
-SK_CODEC_DECODES_WBMP
-SKIA_DLL
-SK_ENABLE_PRECOMPILE
-SK_GANESH
-SK_DISABLE_TRACING
-SK_GAMMA_APPLY_TO_A8
-SK_ENABLE_AVX512_OPTS
-SKIA_IMPLEMENTATION=1
-SK_FONTMGR_FREETYPE_DIRECTORY_AVAILABLE
-SK_TYPEFACE_FACTORY_FREETYPE
-SK_FONTMGR_FREETYPE_EMBEDDED_AVAILABLE
-SK_FONTMGR_FREETYPE_EMPTY_AVAILABLE
-SK_TYPEFACE_FACTORY_DIRECTWRITE
-SK_FONTMGR_DIRECTWRITE_AVAILABLE
-SK_FONTMGR_GDI_AVAILABLE
-SK_GL
-SK_CODEC_ENCODES_JPEG
-SK_SUPPORT_PDF
-SK_CODEC_DECODES_JPEG
-SK_CODEC_ENCODES_PNG
-SK_CODEC_ENCODES_PNG_WITH_LIBPNG
-SK_CODEC_ENCODES_WEBP
-SK_SUPPORT_XPS
-SK_CODEC_DECODES_ICO
-SK_CODEC_DECODES_PNG
-SK_CODEC_DECODES_PNG_WITH_LIBPNG
-SK_CODEC_DECODES_RAW
-SK_CODEC_DECODES_WEBP
-SK_HAS_WUFFS_LIBRARY
-SK_CODEC_DECODES_GIF
-SK_XML
-SK_DISABLE_LEGACY_GL_MAKE_NATIVE_INTERFACE
-_HAS_AUTO_PTR_ETC
-)
-include_directories(C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./../../contrib/flatbuffers/include
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_impl
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./../../contrib/sdl/include
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./../../contrib/skia
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_driver_impl
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./../../contrib/tracy/public
-)
-add_compile_options(-std=c++20
--Wall
--Wformat
--Wextra
--Wno-unused-parameter
--fno-omit-frame-pointer
--O3
-# skiaShared
--funwind-tables
--ffp-contract=off
--fstrict-aliasing
--fvisibility=hidden
--fdata-sections
--ffunction-sections
--fvisibility-inlines-hidden
--fno-exceptions
--fno-rtti
-)
-link_libraries(-DNDEBUG
-# sdl3Shared
--LC:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./../../contrib/sdl/build
--lSDL3-static
--lwinmm
--limm32
--lole32
--loleaut32
--lversion
--luuid
--ladvapi32
--lsetupapi
--lshell32
--ldinput8
-# skiaShared
--LC:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./../../contrib/skia/out/Static
--lskparagraph
--lskia
--lskunicode_core
--lskunicode_icu
--lbentleyottmann
--lskshaper
--lOpenGL32
-)
-
-# empty target systemFlags
-
-# empty target flatbuffers
-
-# begin imguiWithHooks1919Wip
-add_library(imguiWithHooks1919Wip STATIC C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip/imgui.cpp
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip/imgui_demo.cpp
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip/imgui_draw.cpp
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip/imgui_tables.cpp
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip/imgui_widgets.cpp
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip/imgui_impl_sdl3.cpp
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip/imgui_impl_sdl3.cpp)
-# end imguiWithHooks1919Wip
-
-# begin imguiSkiaImpl
-add_library(imguiSkiaImpl STATIC C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_impl/imgui_skia_extensions.cpp
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_impl/imgui_skia_hooks_impl.cpp
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_impl/imgui_skia_imzero_cmd_render.cpp
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_impl/imgui_skia_paragraph.cpp
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_impl/imgui_skia_setup_ui.cpp
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_impl/imgui_skia_tracy_support.cpp)
-# end imguiSkiaImpl
-
-# empty target sdl3Shared
-
-# empty target skiaShared
-
-# begin imguiSkiaDriverImpl
-add_library(imguiSkiaDriverImpl STATIC C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_driver_impl/imgui_skia_app_sdl3.cpp
-C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_driver_impl/imgui_skia_cli_options.cpp)
-# end imguiSkiaDriverImpl
-
-# begin tracyDisabled
-add_library(tracyDisabled STATIC C:/Users/User/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./../../contrib/tracy/public/TracyClient.cpp)
-# end tracyDisabled
-add_library(imgui_skia STATIC $<TARGET_OBJECTS:imguiWithHooks1919Wip>
-$<TARGET_OBJECTS:imguiSkiaImpl>
-$<TARGET_OBJECTS:imguiSkiaDriverImpl>
-$<TARGET_OBJECTS:tracyDisabled>)
+# generated using cmakelists.dhall
+cmake_minimum_required(VERSION 3.24)
+project(imgui_skia)
+set(CMAKE_LINKER clang++)
+set(CMAKE_CXX_COMPILER clang++)
+set(CMAKE_BUILD_TYPE Release)
+
+add_compile_definitions(MESA_EGL_NO_X11_HEADERS
+NOMINMAX
+NDEBUG
+SK_CODEC_DECODES_BMP
+SK_CODEC_DECODES_WBMP
+SKIA_DLL
+SK_ENABLE_PRECOMPILE
+SK_GANESH
+SK_DISABLE_TRACING
+SK_GAMMA_APPLY_TO_A8
+SK_ENABLE_AVX512_OPTS
+SKIA_IMPLEMENTATION=1
+SK_FONTMGR_FREETYPE_DIRECTORY_AVAILABLE
+SK_TYPEFACE_FACTORY_FREETYPE
+SK_FONTMGR_FREETYPE_EMBEDDED_AVAILABLE
+SK_FONTMGR_FREETYPE_EMPTY_AVAILABLE
+SK_TYPEFACE_FACTORY_DIRECTWRITE
+SK_FONTMGR_DIRECTWRITE_AVAILABLE
+SK_FONTMGR_GDI_AVAILABLE
+SK_GL
+SK_CODEC_ENCODES_JPEG
+SK_SUPPORT_PDF
+SK_CODEC_DECODES_JPEG
+SK_CODEC_ENCODES_PNG
+SK_CODEC_ENCODES_PNG_WITH_LIBPNG
+SK_CODEC_ENCODES_WEBP
+SK_SUPPORT_XPS
+SK_CODEC_DECODES_ICO
+SK_CODEC_DECODES_PNG
+SK_CODEC_DECODES_PNG_WITH_LIBPNG
+SK_CODEC_DECODES_RAW
+SK_CODEC_DECODES_WEBP
+SK_HAS_WUFFS_LIBRARY
+SK_CODEC_DECODES_GIF
+SK_XML
+SK_DISABLE_LEGACY_GL_MAKE_NATIVE_INTERFACE
+_HAS_AUTO_PTR_ETC
+)
+include_directories(/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./../../contrib/flatbuffers/include
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_impl
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./../../contrib/sdl/include
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./../../contrib/skia
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_driver_impl
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./../../contrib/tracy/public
+)
+add_compile_options(-std=c++20
+-Wall
+-Wformat
+-Wextra
+-Wno-unused-parameter
+-fno-omit-frame-pointer
+-O3
+# skiaShared
+-funwind-tables
+-ffp-contract=off
+-fstrict-aliasing
+-fvisibility=hidden
+-fdata-sections
+-ffunction-sections
+-fvisibility-inlines-hidden
+-fno-exceptions
+-fno-rtti
+)
+link_libraries(-DNDEBUG
+# sdl3Shared
+-L/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./../../contrib/sdl/build
+-lSDL3-static
+-lwinmm
+-limm32
+-lole32
+-loleaut32
+-lversion
+-luuid
+-ladvapi32
+-lsetupapi
+-lshell32
+-ldinput8
+# skiaShared
+-L/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./../../contrib/skia/out/Static
+-lskparagraph
+-lskia
+-lskunicode_core
+-lskunicode_icu
+-lbentleyottmann
+-lskshaper
+-lOpenGL32
+)
+
+# empty target systemFlags
+
+# empty target flatbuffers
+
+# begin imguiWithHooks1919Wip
+add_library(imguiWithHooks1919Wip STATIC /data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip/imgui.cpp
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip/imgui_demo.cpp
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip/imgui_draw.cpp
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip/imgui_tables.cpp
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip/imgui_widgets.cpp
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip/imgui_impl_sdl3.cpp
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_w_hooks_1.91.9_wip/imgui_impl_sdl3.cpp)
+# end imguiWithHooks1919Wip
+
+# begin imguiSkiaImpl
+add_library(imguiSkiaImpl STATIC /data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_impl/imgui_skia_extensions.cpp
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_impl/imgui_skia_hooks_impl.cpp
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_impl/imgui_skia_imzero_cmd_render.cpp
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_impl/imgui_skia_paragraph.cpp
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_impl/imgui_skia_setup_ui.cpp
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_impl/imgui_skia_tracy_support.cpp)
+# end imguiSkiaImpl
+
+# empty target sdl3Shared
+
+# empty target skiaShared
+
+# begin imguiSkiaDriverImpl
+add_library(imguiSkiaDriverImpl STATIC /data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_driver_impl/imgui_skia_app_sdl3.cpp
+/data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./imgui_skia_driver_impl/imgui_skia_cli_options.cpp)
+# end imguiSkiaDriverImpl
+
+# begin tracyDisabled
+add_library(tracyDisabled STATIC /data/repo/imzero_client_cpp/imgui_skia/../imgui_skia/./../../contrib/tracy/public/TracyClient.cpp)
+# end tracyDisabled
+add_library(imgui_skia STATIC $<TARGET_OBJECTS:imguiWithHooks1919Wip>
+$<TARGET_OBJECTS:imguiSkiaImpl>
+$<TARGET_OBJECTS:imguiSkiaDriverImpl>
+$<TARGET_OBJECTS:tracyDisabled>)

imgui_skia/build_ab_initio.sh

@@ -9,5 +9,6 @@ flatc="$here/../../contrib/flatbuffers/flatc"
 
 mkdir -p build
 cd build
-cmake -G Ninja ..
-cmake --build . -j
+cmake -G Ninja .. -DCMAKE_CXX_COMPILER=clang++ \
+	          -DCMAKE_C_COMPILER=clang
+cmake --build . -j