Sdl (#19)

* stuff

* stuff

* fix lint

* license

* ubuntu: no jammy build

* sdl build config

* stuff

* fix lint

* stuff

* stuff

* dpi

* fix lint

* sdl: prepare for emscripten port

* refactoring

* fix lint

.github/workflows/ci.yml

@@ -67,7 +67,7 @@ jobs:
           - {os: debian, codename: bookworm, image_owner: , package_type: deb, labels: [arm32,docker]}
           - {os: debian, codename: bookworm, image_owner: , package_type: deb, labels: [arm64,docker]}
           # - {os: ubuntu, codename: focal, image_owner: , package_type: deb}
-          - {os: ubuntu, codename: jammy, image_owner: , package_type: deb}
+          # - {os: ubuntu, codename: jammy, image_owner: , package_type: deb}
           - {os: ubuntu, codename: noble, image_owner: , package_type: deb}
           # - {os: raspbian, codename: buster, image_owner: igagis/, package_type: deb, labels: [arm32,docker]}
           # - {os: raspbian, codename: bullseye, image_owner: igagis/, package_type: deb, labels: [arm32,docker]}

.vscode/tasks.json

@@ -49,6 +49,13 @@
             "problemMatcher": [],
             "group": "build"
         },
+        {
+            "label": "run-app-sdl-dbg",
+            "type": "shell",
+            "command": "make run-app config=dbg sdl=true",
+            "problemMatcher": [],
+            "group": "build"
+        },
         {
             "label": "run-app-dbg-ogles2",
             "type": "shell",

debian/control.in

@@ -21,7 +21,8 @@ Build-Depends:
 		libgles2-mesa-dev,
 		libgtk-3-dev,
 		libwayland-dev,
-		libxkbcommon-dev
+		libxkbcommon-dev,
+		libsdl2-dev
 Build-Depends-Indep: doxygen
 Standards-Version: 3.9.5
 

debian/libruisapp-dev.install

@@ -2,4 +2,3 @@ usr/include
 usr/lib/pkgconfig
 usr/lib/lib*.so
 usr/lib/lib*.a
-

src/makefile

@@ -55,7 +55,10 @@ define ruisapp_rules
 
     this_name := ruisapp-$1$(if $2,-$2)
 
-    ifeq ($(os), linux)
+    ifeq ($2,sdl)
+        this_ldlibs += -lSDL2
+        this_cxxflags += -D RUISAPP_BACKEND_SDL
+    else ifeq ($(os), linux)
         # use -isystem instead of -I to prevent clang-tidy follow the includes from these locations
         this_cxxflags += $$(patsubst -I%,-isystem%,$$(shell pkg-config --cflags gdk-3.0))
         this_ldlibs += $$(shell pkg-config --libs gdk-3.0)
@@ -69,20 +72,17 @@ define ruisapp_rules
             this_ldlibs += $(wayland_shell_protocol_lib)
             this_ldlibs += -lxkbcommon
             this_cxxflags += -isystem $(dir $(wayland_shell_protocol_header))
-            this_cxxflags += -D RUISAPP_WAYLAND
-        else
+            this_cxxflags += -D RUISAPP_BACKEND_WAYLAND
+        else ifeq ($2,xorg)
             this_ldlibs += -lX11
+        else
         endif
     else ifeq ($(os), windows)
         this_ldlibs += -lgdi32 -lopengl32 -lglew32
     else ifeq ($(os), macosx)
         this_ldlibs += -lGLEW
         this_ldlibs += -framework Cocoa -framework OpenGL -ldl
-    endif
 
-    this_ldlibs += -lruis -lpapki -ltml -lutki
-
-    ifeq ($(os), macosx)
         this_mm_obj := $$(d)$$(this_out_dir)obj_$$(this_name)/objc/ruisapp/glue/macosx/glue.mm.o
 
         define this_subrules
@@ -94,6 +94,8 @@ $(.RECIPEPREFIX)$(a)$(this_cc) -ObjC++ -c -o "$$$$@" $$(this_cxxflags) $$(OBJCXX
         $$(eval $$(this_subrules))
     endif
 
+    this_ldlibs += -lruis -lpapki -ltml -lutki
+
     this_cxxflags += -D RUISAPP_RENDER_$(shell echo $1 | tr '[:lower:]' '[:upper:]')
     this_ldlibs += -lruis-render-$1
 
@@ -103,7 +105,8 @@ $(.RECIPEPREFIX)$(a)$(this_cc) -ObjC++ -c -o "$$$$@" $$(this_cxxflags) $$(OBJCXX
 
     $$(eval $$(prorab-build-lib))
 
-    ifeq ($(os), macosx)
+    ifeq ($2,sdl)
+    else ifeq ($(os), macosx)
         $$(prorab_this_staticlib): $$(this_mm_obj)
         $$(prorab_this_name): $$(this_mm_obj)
 
@@ -120,6 +123,8 @@ ifeq ($(os), linux)
     $(eval $(call ruisapp_rules,opengles,xorg))
     # $(eval $(call ruisapp_rules,opengl,wayland))
     $(eval $(call ruisapp_rules,opengles,wayland))
+    $(eval $(call ruisapp_rules,opengl,sdl))
+    $(eval $(call ruisapp_rules,opengles,sdl))
 else
     $(eval $(call ruisapp_rules,opengl,))
 endif

src/ruisapp/glue/glue.cpp

@@ -21,13 +21,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 #include <utki/config.hpp>
 
-#if CFG_OS == CFG_OS_WINDOWS
+#ifdef RUISAPP_BACKEND_SDL
+// NOLINTNEXTLINE(bugprone-suspicious-include)
+#	include "sdl/glue.cxx"
+#elif CFG_OS == CFG_OS_WINDOWS
 // NOLINTNEXTLINE(bugprone-suspicious-include)
 #	include "windows/glue.cxx"
 #elif CFG_OS == CFG_OS_LINUX && CFG_OS_NAME == CFG_OS_NAME_ANDROID
 #	include "android/glue.cxx"
 #elif CFG_OS == CFG_OS_LINUX
-#	ifdef RUISAPP_WAYLAND
+#	ifdef RUISAPP_BACKEND_WAYLAND
 // NOLINTNEXTLINE(bugprone-suspicious-include)
 #		include "linux/glue_wayland.cxx"
 #	else

src/ruisapp/glue/linux/glue_wayland.cxx

@@ -2390,7 +2390,7 @@ int main(int argc, const char** argv)
 		// sequence:
 		// - update updateables
 		// - render
-		// - wait for events/next cycle
+		// - wait for events and handle them/next cycle
 		auto to_wait_ms = app.gui.update();
 		render(app);
 

src/ruisapp/glue/linux/glue_xorg.cxx

@@ -1342,7 +1342,7 @@ int main(int argc, const char** argv)
 		// sequence:
 		// - update updateables
 		// - render
-		// - wait for events/next cycle
+		// - wait for events and handle them/next cycle
 		auto to_wait_ms = app->gui.update();
 		render(*app);
 		wait_set.wait(to_wait_ms);
@@ -1387,8 +1387,6 @@ int main(int argc, const char** argv)
 					render(*app);
 					break;
 				case ConfigureNotify:
-					//						TRACE(<<
-					//"ConfigureNotify X event got" << std::endl)
 					// squash all window resize events into one, for that store the new
 					// window dimensions and update the viewport later only once
 					new_win_dims.x() = ruis::real(event.xconfigure.width);

src/ruisapp/glue/macosx/glue.mm

@@ -732,7 +732,7 @@ int main(int argc, const char** argv){
 		// sequence:
 		// - update updateables
 		// - render
-		// - wait for events/next cycle
+		// - wait for events and handle them/next cycle
 		uint32_t millis = ruisapp::inst().gui.update();
 		render(ruisapp::inst());
 		NSEvent *event = [ww.applicationObjectId