evas: Rename device Class to Type, remove Sub_Class

1. The word "class" is a pain point with many languages where
   it's a keyword. Type is a little better. Also, the property
   was already named "device_type" and not "device_class".

2. Remove Efl.Input.Device.Sub_Class
   It's not used inside EFL upstream codebase, and unlikely to
   be used anywhere else (even in Tizen).

Hopefully no one used the Efl_ enum types. So far only the Evas_
types should be in used.

Ref T5540

1 files changed, 35 insertions, 35 deletions

diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index e5eae6d0b9..b5c9f35020 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -351,7 +351,7 @@ _ecore_evas_cursor_add(Ecore_Evas *ee, Efl_Input_Device *dev)
    cursor = calloc(1, sizeof(Ecore_Evas_Cursor));
    EINA_SAFETY_ON_NULL_RETURN(cursor);
    eina_hash_add(ee->prop.cursors, &seat, cursor);
-   if (seat != evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT)) return;
+   if (seat != evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT)) return;
    if (ee->prop.cursor_cache.object)
      {
         ecore_evas_object_cursor_device_set(ee, dev,
@@ -366,11 +366,11 @@ _ecore_evas_cursor_add(Ecore_Evas *ee, Efl_Input_Device *dev)
 static inline Eina_Bool
 _is_pointer(Eo *dev)
 {
-   Efl_Input_Device_Class c = efl_input_device_type_get(dev);
-   return (c == EFL_INPUT_DEVICE_CLASS_MOUSE) ||
-            (c == EFL_INPUT_DEVICE_CLASS_PEN) ||
-            (c == EFL_INPUT_DEVICE_CLASS_TOUCH) ||
-            (c == EFL_INPUT_DEVICE_CLASS_WAND);
+   Efl_Input_Device_Type c = efl_input_device_type_get(dev);
+   return (c == EFL_INPUT_DEVICE_TYPE_MOUSE) ||
+            (c == EFL_INPUT_DEVICE_TYPE_PEN) ||
+            (c == EFL_INPUT_DEVICE_TYPE_TOUCH) ||
+            (c == EFL_INPUT_DEVICE_TYPE_WAND);
 }
 
 static void
@@ -382,7 +382,7 @@ _ecore_evas_dev_added_or_removed(void *data, const Efl_Event *event)
      {
         if (_is_pointer(event->info))
           _ecore_evas_cursor_add(ee, event->info);
-        else if (event->info == evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT))
+        else if (event->info == evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT))
           {
              if (ee->prop.focused)
                _ecore_evas_focus_device_set(ee, event->info, 1);
@@ -1734,7 +1734,7 @@ _ecore_evas_default_cursor_image_get(Ecore_Evas *ee)
    Efl_Input_Device *pointer;
    Ecore_Evas_Cursor *cursor;
 
-   pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT);
+   pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
    cursor = eina_hash_find(ee->prop.cursors, &pointer);
    EINA_SAFETY_ON_NULL_RETURN_VAL(cursor, NULL);
    return cursor->object;
@@ -1746,7 +1746,7 @@ _ecore_evas_default_cursor_hide(Ecore_Evas *ee)
    Efl_Input_Device *pointer;
    Ecore_Evas_Cursor *cursor;
 
-   pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT);
+   pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
    cursor = eina_hash_find(ee->prop.cursors, &pointer);
    EINA_SAFETY_ON_NULL_RETURN(cursor);
    if (cursor->object)
@@ -1765,12 +1765,12 @@ _ecore_evas_object_cursor_device_set(Ecore_Evas *ee, Efl_Input_Device *pointer,
 
    ECORE_EVAS_CHECK(ee);
 
-   dpointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT);
+   dpointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
    if (pointer)
      {
-        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
+        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
           pointer = efl_input_device_seat_get(pointer);
-        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
+        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
           {
              ERR("Could not find seat");
              return;
@@ -1882,16 +1882,16 @@ ecore_evas_cursor_device_get(const Ecore_Evas *ee, Efl_Input_Device *pointer,
 
    if (pointer)
      {
-        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
+        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
           pointer = efl_input_device_seat_get(pointer);
-        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
+        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
           {
              ERR("Could not find seat");
              return EINA_FALSE;
           }
      }
    else
-     pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT);
+     pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
    if (pointer)
      {
         cursor = eina_hash_find(ee->prop.cursors, &pointer);
@@ -1929,16 +1929,16 @@ ecore_evas_cursor_device_unset(Ecore_Evas *ee, Efl_Input_Device *pointer)
 
    if (pointer)
      {
-        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
+        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
           pointer = efl_input_device_seat_get(pointer);
-        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
+        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
           {
              ERR("Could not find seat");
              return NULL;
           }
      }
    else
-     pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT);
+     pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
    if (pointer)
      cursor = eina_hash_find(ee->prop.cursors, &pointer);
    if (!cursor) return NULL;
@@ -1980,7 +1980,7 @@ ecore_evas_focus_device_get(const Ecore_Evas *ee, Efl_Input_Device *seat)
 {
    ECORE_EVAS_CHECK(ee, EINA_FALSE);
    if (!seat)
-     seat = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT);
+     seat = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
    return eina_list_data_find(ee->prop.focused_by, seat) ? EINA_TRUE : EINA_FALSE;
 }
 
@@ -1991,10 +1991,10 @@ _ecore_evas_focus_device_set(Ecore_Evas *ee, Efl_Input_Device *seat,
    Eina_Bool present;
 
    if (!seat)
-     seat = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT);
+     seat = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
    if ((!on) && (!seat)) return;
 
-   if (seat && (efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_CLASS_SEAT))
+   if (seat && (efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_TYPE_SEAT))
      {
         ERR("The Input device must be an seat");
         return;
@@ -2768,16 +2768,16 @@ ecore_evas_pointer_device_xy_get(const Ecore_Evas *ee,
 
    if (pointer)
      {
-        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
+        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
           pointer = efl_input_device_seat_get(pointer);
-        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
+        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
           {
              ERR("Could not find seat");
              return;
           }
      }
    if ((!pointer) ||
-       (pointer == evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT)))
+       (pointer == evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT)))
      ecore_evas_pointer_xy_get(ee, x, y);
    else
      {
@@ -3354,16 +3354,16 @@ _ecore_evas_mouse_move_process_internal(Ecore_Evas *ee,
 
    if (pointer)
      {
-        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
+        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
           pointer = efl_input_device_seat_get(pointer);
-        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
+        if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
           {
              ERR("Could not find seat");
              return;
           }
      }
    else
-     pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT);
+     pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
    cursor = eina_hash_find(ee->prop.cursors, &pointer);
    if (cursor)
      {
@@ -4583,7 +4583,7 @@ _direct_mouse_updown(Ecore_Evas *ee, const Ecore_Event_Mouse_Button *info, Efl_P
    ev->pressure = info->multi.pressure;
    ev->angle = info->multi.angle - ee->rotation;
    if (info->dev) ev->device = efl_ref(info->dev);
-   else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_CLASS_MOUSE));
+   else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_MOUSE));
 
    efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
@@ -4644,7 +4644,7 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info)
    ev->pressure = info->multi.pressure;
    ev->angle = info->multi.angle - ee->rotation;
    if (info->dev) ev->device = efl_ref(info->dev);
-   else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_CLASS_MOUSE));
+   else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_MOUSE));
 
    efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
@@ -4678,7 +4678,7 @@ _direct_mouse_wheel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Wheel *info)
    ev->wheel.z = info->z;
    ev->wheel.dir = info->direction ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL;
    if (info->dev) ev->device = efl_ref(info->dev);
-   else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_CLASS_MOUSE));
+   else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_MOUSE));
 
    efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
@@ -4707,7 +4707,7 @@ _direct_mouse_inout(Ecore_Evas *ee, const Ecore_Event_Mouse_IO *info, Efl_Pointe
    ev->timestamp = info->timestamp;
    _pointer_position_set(ev, ee, info->x, info->y, info->x, info->y);
    if (info->dev) ev->device = efl_ref(info->dev);
-   else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_CLASS_MOUSE));
+   else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_MOUSE));
 
    efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
@@ -4836,7 +4836,7 @@ _direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info)
      }
    _pointer_position_set(ev, ee, x, y, x, y);
    if (info->dev) ev->device = efl_ref(info->dev);
-   else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_CLASS_MOUSE));
+   else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_MOUSE));
 
    efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
    processed = ev->evas_done;
@@ -4874,7 +4874,7 @@ _direct_key_updown_cb(Ecore_Evas *ee, const Ecore_Event_Key *info, Eina_Bool dow
    ev->data = info->data;
    ev->event_flags = 0;
    if (info->dev) ev->device = efl_ref(info->dev);
-   else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_CLASS_KEYBOARD));
+   else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_KEYBOARD));
 
    if (down)
      efl_event_callback_legacy_call(e, EFL_EVENT_KEY_DOWN, evt);
@@ -4927,7 +4927,7 @@ _ecore_evas_mouse_inout_set(Ecore_Evas *ee, Efl_Input_Device *mouse,
 
    if (!mouse)
      mouse = evas_default_device_get(ee->evas,
-                                     EFL_INPUT_DEVICE_CLASS_MOUSE);;
+                                     EFL_INPUT_DEVICE_TYPE_MOUSE);;
 
    EINA_SAFETY_ON_NULL_RETURN(mouse);
    present = eina_list_data_find(ee->mice_in, mouse);
@@ -4954,7 +4954,7 @@ EAPI Eina_Bool
 _ecore_evas_mouse_in_check(Ecore_Evas *ee, Efl_Input_Device *mouse)
 {
    if (!mouse)
-     mouse = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_MOUSE);
+     mouse = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE);
    EINA_SAFETY_ON_NULL_RETURN_VAL(mouse, EINA_FALSE);
    return eina_list_data_find(ee->mice_in, mouse) ? EINA_TRUE : EINA_FALSE;
 }