ecore evas - module - use correct enums
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>
Mon, 24 Aug 2020 22:45:22 +0000 (23:45 +0100)
committerJongmin Lee <jm105.lee@samsung.com>
Wed, 26 Aug 2020 22:17:59 +0000 (07:17 +0900)
src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
src/modules/ecore_evas/engines/x/ecore_evas_x.c

index 5778dbc..35d9099 100644 (file)
@@ -61,7 +61,7 @@ _ecore_evas_mouse_move_process_fb(Ecore_Evas *ee, int x, int y)
 
    ecore_fb_size_get(&fbw, &fbh);
 
-   pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE);
+   pointer = evas_default_device_get(ee->evas, EVAS_DEVICE_CLASS_MOUSE);
    pointer = evas_device_parent_get(pointer);
    cursor = eina_hash_find(ee->prop.cursors, &pointer);
    EINA_SAFETY_ON_NULL_RETURN(cursor);
@@ -330,7 +330,7 @@ _ecore_evas_rotation_set(Ecore_Evas *ee, int rotation, int resize EINA_UNUSED)
    Evas_Engine_Info_FB *einfo;
    int rot_dif;
 
-   pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE);
+   pointer = evas_default_device_get(ee->evas, EVAS_DEVICE_CLASS_MOUSE);
    pointer = evas_device_parent_get(pointer);
    cursor = eina_hash_find(ee->prop.cursors, &pointer);
    EINA_SAFETY_ON_NULL_RETURN(cursor);
index dfbed2b..d00555f 100644 (file)
@@ -3376,7 +3376,11 @@ static void
 _reeval_seat(unsigned int *seat, Ecore_Evas *ee)
 {
    if (*seat == 0)
-     *seat = evas_device_seat_id_get(evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT));
+     {
+        *seat =
+          evas_device_seat_id_get(evas_default_device_get
+                                  (ee->evas, EVAS_DEVICE_CLASS_SEAT));
+     }
 }
 
 static inline void
index be3465e..3e7f228 100644 (file)
@@ -1594,7 +1594,7 @@ _ecore_evas_x_event_window_configure(void *data EINA_UNUSED, int type EINA_UNUSE
      }
    if (edata->direct_resize) return ECORE_CALLBACK_PASS_ON;
 
-   pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE);
+   pointer = evas_default_device_get(ee->evas, EVAS_DEVICE_CLASS_MOUSE);
    pointer = evas_device_parent_get(pointer);
    cursor = eina_hash_find(ee->prop.cursors, &pointer);
    EINA_SAFETY_ON_NULL_RETURN_VAL(cursor, ECORE_CALLBACK_PASS_ON);
@@ -2322,7 +2322,7 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize,
    Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
    int fw = 0, fh = 0;
 
-   pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE);
+   pointer = evas_default_device_get(ee->evas, EVAS_DEVICE_CLASS_MOUSE);
    pointer = evas_device_parent_get(pointer);
    cursor = eina_hash_find(ee->prop.cursors, &pointer);
    EINA_SAFETY_ON_NULL_RETURN(cursor);