From: Sung-Jin Park Date: Wed, 27 Sep 2017 11:24:15 +0000 (+0900) Subject: e_output: substitute e_input APIs for ecore_drm APIs and remove ecore drm dependency X-Git-Tag: accepted/tizen/unified/20171013.193013~26 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=285fdaeda148c3a5da6edddbf4d1edec7ad44105;p=platform%2Fupstream%2Fenlightenment.git e_output: substitute e_input APIs for ecore_drm APIs and remove ecore drm dependency Change-Id: I0802ff63a2bf37172fc652b1fbcb8fc7e9ff6b3e Signed-off-by: Sung-Jin Park --- diff --git a/src/bin/e_output.c b/src/bin/e_output.c index eac68ea..ee1e134 100644 --- a/src/bin/e_output.c +++ b/src/bin/e_output.c @@ -223,15 +223,15 @@ _e_output_zoom_scaled_rect_get(int out_w, int out_h, double zoomx, double zoomy, static Eina_Bool _e_output_zoom_touch_transform(E_Output *output, Eina_Bool set) { - Ecore_Drm_Device *dev = NULL; + E_Input_Device *dev = NULL; Eina_Bool ret = EINA_FALSE; const Eina_List *l; - Ecore_Drm_Output *primary_output = NULL; + E_Output *primary_output = NULL; int w = 0, h = 0; - EINA_LIST_FOREACH(ecore_drm_devices_get(), l, dev) + EINA_LIST_FOREACH(e_input_devices_get(), l, dev) { - primary_output = ecore_drm_output_primary_get(dev); + primary_output = e_comp_screen_primary_output_get(e_comp->e_comp_screen); if (primary_output != NULL) break; } @@ -243,17 +243,17 @@ _e_output_zoom_touch_transform(E_Output *output, Eina_Bool set) } if (set) - ret = ecore_drm_device_touch_transformation_set(dev, + ret = e_input_device_touch_transformation_set(dev, output->zoom_conf.rect.x, output->zoom_conf.rect.y, output->zoom_conf.rect.w, output->zoom_conf.rect.h); else { e_output_size_get(output, &w, &h); - ret = ecore_drm_device_touch_transformation_set(dev, 0, 0, w, h); + ret = e_input_device_touch_transformation_set(dev, 0, 0, w, h); } if (ret != EINA_TRUE) - ERR("fail ecore_drm_device_touch_transformation_set"); + ERR("fail e_input_device_touch_transformation_set"); return ret; } diff --git a/src/bin/e_output.h b/src/bin/e_output.h index 1bc0d6f..e5f5aee 100644 --- a/src/bin/e_output.h +++ b/src/bin/e_output.h @@ -19,7 +19,6 @@ typedef void (*E_Output_Capture_Cb) (E_Output *output, tbm_surface_h surface, vo #define E_OUTPUT_TYPE (int)0xE0b11002 #include "e_comp_screen.h" -#include enum _E_Output_Dpms {