Multiwindow

.gitmodules

@@ -1,20 +1,20 @@
 [submodule "tests/harness/modules/ruisapp"]
 	path = tests/harness/modules/ruisapp
 	url = ../ruisapp
-	branch = main
+	branch = multiwindow # main
 [submodule "tests/harness/modules/ruis-render-opengl"]
 	path = tests/harness/modules/ruis-render-opengl
 	url = ../ruis-render-opengl
-	branch = main
+	branch = multiwindow # main
 [submodule "tests/harness/modules/ruis-render-opengles"]
 	path = tests/harness/modules/ruis-render-opengles
 	url = ../ruis-render-opengles
-	branch = main
-[submodule "tool-configs"]
-	path = tool-configs
-	url = ../tool-configs
-	branch = main
+	branch = multiwindow # main
 [submodule "tests/harness/modules/ruis-render-null"]
 	path = tests/harness/modules/ruis-render-null
 	url = ../ruis-render-null
+	branch = multiwindow # main
+[submodule "tool-configs"]
+	path = tool-configs
+	url = ../tool-configs
 	branch = main

.vscode/launch.json

@@ -5,7 +5,7 @@
 	"version": "0.2.0",
 	"configurations": [
 		{
-			"name": "(gdb) app",
+			"name": "(gdb) app-xorg",
 			"type": "cppdbg",
 			"request": "launch",
 			"program": "${workspaceFolder}/tests/app/out/dev/tests",
@@ -15,7 +15,11 @@
 			"environment": [
 				{
 					"name": "LD_LIBRARY_PATH",
-					"value": "../../src/out/dev:../harness/modules/ruisapp/src/out/rel_no_install/opengl-xorg:../harness/modules/ruis-render-opengl/src/out/rel_no_install"
+					"value": "../../src/out/dev:../harness/modules/ruisapp/src/out/dev/opengl-xorg:../harness/modules/ruis-render-opengl/src/out/dev"
+				},
+				{
+					"name": "DYLD_LIBRARY_PATH",
+					"value": "../../src/out/dev:../harness/modules/ruisapp/src/out/dev/opengl:../harness/modules/ruis-render-opengl/src/out/dev"
 				}
 			],
 			"externalConsole": false,
@@ -27,7 +31,57 @@
 					"ignoreFailures": true
 				}
 			],
-			"preLaunchTask": "build-dev"
+			// "preLaunchTask": "build-dev"
+		},
+		{
+			"name": "(gdb) app-wayland",
+			"type": "cppdbg",
+			"request": "launch",
+			"program": "${workspaceFolder}/tests/app/out/dev/tests",
+			"args": [],
+			"stopAtEntry": false,
+			"cwd": "${workspaceFolder}/tests/app",
+			"environment": [
+				{
+					"name": "LD_LIBRARY_PATH",
+					"value": "../../src/out/dev:../harness/modules/ruisapp/src/out/dev/opengles-wayland:../harness/modules/ruis-render-opengles/src/out/dev"
+				}
+			],
+			"externalConsole": false,
+			"MIMode": "gdb",
+			"setupCommands": [
+				{
+					"description": "Enable pretty-printing for gdb",
+					"text": "-enable-pretty-printing",
+					"ignoreFailures": true
+				}
+			],
+			// "preLaunchTask": "build-dev"
+		},
+		{
+			"name": "(gdb) app-sdl",
+			"type": "cppdbg",
+			"request": "launch",
+			"program": "${workspaceFolder}/tests/app/out/dev/tests",
+			"args": [],
+			"stopAtEntry": false,
+			"cwd": "${workspaceFolder}/tests/app",
+			"environment": [
+				{
+					"name": "LD_LIBRARY_PATH",
+					"value": "../../src/out/dev:../harness/modules/ruisapp/src/out/dev/opengl-sdl:../harness/modules/ruis-render-opengl/src/out/dev"
+				}
+			],
+			"externalConsole": false,
+			"MIMode": "gdb",
+			"setupCommands": [
+				{
+					"description": "Enable pretty-printing for gdb",
+					"text": "-enable-pretty-printing",
+					"ignoreFailures": true
+				}
+			],
+			// "preLaunchTask": "build-dev"
 		},
 		{
 			"name": "(gdb) app2",

.vscode/tasks.json

@@ -207,6 +207,13 @@
             "problemMatcher": [],
             "group": "build"
         },
+        {
+            "label": "run-app-gl-sdl-dev",
+            "type": "shell",
+            "command": "make run-app win=sdl config=dev",
+            "problemMatcher": [],
+            "group": "build"
+        },
         {
             "label": "run-app-dev",
             "type": "shell",

build/android/app/CMakeLists.txt

@@ -12,15 +12,13 @@ file(GLOB_RECURSE srcs
 
 include (${ANDROID_GRADLE_NATIVE_BUNDLE_PLUGIN_MK})
 
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17 -DDEBUG")
 
 include_directories(
     ../../../src
     ../../../tests/harness/modules/ruisapp/src
     ../../../tests/harness/modules/ruis-render-opengles/src
 )
-#link_directories(../ruis/build/intermediates/cmake/release/obj/${ANDROID_ABI})
-#link_directories(../ruis/.cxx/Debug/4x66344r/arm64-v8a)
 
 add_library(
         # Specifies the name of the library.

build/android/app/build.gradle

@@ -55,7 +55,7 @@ dependencies {
 //    implementation 'io.github.cppfw:png:+'
 //    implementation 'io.github.cppfw:jpeg:+'
     implementation 'io.github.cppfw:freetype:+'
-//    implementation project(path: ':ruis')
+    // implementation project(path: ':ruis')
 }
 
 task copyResToAssets {

build/android/app/src/main/java/io/github/cppfw/ruisapp/RuisappActivity.java

@@ -0,0 +1 @@
+../../../../../../../../../../tests/harness/modules/ruisapp/build/android/ruisapp/src/main/java/io/github/cppfw/ruisapp/RuisappActivity.java

build/conan/conanfile.py

@@ -57,7 +57,7 @@ def source(self):
 		# shallow fetch commit
 		git.fetch_commit(url=sources["url"], commit=sources['commit'])
 		# shallow clone submodules
-		git.run("submodule update --init --remote --depth 1")
+		git.run("submodule update --init --remote")
 
 	def build(self):
 		if self.settings.os == "Emscripten":

build/vcpkg/test/vcpkg-configuration.json

@@ -8,7 +8,7 @@
       {
         "kind": "git",
         "repository": "https://github.com/cppfw/vcpkg-repo/",
-        "baseline": "d48205c0ac1f9dec582330ec79d145cdd5905949",
+        "baseline": "623f683b18c6f49a18104e1c52e7d3c17f38ef92",
         "reference": "main",
         "packages": [
           "myci",

config/rel.mk

@@ -1,9 +1,19 @@
 include $(config_dir)base/base.mk
 
+this_cxxflags += -O3
+
 # TODO: compilation with -O3 currently fails with unjustified "maybe used uninitialized" error
 #       when building with "g++ (Debian 12.2.0-14) 12.2.0",
-#       have't tried it with clang++. Need to restore -O3 when GCC is fixed.
-this_cxxflags += -O1
+#       have't tried it with clang++. Need to remove this warning suppression when GCC is fixed.
+ifeq ($(this_cxx),g++)
+    ifeq ($(os),macosx)
+        # On macos, the this_cxx can be set to g++, but it is still clang compiler, becuase
+        # often, on macos the g++ is symlinked to clang++.
+        # Thus, on macos do not suppress the warning, because it is not supported by clang. 
+    else
+        this_cxxflags += -Wno-maybe-uninitialized
+    endif
+endif
 
 # WORKAROUND: on ubuntu jammy dpkg-buildpackage passes -ffat-lto-objects compilation flag
 # which is not supported by clang and clang-tidy complains about it:

src/ruis/context.cpp

@@ -25,17 +25,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 using namespace ruis;
 
-context::context(
-	utki::shared_ref<ruis::style_provider> style_provider,
-	utki::shared_ref<ruis::updater> updater,
-	parameters params
-) :
+context::context(parameters params) :
 	post_to_ui_thread_function(std::move(params.post_to_ui_thread_function)),
-	style_provider(std::move(style_provider)),
-	res_loader(this->style_provider.get().res_loader),
-	renderer(this->res_loader.get().renderer),
-	updater(std::move(updater)),
-	cursor_stack(std::move(params.set_mouse_cursor_function)),
+	style_provider(std::move(params.style_provider)),
+	renderer(std::move(params.renderer)),
+	updater(std::move(params.updater)),
 	localization(std::move(params.localization)),
 	units(std::move(params.units))
 {