summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Michael <cpmichael@osg.samsung.com>2016-06-13 12:49:40 -0400
committerChris Michael <cpmichael@osg.samsung.com>2016-06-13 16:19:46 -0400
commitfb569d7eb0bcc6e4fd9541a3587e5287f9910492 (patch)
treec37b91222b1356fc9dce1de13bee6d1ccd487e00
parentba0aac69092cfe7ab0f1a89048e57fb621527977 (diff)
ecore-evas-drm: Re-enable direct input callback
As it seems the jpeg breakage is over wrt direct input callbacks, we can re-enable these for the drm engines @fix Signed-off-by: Chris Michael <cpmichael@osg.samsung.com>
-rw-r--r--src/modules/ecore_evas/engines/drm/ecore_evas_drm.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
index e396423..0ba8968 100644
--- a/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
+++ b/src/modules/ecore_evas/engines/drm/ecore_evas_drm.c
@@ -764,13 +764,12 @@ ecore_evas_drm_new_internal(const char *device, unsigned int parent EINA_UNUSED,
764 ecore_evas_data_set(ee, "device", edata->dev); 764 ecore_evas_data_set(ee, "device", edata->dev);
765 765
766 _ecore_evas_register(ee); 766 _ecore_evas_register(ee);
767 ecore_evas_input_event_register(ee);
768 ecore_event_window_register(ee->prop.window, ee, ee->evas, 767 ecore_event_window_register(ee->prop.window, ee, ee->evas,
769 (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process, 768 (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process,
770 (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process, 769 (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process,
771 (Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process, 770 (Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process,
772 (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process); 771 (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process);
773 /* _ecore_event_window_direct_cb_set(ee->prop.window, _ecore_evas_input_direct_cb); */ 772 _ecore_event_window_direct_cb_set(ee->prop.window, _ecore_evas_input_direct_cb);
774 773
775 ecore_drm2_output_crtc_size_get(edata->output, &mw, &mh); 774 ecore_drm2_output_crtc_size_get(edata->output, &mw, &mh);
776 775
@@ -900,13 +899,12 @@ ecore_evas_gl_drm_new_internal(const char *device, unsigned int parent EINA_UNUS
900 ecore_evas_data_set(ee, "device", edata->dev); 899 ecore_evas_data_set(ee, "device", edata->dev);
901 900
902 _ecore_evas_register(ee); 901 _ecore_evas_register(ee);
903 ecore_evas_input_event_register(ee);
904 ecore_event_window_register(ee->prop.window, ee, ee->evas, 902 ecore_event_window_register(ee->prop.window, ee, ee->evas,
905 (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process, 903 (Ecore_Event_Mouse_Move_Cb)_ecore_evas_mouse_move_process,
906 (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process, 904 (Ecore_Event_Multi_Move_Cb)_ecore_evas_mouse_multi_move_process,
907 (Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process, 905 (Ecore_Event_Multi_Down_Cb)_ecore_evas_mouse_multi_down_process,
908 (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process); 906 (Ecore_Event_Multi_Up_Cb)_ecore_evas_mouse_multi_up_process);
909 /* _ecore_event_window_direct_cb_set(ee->prop.window, _ecore_evas_input_direct_cb); */ 907 _ecore_event_window_direct_cb_set(ee->prop.window, _ecore_evas_input_direct_cb);
910 908
911 ecore_drm2_output_crtc_size_get(edata->output, &mw, &mh); 909 ecore_drm2_output_crtc_size_get(edata->output, &mw, &mh);
912 910