From 50a33a13fc005d4758ef4bdac62f8b1f3703374f Mon Sep 17 00:00:00 2001 From: Christopher Michael Date: Wed, 26 Jun 2019 09:07:46 -0400 Subject: [PATCH] wl_drm: Fix build & runtime break with latest EFL version EFL 1.23 changed API with regard to pointer device capabilities, so we need to adjust API usage here based on efl version. Original patch from bu5hm4n (Marcel Hollerbach) --- src/modules/wl_drm/e_mod_main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c index f2991b8a8..db993f7f8 100644 --- a/src/modules/wl_drm/e_mod_main.c +++ b/src/modules/wl_drm/e_mod_main.c @@ -858,9 +858,15 @@ _drm_device_del(void *data EINA_UNUSED, const Efl_Event *event) seat = efl_input_device_seat_get(event->info); if (seat != evas_default_device_get(e_comp->evas, EFL_INPUT_DEVICE_TYPE_SEAT)) return; +#ifdef EFL_VERSION_1_23 + if (!efl_input_device_is_pointer_type_get(event->info)) return; + if (efl_input_device_pointer_device_count_get(seat) == 1) + ecore_evas_cursor_device_unset(e_comp->ee, event->info); +#else if (!efl_input_device_has_pointer_caps(event->info)) return; if (efl_input_device_has_pointer_caps(seat) == 1) ecore_evas_cursor_device_unset(e_comp->ee, event->info); +#endif } E_API void *