summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-08-24 23:45:22 +0100
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2020-08-25 13:21:25 +0100
commitaad95dd6254e525f51a7369c9f7f732e3386f843 (patch)
tree0970b89d69ff4d675c16607d301b59fcae359705
parent7b3096f947064daf342f79bff6d37974e365f5de (diff)
ecore evas - module - use correct enums
-rw-r--r--src/modules/ecore_evas/engines/fb/ecore_evas_fb.c4
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c2
-rw-r--r--src/modules/ecore_evas/engines/x/ecore_evas_x.c4
3 files changed, 5 insertions, 5 deletions
diff --git a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
index 17bf83f7c1..ce671e2e3e 100644
--- a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
+++ b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
@@ -61,7 +61,7 @@ _ecore_evas_mouse_move_process_fb(Ecore_Evas *ee, int x, int y)
61 61
62 ecore_fb_size_get(&fbw, &fbh); 62 ecore_fb_size_get(&fbw, &fbh);
63 63
64 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE); 64 pointer = evas_default_device_get(ee->evas, EVAS_DEVICE_CLASS_MOUSE);
65 pointer = evas_device_parent_get(pointer); 65 pointer = evas_device_parent_get(pointer);
66 cursor = eina_hash_find(ee->prop.cursors, &pointer); 66 cursor = eina_hash_find(ee->prop.cursors, &pointer);
67 EINA_SAFETY_ON_NULL_RETURN(cursor); 67 EINA_SAFETY_ON_NULL_RETURN(cursor);
@@ -330,7 +330,7 @@ _ecore_evas_rotation_set(Ecore_Evas *ee, int rotation, int resize EINA_UNUSED)
330 Evas_Engine_Info_FB *einfo; 330 Evas_Engine_Info_FB *einfo;
331 int rot_dif; 331 int rot_dif;
332 332
333 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE); 333 pointer = evas_default_device_get(ee->evas, EVAS_DEVICE_CLASS_MOUSE);
334 pointer = evas_device_parent_get(pointer); 334 pointer = evas_device_parent_get(pointer);
335 cursor = eina_hash_find(ee->prop.cursors, &pointer); 335 cursor = eina_hash_find(ee->prop.cursors, &pointer);
336 EINA_SAFETY_ON_NULL_RETURN(cursor); 336 EINA_SAFETY_ON_NULL_RETURN(cursor);
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 947ac2de7e..ab4190a1a8 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -2427,7 +2427,7 @@ _reeval_seat(unsigned int *seat, Ecore_Evas *ee)
2427 { 2427 {
2428 *seat = 2428 *seat =
2429 evas_device_seat_id_get(evas_default_device_get 2429 evas_device_seat_id_get(evas_default_device_get
2430 (ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT)); 2430 (ee->evas, EVAS_DEVICE_CLASS_SEAT));
2431 } 2431 }
2432} 2432}
2433 2433
diff --git a/src/modules/ecore_evas/engines/x/ecore_evas_x.c b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
index 91cd012388..c73e530425 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -1596,7 +1596,7 @@ _ecore_evas_x_event_window_configure(void *data EINA_UNUSED, int type EINA_UNUSE
1596 } 1596 }
1597 if (edata->direct_resize) return ECORE_CALLBACK_PASS_ON; 1597 if (edata->direct_resize) return ECORE_CALLBACK_PASS_ON;
1598 1598
1599 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE); 1599 pointer = evas_default_device_get(ee->evas, EVAS_DEVICE_CLASS_MOUSE);
1600 pointer = evas_device_parent_get(pointer); 1600 pointer = evas_device_parent_get(pointer);
1601 cursor = eina_hash_find(ee->prop.cursors, &pointer); 1601 cursor = eina_hash_find(ee->prop.cursors, &pointer);
1602 EINA_SAFETY_ON_NULL_RETURN_VAL(cursor, ECORE_CALLBACK_PASS_ON); 1602 EINA_SAFETY_ON_NULL_RETURN_VAL(cursor, ECORE_CALLBACK_PASS_ON);
@@ -2330,7 +2330,7 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize,
2330 Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data; 2330 Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
2331 int fw = 0, fh = 0; 2331 int fw = 0, fh = 0;
2332 2332
2333 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE); 2333 pointer = evas_default_device_get(ee->evas, EVAS_DEVICE_CLASS_MOUSE);
2334 pointer = evas_device_parent_get(pointer); 2334 pointer = evas_device_parent_get(pointer);
2335 cursor = eina_hash_find(ee->prop.cursors, &pointer); 2335 cursor = eina_hash_find(ee->prop.cursors, &pointer);
2336 EINA_SAFETY_ON_NULL_RETURN(cursor); 2336 EINA_SAFETY_ON_NULL_RETURN(cursor);