summaryrefslogtreecommitdiff
path: root/src/modules/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/modules/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/modules/ecore_evas')
-rw-r--r--src/modules/ecore_evas/engines/extn/ecore_evas_extn.c4
-rw-r--r--src/modules/ecore_evas/engines/fb/ecore_evas_fb.c4
-rw-r--r--src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c2
-rw-r--r--src/modules/ecore_evas/engines/win32/ecore_evas_win32.c4
-rw-r--r--src/modules/ecore_evas/engines/x/ecore_evas_x.c4
5 files changed, 9 insertions, 9 deletions
diff --git a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
index ed9710d..929dd94 100644
--- a/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
+++ b/src/modules/ecore_evas/engines/extn/ecore_evas_extn.c
@@ -752,7 +752,7 @@ _ecore_evas_extn_cb_focus_in(void *data, Evas *e EINA_UNUSED, Evas_Object *obj E
752 Extn *extn; 752 Extn *extn;
753 Evas_Device *dev; 753 Evas_Device *dev;
754 754
755 dev = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT); 755 dev = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT);
756 if (ecore_evas_focus_device_get(ee, dev)) return; 756 if (ecore_evas_focus_device_get(ee, dev)) return;
757 ee->prop.focused_by = eina_list_append(ee->prop.focused_by, dev); 757 ee->prop.focused_by = eina_list_append(ee->prop.focused_by, dev);
758 extn = bdata->data; 758 extn = bdata->data;
@@ -769,7 +769,7 @@ _ecore_evas_extn_cb_focus_out(void *data, Evas *e EINA_UNUSED, Evas_Object *obj
769 Extn *extn; 769 Extn *extn;
770 770
771 ee->prop.focused_by = eina_list_remove(ee->prop.focused_by, 771 ee->prop.focused_by = eina_list_remove(ee->prop.focused_by,
772 evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_SEAT)); 772 evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_SEAT));
773 extn = bdata->data; 773 extn = bdata->data;
774 if (!extn) return; 774 if (!extn) return;
775 if (!extn->ipc.server) return; 775 if (!extn->ipc.server) return;
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 a5ffd46..d3ea295 100644
--- a/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
+++ b/src/modules/ecore_evas/engines/fb/ecore_evas_fb.c
@@ -62,7 +62,7 @@ _ecore_evas_mouse_move_process_fb(Ecore_Evas *ee, int x, int y)
62 62
63 ecore_fb_size_get(&fbw, &fbh); 63 ecore_fb_size_get(&fbw, &fbh);
64 64
65 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_MOUSE); 65 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE);
66 pointer = evas_device_parent_get(pointer); 66 pointer = evas_device_parent_get(pointer);
67 cursor = eina_hash_find(ee->prop.cursors, &pointer); 67 cursor = eina_hash_find(ee->prop.cursors, &pointer);
68 EINA_SAFETY_ON_NULL_RETURN(cursor); 68 EINA_SAFETY_ON_NULL_RETURN(cursor);
@@ -331,7 +331,7 @@ _ecore_evas_rotation_set(Ecore_Evas *ee, int rotation, int resize EINA_UNUSED)
331 Evas_Engine_Info_FB *einfo; 331 Evas_Engine_Info_FB *einfo;
332 int rot_dif; 332 int rot_dif;
333 333
334 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_MOUSE); 334 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE);
335 pointer = evas_device_parent_get(pointer); 335 pointer = evas_device_parent_get(pointer);
336 cursor = eina_hash_find(ee->prop.cursors, &pointer); 336 cursor = eina_hash_find(ee->prop.cursors, &pointer);
337 EINA_SAFETY_ON_NULL_RETURN(cursor); 337 EINA_SAFETY_ON_NULL_RETURN(cursor);
diff --git a/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c b/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
index 03954e4..ae40287 100644
--- a/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
+++ b/src/modules/ecore_evas/engines/psl1ght/ecore_evas_psl1ght.c
@@ -221,7 +221,7 @@ _ecore_evas_screen_resized(Ecore_Evas *ee)
221 221
222 ecore_psl1ght_screen_resolution_get (&w, &h); 222 ecore_psl1ght_screen_resolution_get (&w, &h);
223 223
224 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_MOUSE); 224 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE);
225 pointer = evas_device_parent_get(pointer); 225 pointer = evas_device_parent_get(pointer);
226 cursor = eina_hash_find(ee->prop.cursors, &pointer); 226 cursor = eina_hash_find(ee->prop.cursors, &pointer);
227 EINA_SAFETY_ON_NULL_RETURN(cursor); 227 EINA_SAFETY_ON_NULL_RETURN(cursor);
diff --git a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
index 0cc28a8..2cdc1b5 100644
--- a/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
+++ b/src/modules/ecore_evas/engines/win32/ecore_evas_win32.c
@@ -342,7 +342,7 @@ _ecore_evas_win32_event_window_configure(void *data EINA_UNUSED, int type EINA_U
342 if (!ee) return ECORE_CALLBACK_PASS_ON; 342 if (!ee) return ECORE_CALLBACK_PASS_ON;
343 if ((Ecore_Window)e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON; 343 if ((Ecore_Window)e->window != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
344 344
345 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_MOUSE); 345 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE);
346 pointer = evas_device_parent_get(pointer); 346 pointer = evas_device_parent_get(pointer);
347 cursor = eina_hash_find(ee->prop.cursors, &pointer); 347 cursor = eina_hash_find(ee->prop.cursors, &pointer);
348 EINA_SAFETY_ON_NULL_RETURN_VAL(cursor, 1); 348 EINA_SAFETY_ON_NULL_RETURN_VAL(cursor, 1);
@@ -659,7 +659,7 @@ _ecore_evas_win32_rotation_set_internal(Ecore_Evas *ee, int rotation)
659 rot_dif = ee->rotation - rotation; 659 rot_dif = ee->rotation - rotation;
660 if (rot_dif < 0) rot_dif = -rot_dif; 660 if (rot_dif < 0) rot_dif = -rot_dif;
661 661
662 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_MOUSE); 662 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE);
663 pointer = evas_device_parent_get(pointer); 663 pointer = evas_device_parent_get(pointer);
664 cursor = eina_hash_find(ee->prop.cursors, &pointer); 664 cursor = eina_hash_find(ee->prop.cursors, &pointer);
665 EINA_SAFETY_ON_NULL_RETURN(cursor); 665 EINA_SAFETY_ON_NULL_RETURN(cursor);
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 de97101..6f7b8a0 100644
--- a/src/modules/ecore_evas/engines/x/ecore_evas_x.c
+++ b/src/modules/ecore_evas/engines/x/ecore_evas_x.c
@@ -1621,7 +1621,7 @@ _ecore_evas_x_event_window_configure(void *data EINA_UNUSED, int type EINA_UNUSE
1621 if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON; 1621 if (e->win != ee->prop.window) return ECORE_CALLBACK_PASS_ON;
1622 if (edata->direct_resize) return ECORE_CALLBACK_PASS_ON; 1622 if (edata->direct_resize) return ECORE_CALLBACK_PASS_ON;
1623 1623
1624 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_MOUSE); 1624 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE);
1625 pointer = evas_device_parent_get(pointer); 1625 pointer = evas_device_parent_get(pointer);
1626 cursor = eina_hash_find(ee->prop.cursors, &pointer); 1626 cursor = eina_hash_find(ee->prop.cursors, &pointer);
1627 EINA_SAFETY_ON_NULL_RETURN_VAL(cursor, ECORE_CALLBACK_PASS_ON); 1627 EINA_SAFETY_ON_NULL_RETURN_VAL(cursor, ECORE_CALLBACK_PASS_ON);
@@ -2344,7 +2344,7 @@ _ecore_evas_x_rotation_set_internal(Ecore_Evas *ee, int rotation, int resize,
2344 Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data; 2344 Ecore_Evas_Engine_Data_X11 *edata = ee->engine.data;
2345 int fw = 0, fh = 0; 2345 int fw = 0, fh = 0;
2346 2346
2347 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_CLASS_MOUSE); 2347 pointer = evas_default_device_get(ee->evas, EFL_INPUT_DEVICE_TYPE_MOUSE);
2348 pointer = evas_device_parent_get(pointer); 2348 pointer = evas_device_parent_get(pointer);
2349 cursor = eina_hash_find(ee->prop.cursors, &pointer); 2349 cursor = eina_hash_find(ee->prop.cursors, &pointer);
2350 EINA_SAFETY_ON_NULL_RETURN(cursor); 2350 EINA_SAFETY_ON_NULL_RETURN(cursor);