summaryrefslogtreecommitdiff
path: root/src/lib/ecore_evas
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-06-02 18:23:45 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-06-02 18:23:42 -0400
commit6632f4d90699362402812d22af4ec607fff98c17 (patch)
treedc8adae8c31140d18ba8664a7f4eb34ce070c939 /src/lib/ecore_evas
parent890a9178529d20bb76e658ae7a13f254cbff7760 (diff)
ecore-evas: directly get the seat device instead of the parent
no functional changes
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r--src/lib/ecore_evas/ecore_evas.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/ecore_evas/ecore_evas.c b/src/lib/ecore_evas/ecore_evas.c
index d9ad82e59e..991599aca3 100644
--- a/src/lib/ecore_evas/ecore_evas.c
+++ b/src/lib/ecore_evas/ecore_evas.c
@@ -346,7 +346,7 @@ _ecore_evas_cursor_add(Ecore_Evas *ee, Efl_Input_Device *dev)
346 346
347 seat = dev; 347 seat = dev;
348 if (evas_device_class_get(dev) != EVAS_DEVICE_CLASS_SEAT) 348 if (evas_device_class_get(dev) != EVAS_DEVICE_CLASS_SEAT)
349 seat = evas_device_parent_get(dev); 349 seat = efl_input_device_seat_get(dev);
350 if (eina_hash_find(ee->prop.cursors, &seat)) return; 350 if (eina_hash_find(ee->prop.cursors, &seat)) return;
351 cursor = calloc(1, sizeof(Ecore_Evas_Cursor)); 351 cursor = calloc(1, sizeof(Ecore_Evas_Cursor));
352 EINA_SAFETY_ON_NULL_RETURN(cursor); 352 EINA_SAFETY_ON_NULL_RETURN(cursor);
@@ -387,7 +387,7 @@ _ecore_evas_dev_added_or_removed(void *data, const Efl_Event *event)
387 { 387 {
388 Eina_Iterator *it; 388 Eina_Iterator *it;
389 Eina_Bool found = EINA_FALSE; 389 Eina_Bool found = EINA_FALSE;
390 Eo *dev, *seat = efl_input_device_parent_get(event->info); 390 Eo *dev, *seat = efl_input_device_seat_get(event->info);
391 391
392 it = efl_input_device_children_iterate(seat); 392 it = efl_input_device_children_iterate(seat);
393 EINA_ITERATOR_FOREACH(it, dev) 393 EINA_ITERATOR_FOREACH(it, dev)
@@ -1764,7 +1764,7 @@ _ecore_evas_object_cursor_device_set(Ecore_Evas *ee, Efl_Input_Device *pointer,
1764 if (pointer) 1764 if (pointer)
1765 { 1765 {
1766 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 1766 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
1767 pointer = efl_input_device_parent_get(pointer); 1767 pointer = efl_input_device_seat_get(pointer);
1768 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 1768 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
1769 { 1769 {
1770 ERR("Could not find seat"); 1770 ERR("Could not find seat");
@@ -1878,7 +1878,7 @@ ecore_evas_cursor_device_get(const Ecore_Evas *ee, Efl_Input_Device *pointer,
1878 if (pointer) 1878 if (pointer)
1879 { 1879 {
1880 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 1880 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
1881 pointer = efl_input_device_parent_get(pointer); 1881 pointer = efl_input_device_seat_get(pointer);
1882 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 1882 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
1883 { 1883 {
1884 ERR("Could not find seat"); 1884 ERR("Could not find seat");
@@ -1925,7 +1925,7 @@ ecore_evas_cursor_device_unset(Ecore_Evas *ee, Efl_Input_Device *pointer)
1925 if (pointer) 1925 if (pointer)
1926 { 1926 {
1927 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 1927 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
1928 pointer = efl_input_device_parent_get(pointer); 1928 pointer = efl_input_device_seat_get(pointer);
1929 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 1929 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
1930 { 1930 {
1931 ERR("Could not find seat"); 1931 ERR("Could not find seat");
@@ -2762,7 +2762,7 @@ ecore_evas_pointer_device_xy_get(const Ecore_Evas *ee,
2762 if (pointer) 2762 if (pointer)
2763 { 2763 {
2764 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 2764 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
2765 pointer = efl_input_device_parent_get(pointer); 2765 pointer = efl_input_device_seat_get(pointer);
2766 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 2766 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
2767 { 2767 {
2768 ERR("Could not find seat"); 2768 ERR("Could not find seat");
@@ -3348,7 +3348,7 @@ _ecore_evas_mouse_move_process_internal(Ecore_Evas *ee,
3348 if (pointer) 3348 if (pointer)
3349 { 3349 {
3350 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 3350 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
3351 pointer = efl_input_device_parent_get(pointer); 3351 pointer = efl_input_device_seat_get(pointer);
3352 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 3352 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT)
3353 { 3353 {
3354 ERR("Could not find seat"); 3354 ERR("Could not find seat");