From 37a275216225b7e5afedc483fd7bf58d1da7627d Mon Sep 17 00:00:00 2001 From: Deve Date: Wed, 31 May 2017 23:47:19 +0200 Subject: [PATCH] Use newer seat version if possible --- lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp b/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp index b8c49b54e..6a3596d2d 100644 --- a/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp +++ b/lib/irrlicht/source/Irrlicht/CIrrDeviceWayland.cpp @@ -467,6 +467,10 @@ public: } } + static void seat_name(void* data, wl_seat* wl_seat, const char* name) + { + } + static void output_geometry(void* data, wl_output* wl_output, int32_t x, int32_t y, int32_t physical_width, int32_t physical_height, int32_t subpixel, @@ -541,7 +545,8 @@ public: else if (interface_str == "wl_seat") { device->m_seat = static_cast(wl_registry_bind(registry, - name, &wl_seat_interface, 1)); + name, &wl_seat_interface, + version < 4 ? version : 4)); } else if (interface_str == "wl_shm") { @@ -582,7 +587,8 @@ const wl_keyboard_listener WaylandCallbacks::keyboard_listener = const wl_seat_listener WaylandCallbacks::seat_listener = { - WaylandCallbacks::seat_capabilities + WaylandCallbacks::seat_capabilities, + WaylandCallbacks::seat_name }; const wl_output_listener WaylandCallbacks::output_listener =