stuff

Author: igagis

src/ruisapp/glue/egl_utils.hxx

@@ -451,7 +451,7 @@ struct egl_context_wrapper {
 		);
 	}
 
-	void disable_vsync()
+	void set_vsync_enabled(bool enabled)
 	{
 		utki::assert(
 			eglGetCurrentContext() == this->context,
@@ -461,7 +461,11 @@ struct egl_context_wrapper {
 			SL
 		);
 
-		if (eglSwapInterval(this->egl_display.display, 0) != EGL_TRUE) {
+		if (eglSwapInterval(
+				this->egl_display.display, //
+				enabled ? 1 : 0 // number of vsync frames before framebuffer buffer swap
+			) != EGL_TRUE)
+		{
 			throw std::runtime_error("egl_context_wrapper::disable_vsync(): eglSwapInterval(0) failed");
 		}
 	}

src/ruisapp/glue/linux/wayland/wayland_output.cxx

@@ -48,7 +48,6 @@ void wayland_output_wrapper::wl_output_geometry(
 	});
 
 	// TODO: is it needed to notify about outputs changed? Aren't wayland surfaces supposed to receive enter output events?
-
 	// auto& ww = get_impl(ruisapp::application::inst());
 	// ww.notify_outputs_changed();
 }
@@ -72,7 +71,6 @@ void wayland_output_wrapper::wl_output_mode(
 	});
 
 	// TODO: is it needed to notify about outputs changed? Aren't wayland surfaces supposed to receive enter output events?
-
 	// auto& ww = get_impl(ruisapp::application::inst());
 	// ww.notify_outputs_changed();
 }
@@ -93,7 +91,6 @@ void wayland_output_wrapper::wl_output_scale(
 	});
 
 	// TODO: is it needed to notify about outputs changed? Aren't wayland surfaces supposed to receive enter output events?
-
 	// auto& ww = get_impl(ruisapp::application::inst());
 	// ww.notify_outputs_changed();
 }

src/ruisapp/glue/linux/wayland/window.hxx

@@ -143,8 +143,7 @@ public:
 		}
 	}
 
-	// TODO: make this function part of ruis::native_window interface
-	bool is_rendering_context_bound() const noexcept
+	bool is_rendering_context_bound() const noexcept override
 	{
 		return eglGetCurrentContext() == this->egl_context.context;
 	}
@@ -193,8 +192,7 @@ public:
 		this->update_mouse_cursor();
 	}
 
-	// TODO: make part of ruis::native_window intrface
-	void disable_vsync()
+	void set_vsync_enabled(bool enabled) noexcept override
 	{
 		utki::assert(
 			[this]() {
@@ -203,7 +201,7 @@ public:
 			SL
 		);
 
-		this->egl_context.disable_vsync();
+		this->egl_context.set_vsync_enabled(enabled);
 	}
 
 	wl_callback* make_frame_callback()

src/ruisapp/glue/linux/xorg/window.hxx

@@ -692,8 +692,7 @@ public:
 
 	~native_window() override = default;
 
-	// TODO: make this function part of ruis::native_window interface
-	void disable_vsync()
+	void set_vsync_enabled(bool enable) noexcept override
 	{
 		utki::assert(
 			[this]() {
@@ -721,7 +720,7 @@ public:
 			glx_swap_interval_ext(
 				this->display.get().xorg_display.display, //
 				this->xorg_window.window,
-				0
+				enable ? 1 : 0 // swap interval in vsync frames
 			);
 		} else if (this->glx_context.supported_extensions.get(glx_context_wrapper::glx_extension::glx_mesa_swap_control
 				   ))
@@ -738,8 +737,11 @@ public:
 			utki::assert(glx_swap_interval_mesa, SL);
 
 			// disable v-sync
-			if (glx_swap_interval_mesa(0) != 0) {
-				throw std::runtime_error("glXSwapIntervalMESA() failed");
+			if (glx_swap_interval_mesa(
+					enable ? 1 : 0 // swap interval in vsync frames
+				) != 0)
+			{
+				utki::logcat("WARNING: glXSwapIntervalMESA(", enable, ") failed");
 			}
 		} else {
 			std::cout << "none of GLX_EXT_swap_control, GLX_MESA_swap_control GLX "
@@ -754,10 +756,10 @@ public:
 #elif defined(RUISAPP_RENDER_OPENGLES)
 		if (eglSwapInterval(
 				this->display.get().egl_display.display, //
-				0
+				enable ? 1 : 0 // swap interval in vsync frames
 			) != EGL_TRUE)
 		{
-			throw std::runtime_error("eglSwapInterval() failed");
+			utki::logcat("WARNING: eglSwapInterval(", enable, ") failed");
 		}
 #endif
 	}
@@ -956,8 +958,7 @@ private:
 #endif
 	}
 
-	// TODO: make this function part of ruis::native_window interface
-	bool is_rendering_context_bound() const noexcept
+	bool is_rendering_context_bound() const noexcept override
 	{
 #ifdef RUISAPP_RENDER_OPENGL
 		return glXGetCurrentContext() == this->glx_context.context;

src/ruisapp/glue/sdl/application.cxx

@@ -184,7 +184,7 @@ ruisapp::window& application_glue::make_window(ruisapp::window_parameters window
 	);
 
 	ruisapp_window.get().gui.set_viewport( //
-		ruis::rect({0, 0}, ruisapp_window.get().ruis_native_window.get().get_dims())
+		ruis::rect({0, 0}, ruisapp_window.get().ruis_native_window.get().get_dims().to<ruis::real>())
 	);
 
 	auto res = this->windows.insert( //
@@ -239,10 +239,8 @@ ruisapp::application::application(parameters params) :
 
 void ruisapp::application::quit() noexcept
 {
-	auto& glue = get_glue(*this);
-
-	// TODO: send SDL_QUIT event instead of setting the flag?
-	glue.quit_flag.store(true);
+	SDL_Event event = {SDL_QUIT};
+	SDL_PushEvent(&event);
 }
 
 ruisapp::window& ruisapp::application::make_window(ruisapp::window_parameters window_params)

src/ruisapp/glue/sdl/window.cxx

@@ -292,7 +292,7 @@ native_window::native_window(
 #endif
 }
 
-ruis::vec2 native_window::get_dims() const noexcept
+r4::vector2<unsigned> native_window::get_dims() const noexcept
 {
 	int width = 0;
 	int height = 0;
@@ -310,7 +310,7 @@ ruis::vec2 native_window::get_dims() const noexcept
 	dims *= this->get_scale_factor();
 #endif
 
-	return dims;
+	return dims.to<unsigned>();
 }
 
 void native_window::set_mouse_cursor(ruis::mouse_cursor c)

src/ruisapp/glue/sdl/window.hxx

@@ -132,7 +132,7 @@ public:
 		return this->sdl_window.scale_factor;
 	}
 
-	ruis::vec2 get_dims() const noexcept;
+	r4::vector2<unsigned> get_dims() const noexcept override;
 
 	void set_mouse_cursor(ruis::mouse_cursor c) override;