summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDerek Foreman <derekf@osg.samsung.com>2018-04-25 11:06:12 -0500
committerChris Michael <cp.michael@samsung.com>2018-06-12 08:12:47 -0400
commit3e36389294ad4b7226a15729079c737bf5b32e5b (patch)
tree8ed6d5fced0b871540ecc714fb1049c42267362c
parentbf3982308bcae76cc88fa620296c0da4ab11b98c (diff)
compile against stable EFL againfeature/wayland/multi-output
E should probably continue to build against released EFL older than the current interface name changes.
-rw-r--r--src/modules/wl_drm/e_mod_main.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c
index 952b05c5b..7bba2540e 100644
--- a/src/modules/wl_drm/e_mod_main.c
+++ b/src/modules/wl_drm/e_mod_main.c
@@ -865,14 +865,13 @@ _drm_device_del(void *data EINA_UNUSED, const Efl_Event *event)
865 ecore_evas_cursor_device_unset(e_comp->ee, event->info); 865 ecore_evas_cursor_device_unset(e_comp->ee, event->info);
866} 866}
867 867
868EFL_CALLBACKS_ARRAY_DEFINE(_drm_device_del_cb,
869 { EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED, _drm_device_del });
870
871E_API void * 868E_API void *
872e_modapi_init(E_Module *m) 869e_modapi_init(E_Module *m)
873{ 870{
874 int w = 0, h = 0; 871 int w = 0, h = 0;
875 872
873 static Efl_Callback_Array_Item arr[2] = { { 0, _drm_device_del } };
874
876 printf("LOAD WL_DRM MODULE\n"); 875 printf("LOAD WL_DRM MODULE\n");
877 876
878 /* try to init ecore_drm */ 877 /* try to init ecore_drm */
@@ -918,6 +917,14 @@ e_modapi_init(E_Module *m)
918 ecore_evas_screen_geometry_get(e_comp->ee, NULL, NULL, &w, &h); 917 ecore_evas_screen_geometry_get(e_comp->ee, NULL, NULL, &w, &h);
919 if (!e_comp_canvas_init(w, h)) return NULL; 918 if (!e_comp_canvas_init(w, h)) return NULL;
920 919
920#ifdef EFL_VERSION_1_21
921 arr[0].desc = EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED;
922#else
923 if (E_EFL_VERSION_MINIMUM(1, 20, 99))
924 arr[0].desc = dlsym(NULL, "_EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED");
925 if (!arr[0].desc)
926 arr[0].desc = dlsym(NULL, "_EFL_CANVAS_EVENT_DEVICE_REMOVED");
927#endif
921 ecore_evas_pointer_xy_get(e_comp->ee, &e_comp_wl->ptr.x, 928 ecore_evas_pointer_xy_get(e_comp->ee, &e_comp_wl->ptr.x,
922 &e_comp_wl->ptr.y); 929 &e_comp_wl->ptr.y);
923 evas_event_feed_mouse_in(e_comp->evas, 0, NULL); 930 evas_event_feed_mouse_in(e_comp->evas, 0, NULL);
@@ -941,7 +948,7 @@ e_modapi_init(E_Module *m)
941 ecore_event_handler_add(ELPUT_EVENT_POINTER_MOTION, 948 ecore_event_handler_add(ELPUT_EVENT_POINTER_MOTION,
942 (Ecore_Event_Handler_Cb)_pointer_motion, NULL); 949 (Ecore_Event_Handler_Cb)_pointer_motion, NULL);
943 950
944 efl_event_callback_array_priority_add(e_comp->evas, _drm_device_del_cb(), 951 efl_event_callback_array_priority_add(e_comp->evas, arr,
945 EFL_CALLBACK_PRIORITY_BEFORE, NULL); 952 EFL_CALLBACK_PRIORITY_BEFORE, NULL);
946 953
947 return m; 954 return m;