stuff

Author: igagis

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

@@ -56,6 +56,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 #include "wayland_surface.cxx" // NOLINT(bugprone-suspicious-include, "not suspicious")
 #include "wayland_touch.cxx" // NOLINT(bugprone-suspicious-include, "not suspicious")
 #include "window.cxx" // NOLINT(bugprone-suspicious-include, "not suspicious")
+#include "xdg_surface.cxx" // NOLINT(bugprone-suspicious-include, "not suspicious")
 #include "xdg_toplevel.cxx" // NOLINT(bugprone-suspicious-include, "not suspicious")
 
 using namespace std::string_view_literals;

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

@@ -0,0 +1,69 @@
+#include "xdg_surface.hxx"
+
+#include "application.hxx"
+
+xdg_surface_wrapper::xdg_surface_wrapper(
+	wayland_surface_wrapper& wayland_surface, //
+	xdg_wm_base_wrapper& xdg_wm_base
+) :
+	wayland_surface(wayland_surface),
+	surface(xdg_wm_base_get_xdg_surface(
+		xdg_wm_base.wm_base, //
+		wayland_surface.surface
+	))
+{
+	if (!this->surface) {
+		throw std::runtime_error("could not create wayland xdg surface");
+	}
+
+	utki::log_debug([&](auto& o) {
+		auto id = wl_proxy_get_id(reinterpret_cast<wl_proxy*>(this->surface));
+		o << "xgd_surface: CREATED, id = " << id << std::endl;
+	});
+
+	xdg_surface_add_listener(
+		this->surface, //
+		&listener,
+		this // user data
+	);
+}
+
+void xdg_surface_wrapper::xdg_surface_configure(
+	void* data, //
+	xdg_surface* surface,
+	uint32_t serial
+)
+{
+	utki::assert(data, SL);
+	auto& self = *static_cast<xdg_surface_wrapper*>(data);
+
+	utki::log_debug([&](auto& o) {
+		auto id = wl_proxy_get_id(reinterpret_cast<wl_proxy*>(surface));
+		o << "xgd_surface: CONFIGURE for surface id = " << id << std::endl;
+	});
+
+    // Wayland protocol requires to acknowledge the configure event
+	xdg_surface_ack_configure(
+		surface, //
+		serial
+	);
+
+	auto& glue = get_glue();
+
+	auto window = glue.get_window(self.wayland_surface.surface);
+	if (!window) {
+		utki::logcat_debug("  could not find window object, perhaps called for shared gl context window", '\n');
+		utki::assert(self.wayland_surface.surface == glue.get_shared_gl_context_window_id(), SL);
+		return;
+	}
+
+	auto& win = *window;
+    auto& natwin = win.ruis_native_window.get();
+
+	// swap EGL frame buffers with the window's EGL context made current
+	win.gui.context.get().ren().ctx().apply([&]() {
+		natwin.swap_frame_buffers();
+	});
+
+	// self.wayland_surface.commit();
+}

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

@@ -28,48 +28,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 namespace {
 struct xdg_surface_wrapper {
+	wayland_surface_wrapper& wayland_surface;
+
 	xdg_surface* const surface;
 
+	static void xdg_surface_configure(
+		void* data, //
+		xdg_surface* surface,
+		uint32_t serial
+	);
+
 	constexpr static const xdg_surface_listener listener = {
-		.configure =
-			[](void* data, //
-			   xdg_surface* surface,
-			   uint32_t serial) {
-				utki::log_debug([&](auto& o) {
-					auto id = wl_proxy_get_id(reinterpret_cast<wl_proxy*>(surface));
-					o << "xgd_surface: CONFIGURE for surface id = " << id << std::endl;
-				});
-				xdg_surface_ack_configure(
-					surface, //
-					serial
-				);
-			}, //
+		.configure = &xdg_surface_configure //
 	};
 
 	xdg_surface_wrapper(
 		wayland_surface_wrapper& wayland_surface, //
 		xdg_wm_base_wrapper& xdg_wm_base
-	) :
-		surface(xdg_wm_base_get_xdg_surface(
-			xdg_wm_base.wm_base, //
-			wayland_surface.surface
-		))
-	{
-		if (!this->surface) {
-			throw std::runtime_error("could not create wayland xdg surface");
-		}
-
-		utki::log_debug([&](auto& o) {
-			auto id = wl_proxy_get_id(reinterpret_cast<wl_proxy*>(this->surface));
-			o << "xgd_surface: CREATED, id = " << id << std::endl;
-		});
-
-		xdg_surface_add_listener(
-			this->surface, //
-			&listener,
-			nullptr
-		);
-	}
+	);
 
 	xdg_surface_wrapper(const xdg_surface_wrapper&) = delete;
 	xdg_surface_wrapper& operator=(const xdg_surface_wrapper&) = delete;

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

@@ -162,15 +162,17 @@ void xdg_toplevel_wrapper::xdg_toplevel_configure(
 			// Right after creating a Wayland surface, according to the Wayland protocol, it
 			// should do the initial configure call, after which one is supposed to do the
 			// initial surface commit. In case of EGL we have to call eglSwapBuffers(), which will do the
-			// surface commit for us. This makes the sirface to be mapped to the screen and become visible.
+			// surface commit for us. This makes the surface to be mapped to the screen and become visible.
 			// If this sequence is not honored the surface will not appear on the screen.
 
 			utki::logcat_debug("  initial configure call", '\n');
 
 			// swap EGL frame buffers with the window's EGL context made current
-			win.gui.context.get().ren().ctx().apply([&]() {
-				natwin.swap_frame_buffers();
-			});
+			// win.gui.context.get().ren().ctx().apply([&]() {
+			// 	natwin.swap_frame_buffers();
+			// });
+
+			// self.wayland_surface.commit();
 			return;
 		}
 

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

@@ -48,7 +48,7 @@ struct xdg_toplevel_wrapper {
 	);
 
 	constexpr static const xdg_toplevel_listener listener = {
-		.configure = xdg_toplevel_configure,
+		.configure = &xdg_toplevel_configure,
 		.close = &xdg_toplevel_close,
 	};