devilhorns pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=0a93ff051f53eb98145030408d6139615b565066
commit 0a93ff051f53eb98145030408d6139615b565066
Author: Chris Michael <cpmich...@osg.samsung.com>
Date: Tue Jun 7 13:36:18 2016 -0400
ecore-wl2: Support wl_seat_listener version 4
This patch adds support for wl_seat_listener version 4 (which is used
in wayland 1.11). We do not actually make use of the seat callback for
name yet, but when the rest of multi-seat issues are sorted, we may
need this.
@fix
Signed-off-by: Chris Michael <cpmich...@osg.samsung.com>
---
src/lib/ecore_wl2/ecore_wl2_input.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/lib/ecore_wl2/ecore_wl2_input.c
b/src/lib/ecore_wl2/ecore_wl2_input.c
index bf17025..2b4a804 100644
--- a/src/lib/ecore_wl2/ecore_wl2_input.c
+++ b/src/lib/ecore_wl2/ecore_wl2_input.c
@@ -1147,10 +1147,18 @@ _seat_cb_capabilities(void *data, struct wl_seat *seat,
enum wl_seat_capability
}
}
+static void
+_seat_cb_name(void *data EINA_UNUSED, struct wl_seat *seat EINA_UNUSED, const
char *name EINA_UNUSED)
+{
+ /* NB: No-Op as we don't care about seat name right now.
+ *
+ * This will likely change as we hash out remaining multi-seat issues */
+}
+
static const struct wl_seat_listener _seat_listener =
{
_seat_cb_capabilities,
- NULL
+ _seat_cb_name,
};
static void
@@ -1253,7 +1261,7 @@ _ecore_wl2_input_add(Ecore_Wl2_Display *display, unsigned
int id, unsigned int v
_ecore_wl2_input_cursor_setup(input);
input->wl.seat =
- wl_registry_bind(display->wl.registry, id, &wl_seat_interface, 1);
+ wl_registry_bind(display->wl.registry, id, &wl_seat_interface, 4);
display->inputs =
eina_inlist_append(display->inputs, EINA_INLIST_GET(input));
--
