summaryrefslogtreecommitdiff
path: root/src/lib/ecore_evas
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-06-12 14:56:36 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-06-12 15:21:55 +0900
commite8f9f109a6d342771d7183fcf74109bbb6b0b0e9 (patch)
tree26633fc3db386a75651b80bac32ea48fc3778c59 /src/lib/ecore_evas
parent83d18617b4375577b39bf74b56c7e7540719ee71 (diff)
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
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r--src/lib/ecore_evas/ecore_evas.c70
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)
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);
353 eina_hash_add(ee->prop.cursors, &seat, cursor); 353 eina_hash_add(ee->prop.cursors, &seat, cursor);
354 if (seat != evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT)) return; 354 if (seat != evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT)) return;
355 if (ee->prop.cursor_cache.object) 355 if (ee->prop.cursor_cache.object)
356 { 356 {
357 ecore_evas_object_cursor_device_set(ee, dev, 357 ecore_evas_object_cursor_device_set(ee, dev,
@@ -366,11 +366,11 @@ _ecore_evas_cursor_add(Ecore_Evas *ee, Efl_Input_Device *dev)
366static inline Eina_Bool 366static inline Eina_Bool
367_is_pointer(Eo *dev) 367_is_pointer(Eo *dev)
368{ 368{
369 Efl_Input_Device_Class c = efl_input_device_type_get(dev); 369 Efl_Input_Device_Type c = efl_input_device_type_get(dev);
370 return (c == EFL_INPUT_DEVICE_CLASS_MOUSE) || 370 return (c == EFL_INPUT_DEVICE_TYPE_MOUSE) ||
371 (c == EFL_INPUT_DEVICE_CLASS_PEN) || 371 (c == EFL_INPUT_DEVICE_TYPE_PEN) ||
372 (c == EFL_INPUT_DEVICE_CLASS_TOUCH) || 372 (c == EFL_INPUT_DEVICE_TYPE_TOUCH) ||
373 (c == EFL_INPUT_DEVICE_CLASS_WAND); 373 (c == EFL_INPUT_DEVICE_TYPE_WAND);
374} 374}
375 375
376static void 376static void
@@ -382,7 +382,7 @@ _ecore_evas_dev_added_or_removed(void *data, const Efl_Event *event)
382 { 382 {
383 if (_is_pointer(event->info)) 383 if (_is_pointer(event->info))
384 _ecore_evas_cursor_add(ee, event->info); 384 _ecore_evas_cursor_add(ee, event->info);
385 else if (event->info == evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT)) 385 else if (event->info == evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT))
386 { 386 {
387 if (ee->prop.focused) 387 if (ee->prop.focused)
388 _ecore_evas_focus_device_set(ee, event->info, 1); 388 _ecore_evas_focus_device_set(ee, event->info, 1);
@@ -1734,7 +1734,7 @@ _ecore_evas_default_cursor_image_get(Ecore_Evas *ee)
1734 Efl_Input_Device *pointer; 1734 Efl_Input_Device *pointer;
1735 Ecore_Evas_Cursor *cursor; 1735 Ecore_Evas_Cursor *cursor;
1736 1736
1737 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT); 1737 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
1738 cursor = eina_hash_find(ee->prop.cursors, &pointer); 1738 cursor = eina_hash_find(ee->prop.cursors, &pointer);
1739 EINA_SAFETY_ON_NULL_RETURN_VAL(cursor, NULL); 1739 EINA_SAFETY_ON_NULL_RETURN_VAL(cursor, NULL);
1740 return cursor->object; 1740 return cursor->object;
@@ -1746,7 +1746,7 @@ _ecore_evas_default_cursor_hide(Ecore_Evas *ee)
1746 Efl_Input_Device *pointer; 1746 Efl_Input_Device *pointer;
1747 Ecore_Evas_Cursor *cursor; 1747 Ecore_Evas_Cursor *cursor;
1748 1748
1749 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT); 1749 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
1750 cursor = eina_hash_find(ee->prop.cursors, &pointer); 1750 cursor = eina_hash_find(ee->prop.cursors, &pointer);
1751 EINA_SAFETY_ON_NULL_RETURN(cursor); 1751 EINA_SAFETY_ON_NULL_RETURN(cursor);
1752 if (cursor->object) 1752 if (cursor->object)
@@ -1765,12 +1765,12 @@ _ecore_evas_object_cursor_device_set(Ecore_Evas *ee, Efl_Input_Device *pointer,
1765 1765
1766 ECORE_EVAS_CHECK(ee); 1766 ECORE_EVAS_CHECK(ee);
1767 1767
1768 dpointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT); 1768 dpointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
1769 if (pointer) 1769 if (pointer)
1770 { 1770 {
1771 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 1771 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
1772 pointer = efl_input_device_seat_get(pointer); 1772 pointer = efl_input_device_seat_get(pointer);
1773 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 1773 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
1774 { 1774 {
1775 ERR("Could not find seat"); 1775 ERR("Could not find seat");
1776 return; 1776 return;
@@ -1882,16 +1882,16 @@ ecore_evas_cursor_device_get(const Ecore_Evas *ee, Efl_Input_Device *pointer,
1882 1882
1883 if (pointer) 1883 if (pointer)
1884 { 1884 {
1885 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 1885 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
1886 pointer = efl_input_device_seat_get(pointer); 1886 pointer = efl_input_device_seat_get(pointer);
1887 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 1887 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
1888 { 1888 {
1889 ERR("Could not find seat"); 1889 ERR("Could not find seat");
1890 return EINA_FALSE; 1890 return EINA_FALSE;
1891 } 1891 }
1892 } 1892 }
1893 else 1893 else
1894 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT); 1894 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
1895 if (pointer) 1895 if (pointer)
1896 { 1896 {
1897 cursor = eina_hash_find(ee->prop.cursors, &pointer); 1897 cursor = eina_hash_find(ee->prop.cursors, &pointer);
@@ -1929,16 +1929,16 @@ ecore_evas_cursor_device_unset(Ecore_Evas *ee, Efl_Input_Device *pointer)
1929 1929
1930 if (pointer) 1930 if (pointer)
1931 { 1931 {
1932 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 1932 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
1933 pointer = efl_input_device_seat_get(pointer); 1933 pointer = efl_input_device_seat_get(pointer);
1934 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 1934 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
1935 { 1935 {
1936 ERR("Could not find seat"); 1936 ERR("Could not find seat");
1937 return NULL; 1937 return NULL;
1938 } 1938 }
1939 } 1939 }
1940 else 1940 else
1941 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT); 1941 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
1942 if (pointer) 1942 if (pointer)
1943 cursor = eina_hash_find(ee->prop.cursors, &pointer); 1943 cursor = eina_hash_find(ee->prop.cursors, &pointer);
1944 if (!cursor) return NULL; 1944 if (!cursor) return NULL;
@@ -1980,7 +1980,7 @@ ecore_evas_focus_device_get(const Ecore_Evas *ee, Efl_Input_Device *seat)
1980{ 1980{
1981 ECORE_EVAS_CHECK(ee, EINA_FALSE); 1981 ECORE_EVAS_CHECK(ee, EINA_FALSE);
1982 if (!seat) 1982 if (!seat)
1983 seat = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT); 1983 seat = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
1984 return eina_list_data_find(ee->prop.focused_by, seat) ? EINA_TRUE : EINA_FALSE; 1984 return eina_list_data_find(ee->prop.focused_by, seat) ? EINA_TRUE : EINA_FALSE;
1985} 1985}
1986 1986
@@ -1991,10 +1991,10 @@ _ecore_evas_focus_device_set(Ecore_Evas *ee, Efl_Input_Device *seat,
1991 Eina_Bool present; 1991 Eina_Bool present;
1992 1992
1993 if (!seat) 1993 if (!seat)
1994 seat = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT); 1994 seat = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
1995 if ((!on) && (!seat)) return; 1995 if ((!on) && (!seat)) return;
1996 1996
1997 if (seat && (efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_CLASS_SEAT)) 1997 if (seat && (efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_TYPE_SEAT))
1998 { 1998 {
1999 ERR("The Input device must be an seat"); 1999 ERR("The Input device must be an seat");
2000 return; 2000 return;
@@ -2768,16 +2768,16 @@ ecore_evas_pointer_device_xy_get(const Ecore_Evas *ee,
2768 2768
2769 if (pointer) 2769 if (pointer)
2770 { 2770 {
2771 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 2771 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
2772 pointer = efl_input_device_seat_get(pointer); 2772 pointer = efl_input_device_seat_get(pointer);
2773 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 2773 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
2774 { 2774 {
2775 ERR("Could not find seat"); 2775 ERR("Could not find seat");
2776 return; 2776 return;
2777 } 2777 }
2778 } 2778 }
2779 if ((!pointer) || 2779 if ((!pointer) ||
2780 (pointer == evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT))) 2780 (pointer == evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT)))
2781 ecore_evas_pointer_xy_get(ee, x, y); 2781 ecore_evas_pointer_xy_get(ee, x, y);
2782 else 2782 else
2783 { 2783 {
@@ -3354,16 +3354,16 @@ _ecore_evas_mouse_move_process_internal(Ecore_Evas *ee,
3354 3354
3355 if (pointer) 3355 if (pointer)
3356 { 3356 {
3357 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 3357 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
3358 pointer = efl_input_device_seat_get(pointer); 3358 pointer = efl_input_device_seat_get(pointer);
3359 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_SEAT) 3359 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_SEAT)
3360 { 3360 {
3361 ERR("Could not find seat"); 3361 ERR("Could not find seat");
3362 return; 3362 return;
3363 } 3363 }
3364 } 3364 }
3365 else 3365 else
3366 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT); 3366 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
3367 cursor = eina_hash_find(ee->prop.cursors, &pointer); 3367 cursor = eina_hash_find(ee->prop.cursors, &pointer);
3368 if (cursor) 3368 if (cursor)
3369 { 3369 {
@@ -4583,7 +4583,7 @@ _direct_mouse_updown(Ecore_Evas *ee, const Ecore_Event_Mouse_Button *info, Efl_P
4583 ev->pressure = info->multi.pressure; 4583 ev->pressure = info->multi.pressure;
4584 ev->angle = info->multi.angle - ee->rotation; 4584 ev->angle = info->multi.angle - ee->rotation;
4585 if (info->dev) ev->device = efl_ref(info->dev); 4585 if (info->dev) ev->device = efl_ref(info->dev);
4586 else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_CLASS_MOUSE)); 4586 else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_MOUSE));
4587 4587
4588 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); 4588 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
4589 processed = ev->evas_done; 4589 processed = ev->evas_done;
@@ -4644,7 +4644,7 @@ _direct_mouse_move_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Move *info)
4644 ev->pressure = info->multi.pressure; 4644 ev->pressure = info->multi.pressure;
4645 ev->angle = info->multi.angle - ee->rotation; 4645 ev->angle = info->multi.angle - ee->rotation;
4646 if (info->dev) ev->device = efl_ref(info->dev); 4646 if (info->dev) ev->device = efl_ref(info->dev);
4647 else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_CLASS_MOUSE)); 4647 else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_MOUSE));
4648 4648
4649 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); 4649 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
4650 processed = ev->evas_done; 4650 processed = ev->evas_done;
@@ -4678,7 +4678,7 @@ _direct_mouse_wheel_cb(Ecore_Evas *ee, const Ecore_Event_Mouse_Wheel *info)
4678 ev->wheel.z = info->z; 4678 ev->wheel.z = info->z;
4679 ev->wheel.dir = info->direction ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL; 4679 ev->wheel.dir = info->direction ? EFL_ORIENT_HORIZONTAL : EFL_ORIENT_VERTICAL;
4680 if (info->dev) ev->device = efl_ref(info->dev); 4680 if (info->dev) ev->device = efl_ref(info->dev);
4681 else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_CLASS_MOUSE)); 4681 else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_MOUSE));
4682 4682
4683 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); 4683 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
4684 processed = ev->evas_done; 4684 processed = ev->evas_done;
@@ -4707,7 +4707,7 @@ _direct_mouse_inout(Ecore_Evas *ee, const Ecore_Event_Mouse_IO *info, Efl_Pointe
4707 ev->timestamp = info->timestamp; 4707 ev->timestamp = info->timestamp;
4708 _pointer_position_set(ev, ee, info->x, info->y, info->x, info->y); 4708 _pointer_position_set(ev, ee, info->x, info->y, info->x, info->y);
4709 if (info->dev) ev->device = efl_ref(info->dev); 4709 if (info->dev) ev->device = efl_ref(info->dev);
4710 else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_CLASS_MOUSE)); 4710 else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_MOUSE));
4711 4711
4712 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); 4712 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
4713 processed = ev->evas_done; 4713 processed = ev->evas_done;
@@ -4836,7 +4836,7 @@ _direct_axis_update_cb(Ecore_Evas *ee, const Ecore_Event_Axis_Update *info)
4836 } 4836 }
4837 _pointer_position_set(ev, ee, x, y, x, y); 4837 _pointer_position_set(ev, ee, x, y, x, y);
4838 if (info->dev) ev->device = efl_ref(info->dev); 4838 if (info->dev) ev->device = efl_ref(info->dev);
4839 else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_CLASS_MOUSE)); 4839 else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_MOUSE));
4840 4840
4841 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt); 4841 efl_event_callback_legacy_call(e, _event_description_get(ev->action), evt);
4842 processed = ev->evas_done; 4842 processed = ev->evas_done;
@@ -4874,7 +4874,7 @@ _direct_key_updown_cb(Ecore_Evas *ee, const Ecore_Event_Key *info, Eina_Bool dow
4874 ev->data = info->data; 4874 ev->data = info->data;
4875 ev->event_flags = 0; 4875 ev->event_flags = 0;
4876 if (info->dev) ev->device = efl_ref(info->dev); 4876 if (info->dev) ev->device = efl_ref(info->dev);
4877 else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_CLASS_KEYBOARD)); 4877 else ev->device = efl_ref(evas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_KEYBOARD));
4878 4878
4879 if (down) 4879 if (down)
4880 efl_event_callback_legacy_call(e, EFL_EVENT_KEY_DOWN, evt); 4880 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,
4927 4927
4928 if (!mouse) 4928 if (!mouse)
4929 mouse = evas_default_device_get(ee->evas, 4929 mouse = evas_default_device_get(ee->evas,
4930 EFL_INPUT_DEVICE_CLASS_MOUSE);; 4930 EFL_INPUT_DEVICE_TYPE_MOUSE);;
4931 4931
4932 EINA_SAFETY_ON_NULL_RETURN(mouse); 4932 EINA_SAFETY_ON_NULL_RETURN(mouse);
4933 present = eina_list_data_find(ee->mice_in, mouse); 4933 present = eina_list_data_find(ee->mice_in, mouse);
@@ -4954,7 +4954,7 @@ EAPI Eina_Bool
4954_ecore_evas_mouse_in_check(Ecore_Evas *ee, Efl_Input_Device *mouse) 4954_ecore_evas_mouse_in_check(Ecore_Evas *ee, Efl_Input_Device *mouse)
4955{ 4955{
4956 if (!mouse) 4956 if (!mouse)
4957 mouse = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_MOUSE); 4957 mouse = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE);
4958 EINA_SAFETY_ON_NULL_RETURN_VAL(mouse, EINA_FALSE); 4958 EINA_SAFETY_ON_NULL_RETURN_VAL(mouse, EINA_FALSE);
4959 return eina_list_data_find(ee->mice_in, mouse) ? EINA_TRUE : EINA_FALSE; 4959 return eina_list_data_find(ee->mice_in, mouse) ? EINA_TRUE : EINA_FALSE;
4960} 4960}