device : replace ecore device with evas device stuff

Change-Id: I1424d7f3f2d5b59438faeb39434c4bf9ab02a7dc
Signed-off-by: Sung-Jin Park <sj76.park@samsung.com>

diff --git a/src/e_devicemgr_device.c b/src/e_devicemgr_device.c
index 7b3d24b20ee98e6200ba8a3aa845bf959a4c1bb6..45fd455fd5fc89951c203dba1d5d4fc1c75ac3be 100644 (file)
--- a/src/e_devicemgr_device.c
+++ b/src/e_devicemgr_device.c
@@ -91,7 +91,7 @@ static const struct tizen_input_device_interface _e_devicemgr_device_interface =
 };
 
 static void
-_e_devicemgr_del_device(const char *name, const char *identifier, const char *seatname, Ecore_Device_Class clas, Ecore_Device_Subclass subclas)
+_e_devicemgr_del_device(const char *name, const char *identifier, const char *seatname, Evas_Device_Class clas, Evas_Device_Subclass subclas)
 {
    E_Comp_Wl_Input_Device *dev;
    struct wl_client *wc;
@@ -202,7 +202,7 @@ _e_devicemgr_device_cb_device_unbind(struct wl_resource *resource)
 }
 
 static void
-_e_devicemgr_add_device(const char *name, const char *identifier, const char *seatname, Ecore_Device_Class clas, Ecore_Device_Subclass subclas)
+_e_devicemgr_add_device(const char *name, const char *identifier, const char *seatname, Evas_Device_Class clas, Evas_Device_Subclass subclas)
 {
    E_Comp_Wl_Input_Device *dev;
    struct wl_client *wc;
@@ -280,7 +280,7 @@ _e_devicemgr_add_device(const char *name, const char *identifier, const char *se
 
    e_comp_wl->input_device_manager.device_list = eina_list_append(e_comp_wl->input_device_manager.device_list, dev);
 
-   if (dev->clas == ECORE_DEVICE_CLASS_KEYBOARD)
+   if (dev->clas == EVAS_DEVICE_CLASS_KEYBOARD)
      {
         EINA_LIST_FOREACH(input_devmgr_data->inputgen.kbd_list, l, ddata)
           {
@@ -293,7 +293,7 @@ _e_devicemgr_add_device(const char *name, const char *identifier, const char *se
                }
           }
      }
-   else if (dev->clas == ECORE_DEVICE_CLASS_MOUSE)
+   else if (dev->clas == EVAS_DEVICE_CLASS_MOUSE)
      {
         EINA_LIST_FOREACH(input_devmgr_data->inputgen.ptr_list, l, ddata)
           {
@@ -306,7 +306,7 @@ _e_devicemgr_add_device(const char *name, const char *identifier, const char *se
                }
           }
      }
-   else if (dev->clas == ECORE_DEVICE_CLASS_TOUCH)
+   else if (dev->clas == EVAS_DEVICE_CLASS_TOUCH)
      {
         EINA_LIST_FOREACH(input_devmgr_data->inputgen.touch_list, l, ddata)
           {
@@ -341,15 +341,15 @@ _e_devicemgr_add_device(const char *name, const char *identifier, const char *se
           }
      }
 
-   if (dev->clas == ECORE_DEVICE_CLASS_MOUSE)
+   if (dev->clas == EVAS_DEVICE_CLASS_MOUSE)
      e_comp_wl->input_device_manager.last_device_ptr = dev;
 
    if (!e_comp_wl->input_device_manager.last_device_touch &&
-       dev->clas == ECORE_DEVICE_CLASS_TOUCH)
+       dev->clas == EVAS_DEVICE_CLASS_TOUCH)
      e_comp_wl->input_device_manager.last_device_touch = dev;
 
    if (!e_comp_wl->input_device_manager.last_device_kbd &&
-       dev->clas == ECORE_DEVICE_CLASS_KEYBOARD)
+       dev->clas == EVAS_DEVICE_CLASS_KEYBOARD)
      e_comp_wl->input_device_manager.last_device_kbd = dev;
 
    TRACE_INPUT_END();
@@ -383,14 +383,14 @@ static Eina_Bool
 _e_devicemgr_block_check_button(int type, void *event)
 {
    Ecore_Event_Mouse_Button *ev;
-   Ecore_Device *dev;
+   Evas_Device *dev;
 
    ev = event;
    EINA_SAFETY_ON_NULL_RETURN_VAL(ev, ECORE_CALLBACK_PASS_ON);
    dev = ev->dev;
    EINA_SAFETY_ON_NULL_RETURN_VAL(dev, ECORE_CALLBACK_PASS_ON);
 
-   if (ecore_device_class_get(dev) == ECORE_DEVICE_CLASS_MOUSE)
+   if (evas_device_class_get(dev) == EVAS_DEVICE_CLASS_MOUSE)
      {
         if (input_devmgr_data->block_devtype & TIZEN_INPUT_DEVICE_MANAGER_CLAS_MOUSE)
           {
@@ -414,7 +414,7 @@ _e_devicemgr_block_check_button(int type, void *event)
              input_devmgr_data->pressed_button &= ~(1 << ev->buttons);
           }
      }
-   else if (ecore_device_class_get(dev) == ECORE_DEVICE_CLASS_TOUCH)
+   else if (evas_device_class_get(dev) == EVAS_DEVICE_CLASS_TOUCH)
      {
         if (input_devmgr_data->block_devtype & TIZEN_INPUT_DEVICE_MANAGER_CLAS_TOUCHSCREEN)
           {
@@ -446,21 +446,21 @@ static Eina_Bool
 _e_devicemgr_block_check_move(int type, void *event)
 {
    Ecore_Event_Mouse_Move *ev;
-   Ecore_Device *dev;
+   Evas_Device *dev;
 
    ev = event;
    EINA_SAFETY_ON_NULL_RETURN_VAL(ev, ECORE_CALLBACK_PASS_ON);
    dev = ev->dev;
    EINA_SAFETY_ON_NULL_RETURN_VAL(dev, ECORE_CALLBACK_PASS_ON);
 
-   if (ecore_device_class_get(dev) == ECORE_DEVICE_CLASS_MOUSE)
+   if (evas_device_class_get(dev) == EVAS_DEVICE_CLASS_MOUSE)
      {
         if (input_devmgr_data->block_devtype & TIZEN_INPUT_DEVICE_MANAGER_CLAS_MOUSE)
           {
              return ECORE_CALLBACK_DONE;
           }
      }
-   else if (ecore_device_class_get(dev) == ECORE_DEVICE_CLASS_TOUCH)
+   else if (evas_device_class_get(dev) == EVAS_DEVICE_CLASS_TOUCH)
      {
         if (input_devmgr_data->block_devtype & TIZEN_INPUT_DEVICE_MANAGER_CLAS_TOUCHSCREEN)
           {
@@ -608,7 +608,7 @@ e_devicemgr_check_detent_device_add(int type, void *event)
         if (e_devicemgr_is_detent_device(e_device_add->name))
           {
              e_device_add->caps &= ~E_INPUT_SEAT_POINTER;
-             e_device_add->clas &= ~ECORE_DEVICE_CLASS_MOUSE;
+             e_device_add->clas &= ~EVAS_DEVICE_CLASS_MOUSE;
           }
      }
 
@@ -621,7 +621,7 @@ e_devicemgr_detent_check(int type, void *event)
 {
    int detent;
    const char *name;
-   Ecore_Device *dev = NULL;
+   Evas_Device *dev = NULL;
    Ecore_Event_Mouse_Wheel *ev = NULL;
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(event, ECORE_CALLBACK_PASS_ON);
@@ -640,7 +640,7 @@ e_devicemgr_detent_check(int type, void *event)
 
    EINA_SAFETY_ON_NULL_RETURN_VAL(dev, ECORE_CALLBACK_PASS_ON);
 
-   name = ecore_device_name_get(dev);
+   name = evas_device_name_get(dev);
    EINA_SAFETY_ON_NULL_RETURN_VAL(name, ECORE_CALLBACK_PASS_ON);
 
    if (e_devicemgr_is_detent_device(name))
@@ -1451,7 +1451,7 @@ _e_input_devmgr_generate_key_event(const char *key, Eina_Bool pressed, char *ide
    e->data = NULL;
 
    e->modifiers = 0;
-   e->dev = e_input_evdev_get_ecore_device(identifier, ECORE_DEVICE_CLASS_KEYBOARD);
+   e->dev = e_input_evdev_get_evas_device(identifier, EVAS_DEVICE_CLASS_KEYBOARD);
 
    DMDBG("Generate key event: key: %s, keycode: %d, iden: %s\n", e->key, e->keycode, identifier);
 
@@ -1584,7 +1584,7 @@ _e_input_devmgr_generate_pointer_event(Eina_Bool state, int x, int y, int button
    e->multi.y = e->y;
    e->multi.root.x = e->x;
    e->multi.root.y = e->y;
-   e->dev = e_input_evdev_get_ecore_device(identifier, ECORE_DEVICE_CLASS_MOUSE);
+   e->dev = e_input_evdev_get_evas_device(identifier, EVAS_DEVICE_CLASS_MOUSE);
    e->buttons = buttons;
 
    DMDBG("Generate mouse button event: button: %d (state: %d)\n", buttons, state);
@@ -1637,7 +1637,7 @@ _e_input_devmgr_generate_pointer_move_event(int x, int y, char *identifier)
    e->multi.y = e->y;
    e->multi.root.x = e->x;
    e->multi.root.y = e->y;
-   e->dev = e_input_evdev_get_ecore_device(identifier, ECORE_DEVICE_CLASS_MOUSE);
+   e->dev = e_input_evdev_get_evas_device(identifier, EVAS_DEVICE_CLASS_MOUSE);
 
    DMDBG("Generate mouse move event: (%d, %d)\n", e->x, e->y);
 
@@ -1726,7 +1726,7 @@ _e_input_devmgr_generate_touch_event(uint32_t type, uint32_t x, uint32_t y, uint
    e->multi.y = e->y;
    e->multi.root.x = e->x;
    e->multi.root.y = e->y;
-   e->dev = e_input_evdev_get_ecore_device(identifier, ECORE_DEVICE_CLASS_TOUCH);
+   e->dev = e_input_evdev_get_evas_device(identifier, EVAS_DEVICE_CLASS_TOUCH);
    e->buttons = 1;
 
    DMDBG("Generate touch event: device: %d (%d, %d)\n", e->multi.device, e->x, e->y);
@@ -1769,7 +1769,7 @@ _e_input_devmgr_generate_touch_update_event(uint32_t x, uint32_t y, uint32_t fin
    e->multi.y = e->y;
    e->multi.root.x = e->x;
    e->multi.root.y = e->y;
-   e->dev = e_input_evdev_get_ecore_device(identifier, ECORE_DEVICE_CLASS_TOUCH);
+   e->dev = e_input_evdev_get_evas_device(identifier, EVAS_DEVICE_CLASS_TOUCH);
 
    DMDBG("Generate touch move event: device: %d (%d, %d)\n", e->multi.device, e->x, e->y);