stuff

Author: igagis

src/ruis/context.hpp

@@ -112,7 +112,7 @@ class context : public std::enable_shared_from_this<context>
 	 * @brief Shorthand alias for native_window.
 	 * @return The native window of this GUI context.
 	 */
-	ruis::native_window& window() noexcept
+	ruis::render::native_window& window() noexcept
 	{
 		return this->ren().ctx().native_window;
 	}

src/ruis/render/context.cpp

@@ -23,22 +23,49 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 using namespace ruis::render;
 
+const ruis::render::context* ruis::render::context::cur_context = nullptr;
+
 context::context(
-	utki::shared_ref<ruis::native_window> native_window, //
+	utki::shared_ref<ruis::render::native_window> native_window, //
 	parameters params
 ) :
 	native_window(std::move(native_window)),
 	initial_matrix(std::move(params.initial_matrix))
 {}
 
+context::~context()
+{
+	if (this->is_current()) {
+		cur_context = nullptr;
+	}
+}
+
 void context::apply(std::function<void()> func)
 {
+	utki::assert(func, SL);
+
 	if (this->is_current()) {
+		// this context is already current
 		func();
 		return;
 	}
 
-	throw std::logic_error("context::apply(): the context is non-current, switching context is not yet implemented");
+	auto old_cc = cur_context;
+	utki::scope_exit restore_old_cc_scope_exit([&]() {
+		if (!old_cc) {
+			// There was no current context, leave current one bound.
+			return;
+		}
+		old_cc->native_window.get().bind_render_context();
+		cur_context = old_cc;
+	});
+
+	cur_context = this;
+	this->native_window.get().bind_render_context();
+
+	utki::assert(this->is_current(), SL);
+
+	func();
 }
 
 void context::set_framebuffer(frame_buffer* fb)

src/ruis/render/context.hpp

@@ -39,6 +39,8 @@ class context : public std::enable_shared_from_this<context>
 {
 	friend class frame_buffer;
 
+	static const context* cur_context;
+
 protected:
 	utki::shared_ref<context> get_shared_ref()
 	{
@@ -49,7 +51,7 @@ class context : public std::enable_shared_from_this<context>
 	std::weak_ptr<frame_buffer> cur_fb;
 
 public:
-	const utki::shared_ref<ruis::native_window> native_window;
+	const utki::shared_ref<ruis::render::native_window> native_window;
 
 	struct parameters {
 		r4::matrix4<float> initial_matrix;
@@ -63,7 +65,7 @@ class context : public std::enable_shared_from_this<context>
 	const r4::matrix4<float> initial_matrix;
 
 	context(
-		utki::shared_ref<ruis::native_window>, //
+		utki::shared_ref<ruis::render::native_window>, //
 		parameters params
 	);
 
@@ -73,12 +75,11 @@ class context : public std::enable_shared_from_this<context>
 	context(context&&) = delete;
 	context& operator=(context&&) = delete;
 
-	virtual ~context() = default;
+	virtual ~context();
 
 	bool is_current() const noexcept
 	{
-		// TODO: actually check that the context is current
-		return true;
+		return cur_context == this;
 	}
 
 	/**

src/ruis/render/native_window.cpp

@@ -2,7 +2,7 @@
 
 #include <utki/debug.hpp>
 
-using namespace ruis;
+using namespace ruis::render;
 
 void native_window::set_fullscreen(bool enable)
 {

src/ruis/render/native_window.hpp

@@ -4,10 +4,14 @@
 
 #include "../util/mouse_cursor.hpp"
 
-namespace ruis {
+namespace ruis::render {
+class context;
+
 // TODO: doxygen
 class native_window
 {
+	friend class ruis::render::context;
+
 	bool is_fullscreen_v = false;
 
 	virtual void bind_render_context() = 0;
@@ -41,4 +45,4 @@ class native_window
 
 	virtual void set_mouse_cursor_visible(bool visible) {}
 };
-} // namespace ruis
+} // namespace ruis::render

src/ruis/widget/group/tiling_area.cpp

@@ -38,7 +38,7 @@ class dragger : public ruis::gap
 
 	tiling_area& owner;
 
-	ruis::native_window::cursor_id arrows_cursor_iter;
+	ruis::render::native_window::cursor_id arrows_cursor_iter;
 
 public:
 	// TODO: use shared_ref?

src/ruis/widget/group/window.cpp

@@ -416,7 +416,7 @@ void ruis::window::setup_widgets()
 	this->title_bg = this->try_get_widget_as<color_widget>("ruis_window_title_bg");
 	ASSERT(this->title_bg);
 
-	auto make_mouse_button_handler = [this](native_window::cursor_id& iter) {
+	auto make_mouse_button_handler = [this](ruis::render::native_window::cursor_id& iter) {
 		return decltype(mouse_proxy::mouse_button_handler)([this, &iter](mouse_proxy& mp, const mouse_button_event& e) {
 			if (e.button != mouse_button::left) {
 				return false;
@@ -435,7 +435,7 @@ void ruis::window::setup_widgets()
 		});
 	};
 
-	auto make_hovered_change_handler = [this](ruis::mouse_cursor cursor, native_window::cursor_id& iter) {
+	auto make_hovered_change_handler = [this](ruis::mouse_cursor cursor, render::native_window::cursor_id& iter) {
 		return [this, cursor, &iter](mouse_proxy& mp, unsigned pointer_id) {
 			// LOG("hover = " << mp.is_hovered() << std::endl)
 			// LOG("this->mouse_captured = " << this->mouse_captured << std::endl)

src/ruis/widget/group/window.hpp

@@ -63,15 +63,15 @@ class window :
 	std::shared_ptr<widget> lb_border;
 	std::shared_ptr<widget> rb_border;
 
-	native_window::cursor_id caption_cursor_iter;
-	native_window::cursor_id lt_border_cursor_iter;
-	native_window::cursor_id rt_border_cursor_iter;
-	native_window::cursor_id t_border_cursor_iter;
-	native_window::cursor_id l_border_cursor_iter;
-	native_window::cursor_id r_border_cursor_iter;
-	native_window::cursor_id b_border_cursor_iter;
-	native_window::cursor_id lb_border_cursor_iter;
-	native_window::cursor_id rb_border_cursor_iter;
+	render::native_window::cursor_id caption_cursor_iter;
+	render::native_window::cursor_id lt_border_cursor_iter;
+	render::native_window::cursor_id rt_border_cursor_iter;
+	render::native_window::cursor_id t_border_cursor_iter;
+	render::native_window::cursor_id l_border_cursor_iter;
+	render::native_window::cursor_id r_border_cursor_iter;
+	render::native_window::cursor_id b_border_cursor_iter;
+	render::native_window::cursor_id lb_border_cursor_iter;
+	render::native_window::cursor_id rb_border_cursor_iter;
 
 	bool mouse_captured = false;
 	ruis::vector2 capture_point;