summaryrefslogtreecommitdiff
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
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
-rw-r--r--src/examples/ecore/ecore_evas_cursor_example.c26
-rw-r--r--src/examples/ecore/ecore_evas_vnc_example.c22
-rw-r--r--src/examples/ecore/ecore_evas_wayland_multiseat_example.c18
-rw-r--r--src/examples/edje/edje-multiseat-custom-names.c4
-rw-r--r--src/examples/edje/edje-multiseat-filter.c4
-rw-r--r--src/examples/edje/edje-multiseat.c4
-rw-r--r--src/examples/evas/evas-event-filter.c4
-rw-r--r--src/examples/evas/evas-multiseat-events.c4
-rw-r--r--src/lib/ecore_evas/ecore_evas.c70
-rw-r--r--src/lib/edje/edje_entry.c2
-rw-r--r--src/lib/edje/edje_load.c8
-rw-r--r--src/lib/edje/edje_program.c4
-rw-r--r--src/lib/efl/interfaces/efl_common_internal.h6
-rw-r--r--src/lib/efl/interfaces/efl_input_device.c38
-rw-r--r--src/lib/efl/interfaces/efl_input_device.eo37
-rw-r--r--src/lib/evas/Evas_Common.h58
-rw-r--r--src/lib/evas/canvas/evas_canvas.eo2
-rw-r--r--src/lib/evas/canvas/evas_device.c11
-rw-r--r--src/lib/evas/canvas/evas_focus.c2
-rw-r--r--src/lib/evas/canvas/evas_key.c4
-rw-r--r--src/lib/evas/canvas/evas_main.c12
-rw-r--r--src/lib/evas/canvas/evas_object_main.c4
-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
27 files changed, 167 insertions, 195 deletions
diff --git a/src/examples/ecore/ecore_evas_cursor_example.c b/src/examples/ecore/ecore_evas_cursor_example.c
index 16a3928f76..a40ad3c0bc 100644
--- a/src/examples/ecore/ecore_evas_cursor_example.c
+++ b/src/examples/ecore/ecore_evas_cursor_example.c
@@ -49,7 +49,7 @@ _mouse_pos_print(void *data)
49 Evas_Coord x, y; 49 Evas_Coord x, y;
50 Efl_Input_Device *seat; 50 Efl_Input_Device *seat;
51 51
52 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_MOUSE) 52 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_MOUSE)
53 continue; 53 continue;
54 ecore_evas_pointer_device_xy_get(data, pointer, &x, &y); 54 ecore_evas_pointer_device_xy_get(data, pointer, &x, &y);
55 seat = efl_input_device_seat_get(pointer); 55 seat = efl_input_device_seat_get(pointer);
@@ -78,25 +78,25 @@ _cursor_set(Ecore_Evas *ee, Efl_Input_Device *pointer)
78} 78}
79 79
80static const char * 80static const char *
81_device_type_to_string(Efl_Input_Device_Class klass) 81_device_type_to_string(Efl_Input_Device_Type klass)
82{ 82{
83 switch (klass) 83 switch (klass)
84 { 84 {
85 case EFL_INPUT_DEVICE_CLASS_NONE: 85 case EFL_INPUT_DEVICE_TYPE_NONE:
86 return "None"; 86 return "None";
87 case EFL_INPUT_DEVICE_CLASS_SEAT: 87 case EFL_INPUT_DEVICE_TYPE_SEAT:
88 return "Seat"; 88 return "Seat";
89 case EFL_INPUT_DEVICE_CLASS_KEYBOARD: 89 case EFL_INPUT_DEVICE_TYPE_KEYBOARD:
90 return "Keyboard"; 90 return "Keyboard";
91 case EFL_INPUT_DEVICE_CLASS_MOUSE: 91 case EFL_INPUT_DEVICE_TYPE_MOUSE:
92 return "Mouse"; 92 return "Mouse";
93 case EFL_INPUT_DEVICE_CLASS_TOUCH: 93 case EFL_INPUT_DEVICE_TYPE_TOUCH:
94 return "Touch"; 94 return "Touch";
95 case EFL_INPUT_DEVICE_CLASS_PEN: 95 case EFL_INPUT_DEVICE_TYPE_PEN:
96 return "Pen"; 96 return "Pen";
97 case EFL_INPUT_DEVICE_CLASS_WAND: 97 case EFL_INPUT_DEVICE_TYPE_WAND:
98 return "Wand"; 98 return "Wand";
99 case EFL_INPUT_DEVICE_CLASS_GAMEPAD: 99 case EFL_INPUT_DEVICE_TYPE_GAMEPAD:
100 return "Gamepad"; 100 return "Gamepad";
101 default: 101 default:
102 return "Unknown"; 102 return "Unknown";
@@ -129,7 +129,7 @@ _device_added(void *data, const Efl_Event *event)
129 Efl_Input_Device *pointer = event->info; 129 Efl_Input_Device *pointer = event->info;
130 Efl_Input_Device *seat; 130 Efl_Input_Device *seat;
131 131
132 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_CLASS_MOUSE) 132 if (efl_input_device_type_get(pointer) != EFL_INPUT_DEVICE_TYPE_MOUSE)
133 return; 133 return;
134 seat = efl_input_device_seat_get(pointer); 134 seat = efl_input_device_seat_get(pointer);
135 if (!seat) 135 if (!seat)
@@ -191,10 +191,10 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
191 { 191 {
192 switch (efl_input_device_type_get(dev)) 192 switch (efl_input_device_type_get(dev))
193 { 193 {
194 case EFL_INPUT_DEVICE_CLASS_SEAT: 194 case EFL_INPUT_DEVICE_TYPE_SEAT:
195 _seat_children_print(dev); 195 _seat_children_print(dev);
196 break; 196 break;
197 case EFL_INPUT_DEVICE_CLASS_MOUSE: 197 case EFL_INPUT_DEVICE_TYPE_MOUSE:
198 _cursor_set(ee, dev); 198 _cursor_set(ee, dev);
199 break; 199 break;
200 default: break; 200 default: break;
diff --git a/src/examples/ecore/ecore_evas_vnc_example.c b/src/examples/ecore/ecore_evas_vnc_example.c
index b8489c9b48..1f91bc999c 100644
--- a/src/examples/ecore/ecore_evas_vnc_example.c
+++ b/src/examples/ecore/ecore_evas_vnc_example.c
@@ -134,25 +134,25 @@ _mouse_wheel(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
134} 134}
135 135
136static const char * 136static const char *
137_device_type_to_string(Efl_Input_Device_Class klass) 137_device_type_to_string(Efl_Input_Device_Type klass)
138{ 138{
139 switch (klass) 139 switch (klass)
140 { 140 {
141 case EFL_INPUT_DEVICE_CLASS_NONE: 141 case EFL_INPUT_DEVICE_TYPE_NONE:
142 return "None"; 142 return "None";
143 case EFL_INPUT_DEVICE_CLASS_SEAT: 143 case EFL_INPUT_DEVICE_TYPE_SEAT:
144 return "Seat"; 144 return "Seat";
145 case EFL_INPUT_DEVICE_CLASS_KEYBOARD: 145 case EFL_INPUT_DEVICE_TYPE_KEYBOARD:
146 return "Keyboard"; 146 return "Keyboard";
147 case EFL_INPUT_DEVICE_CLASS_MOUSE: 147 case EFL_INPUT_DEVICE_TYPE_MOUSE:
148 return "Mouse"; 148 return "Mouse";
149 case EFL_INPUT_DEVICE_CLASS_TOUCH: 149 case EFL_INPUT_DEVICE_TYPE_TOUCH:
150 return "Touch"; 150 return "Touch";
151 case EFL_INPUT_DEVICE_CLASS_PEN: 151 case EFL_INPUT_DEVICE_TYPE_PEN:
152 return "Pen"; 152 return "Pen";
153 case EFL_INPUT_DEVICE_CLASS_WAND: 153 case EFL_INPUT_DEVICE_TYPE_WAND:
154 return "Wand"; 154 return "Wand";
155 case EFL_INPUT_DEVICE_CLASS_GAMEPAD: 155 case EFL_INPUT_DEVICE_TYPE_GAMEPAD:
156 return "Gamepad"; 156 return "Gamepad";
157 default: 157 default:
158 return "Unknown"; 158 return "Unknown";
@@ -190,7 +190,7 @@ _dev_added_or_removed(void *data EINA_UNUSED, const Efl_Event *event)
190 efl_comment_get(dev), 190 efl_comment_get(dev),
191 event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED ? "added" : "removed"); 191 event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED ? "added" : "removed");
192 192
193 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_CLASS_SEAT) 193 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_TYPE_SEAT)
194 _seat_children_print(dev); 194 _seat_children_print(dev);
195} 195}
196 196
@@ -300,7 +300,7 @@ main(int argc, char *argv[])
300 mouse_wheel = ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, 300 mouse_wheel = ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL,
301 _mouse_wheel, NULL); 301 _mouse_wheel, NULL);
302 302
303 _seat_children_print(evas_canvas_default_device_get(evas, EFL_INPUT_DEVICE_CLASS_SEAT)); 303 _seat_children_print(evas_canvas_default_device_get(evas, EFL_INPUT_DEVICE_TYPE_SEAT));
304 efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_ADDED, 304 efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_ADDED,
305 _dev_added_or_removed, NULL); 305 _dev_added_or_removed, NULL);
306 efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_REMOVED, 306 efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_REMOVED,
diff --git a/src/examples/ecore/ecore_evas_wayland_multiseat_example.c b/src/examples/ecore/ecore_evas_wayland_multiseat_example.c
index 1ca70e12eb..5b21a88e39 100644
--- a/src/examples/ecore/ecore_evas_wayland_multiseat_example.c
+++ b/src/examples/ecore/ecore_evas_wayland_multiseat_example.c
@@ -72,25 +72,25 @@ _mouse_wheel(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
72} 72}
73 73
74static const char * 74static const char *
75_device_type_to_string(Efl_Input_Device_Class klass) 75_device_type_to_string(Efl_Input_Device_Type klass)
76{ 76{
77 switch (klass) 77 switch (klass)
78 { 78 {
79 case EFL_INPUT_DEVICE_CLASS_NONE: 79 case EFL_INPUT_DEVICE_TYPE_NONE:
80 return "None"; 80 return "None";
81 case EFL_INPUT_DEVICE_CLASS_SEAT: 81 case EFL_INPUT_DEVICE_TYPE_SEAT:
82 return "Seat"; 82 return "Seat";
83 case EFL_INPUT_DEVICE_CLASS_KEYBOARD: 83 case EFL_INPUT_DEVICE_TYPE_KEYBOARD:
84 return "Keyboard"; 84 return "Keyboard";
85 case EFL_INPUT_DEVICE_CLASS_MOUSE: 85 case EFL_INPUT_DEVICE_TYPE_MOUSE:
86 return "Mouse"; 86 return "Mouse";
87 case EFL_INPUT_DEVICE_CLASS_TOUCH: 87 case EFL_INPUT_DEVICE_TYPE_TOUCH:
88 return "Touch"; 88 return "Touch";
89 case EFL_INPUT_DEVICE_CLASS_PEN: 89 case EFL_INPUT_DEVICE_TYPE_PEN:
90 return "Pen"; 90 return "Pen";
91 case EFL_INPUT_DEVICE_CLASS_WAND: 91 case EFL_INPUT_DEVICE_TYPE_WAND:
92 return "Wand"; 92 return "Wand";
93 case EFL_INPUT_DEVICE_CLASS_GAMEPAD: 93 case EFL_INPUT_DEVICE_TYPE_GAMEPAD:
94 return "Gamepad"; 94 return "Gamepad";
95 default: 95 default:
96 return "Unknown"; 96 return "Unknown";
diff --git a/src/examples/edje/edje-multiseat-custom-names.c b/src/examples/edje/edje-multiseat-custom-names.c
index c74f28f299..ce1342bbb2 100644
--- a/src/examples/edje/edje-multiseat-custom-names.c
+++ b/src/examples/edje/edje-multiseat-custom-names.c
@@ -67,7 +67,7 @@ _device_added(void *data EINA_UNUSED, const Efl_Event *event)
67{ 67{
68 Efl_Input_Device *dev = event->info; 68 Efl_Input_Device *dev = event->info;
69 69
70 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_CLASS_SEAT) 70 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_TYPE_SEAT)
71 return; 71 return;
72 _device_rename(dev); 72 _device_rename(dev);
73} 73}
@@ -120,7 +120,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
120 devices = evas_device_list(evas, NULL); 120 devices = evas_device_list(evas, NULL);
121 EINA_LIST_FOREACH(devices, l, dev) 121 EINA_LIST_FOREACH(devices, l, dev)
122 { 122 {
123 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_CLASS_SEAT) 123 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_TYPE_SEAT)
124 _device_rename(dev); 124 _device_rename(dev);
125 } 125 }
126 efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_ADDED, 126 efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_ADDED,
diff --git a/src/examples/edje/edje-multiseat-filter.c b/src/examples/edje/edje-multiseat-filter.c
index 43ae82818f..5cf59d69b2 100644
--- a/src/examples/edje/edje-multiseat-filter.c
+++ b/src/examples/edje/edje-multiseat-filter.c
@@ -61,7 +61,7 @@ _device_added(void *data, const Efl_Event *event)
61 Efl_Input_Device *dev = event->info; 61 Efl_Input_Device *dev = event->info;
62 Evas_Object *edje_obj = data; 62 Evas_Object *edje_obj = data;
63 63
64 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_CLASS_SEAT) 64 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_TYPE_SEAT)
65 return; 65 return;
66 66
67 efl_canvas_object_seat_focus_add(edje_obj, dev); 67 efl_canvas_object_seat_focus_add(edje_obj, dev);
@@ -104,7 +104,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
104 devices = evas_device_list(evas, NULL); 104 devices = evas_device_list(evas, NULL);
105 EINA_LIST_FOREACH(devices, l, dev) 105 EINA_LIST_FOREACH(devices, l, dev)
106 { 106 {
107 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_CLASS_SEAT) 107 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_TYPE_SEAT)
108 efl_canvas_object_seat_focus_add(edje_obj, dev); 108 efl_canvas_object_seat_focus_add(edje_obj, dev);
109 109
110 } 110 }
diff --git a/src/examples/edje/edje-multiseat.c b/src/examples/edje/edje-multiseat.c
index 4ab499c7c4..e2caa60f15 100644
--- a/src/examples/edje/edje-multiseat.c
+++ b/src/examples/edje/edje-multiseat.c
@@ -183,7 +183,7 @@ _device_added(void *data, const Efl_Event *event)
183 Efl_Input_Device *dev = event->info; 183 Efl_Input_Device *dev = event->info;
184 Evas_Object *edje_obj = data; 184 Evas_Object *edje_obj = data;
185 185
186 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_CLASS_SEAT) 186 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_TYPE_SEAT)
187 return; 187 return;
188 188
189 efl_canvas_object_seat_focus_add(edje_obj, dev); 189 efl_canvas_object_seat_focus_add(edje_obj, dev);
@@ -251,7 +251,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
251 devices = evas_device_list(evas, NULL); 251 devices = evas_device_list(evas, NULL);
252 EINA_LIST_FOREACH(devices, l, dev) 252 EINA_LIST_FOREACH(devices, l, dev)
253 { 253 {
254 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_CLASS_SEAT) 254 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_TYPE_SEAT)
255 efl_canvas_object_seat_focus_add(edje_obj, dev); 255 efl_canvas_object_seat_focus_add(edje_obj, dev);
256 256
257 } 257 }
diff --git a/src/examples/evas/evas-event-filter.c b/src/examples/evas/evas-event-filter.c
index 090a2c17c8..6ab515ec1f 100644
--- a/src/examples/evas/evas-event-filter.c
+++ b/src/examples/evas/evas-event-filter.c
@@ -63,7 +63,7 @@ _allowed_seat_get(Evas_Object *filtered_obj,
63 devs = evas_device_list(evas_object_evas_get(filtered_obj), NULL); 63 devs = evas_device_list(evas_object_evas_get(filtered_obj), NULL);
64 EINA_LIST_FOREACH(devs, l, seat) 64 EINA_LIST_FOREACH(devs, l, seat)
65 { 65 {
66 if ((efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_CLASS_SEAT) || 66 if ((efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_TYPE_SEAT) ||
67 (*allowed_seat == seat)) 67 (*allowed_seat == seat))
68 continue; 68 continue;
69 if (!allowed_seat_changed) 69 if (!allowed_seat_changed)
@@ -162,7 +162,7 @@ _device_added_removed_cb(void *data, const Efl_Event *event)
162 Efl_Input_Device *dev = event->info; 162 Efl_Input_Device *dev = event->info;
163 Context *ctx = data; 163 Context *ctx = data;
164 164
165 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_CLASS_SEAT) 165 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_TYPE_SEAT)
166 return; 166 return;
167 167
168 if (event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED) 168 if (event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED)
diff --git a/src/examples/evas/evas-multiseat-events.c b/src/examples/evas/evas-multiseat-events.c
index 422c4690b4..24d76f182c 100644
--- a/src/examples/evas/evas-multiseat-events.c
+++ b/src/examples/evas/evas-multiseat-events.c
@@ -206,7 +206,7 @@ _dev_added_or_removed(void *data EINA_UNUSED, const Efl_Event *event)
206{ 206{
207 Efl_Input_Device *dev = event->info; 207 Efl_Input_Device *dev = event->info;
208 208
209 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_CLASS_SEAT) 209 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_TYPE_SEAT)
210 return; 210 return;
211 211
212 printf("The seat '%s' - description: '%s' was '%s'\n", 212 printf("The seat '%s' - description: '%s' was '%s'\n",
@@ -281,7 +281,7 @@ main(void)
281 devices = evas_device_list(canvas, NULL); 281 devices = evas_device_list(canvas, NULL);
282 EINA_LIST_FOREACH(devices, l, dev) 282 EINA_LIST_FOREACH(devices, l, dev)
283 { 283 {
284 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_CLASS_SEAT) 284 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_TYPE_SEAT)
285 printf("The seat '%s' - description: '%s' was 'added'\n", 285 printf("The seat '%s' - description: '%s' was 'added'\n",
286 efl_name_get(dev), 286 efl_name_get(dev),
287 efl_comment_get(dev)); 287 efl_comment_get(dev));
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}
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index 113a75e897..d215a7f40e 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -4567,7 +4567,7 @@ _edje_entry_imf_default_focused_rp_get(Edje *ed)
4567 Evas *e; 4567 Evas *e;
4568 4568
4569 e = evas_object_evas_get(ed->obj); 4569 e = evas_object_evas_get(ed->obj);
4570 seat = evas_canvas_default_device_get(e, EFL_INPUT_DEVICE_CLASS_SEAT); 4570 seat = evas_canvas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_SEAT);
4571 seat_name = _edje_seat_name_get(ed, seat); 4571 seat_name = _edje_seat_name_get(ed, seat);
4572 4572
4573 return _edje_focused_part_get(ed, seat_name); 4573 return _edje_focused_part_get(ed, seat_name);
diff --git a/src/lib/edje/edje_load.c b/src/lib/edje/edje_load.c
index 26ce5912e5..03689c0f4e 100644
--- a/src/lib/edje/edje_load.c
+++ b/src/lib/edje/edje_load.c
@@ -633,7 +633,7 @@ _edje_device_added_cb(void *data, const Efl_Event *event)
633 Efl_Input_Device *dev = event->info; 633 Efl_Input_Device *dev = event->info;
634 Edje *ed = data; 634 Edje *ed = data;
635 635
636 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_CLASS_SEAT) 636 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_TYPE_SEAT)
637 return; 637 return;
638 638
639 _edje_device_add(ed, dev); 639 _edje_device_add(ed, dev);
@@ -648,7 +648,7 @@ _edje_device_removed_cb(void *data, const Efl_Event *event)
648 char sig[256]; 648 char sig[256];
649 Eina_List *l; 649 Eina_List *l;
650 650
651 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_CLASS_SEAT) 651 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_TYPE_SEAT)
652 return; 652 return;
653 653
654 EINA_LIST_FOREACH(ed->seats, l, s) 654 EINA_LIST_FOREACH(ed->seats, l, s)
@@ -677,7 +677,7 @@ _edje_device_changed_cb(void *data, const Efl_Event *event)
677 char sig[256]; 677 char sig[256];
678 Eina_List *l; 678 Eina_List *l;
679 679
680 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_CLASS_SEAT) 680 if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_TYPE_SEAT)
681 return; 681 return;
682 682
683 EINA_LIST_FOREACH(ed->seats, l, s) 683 EINA_LIST_FOREACH(ed->seats, l, s)
@@ -744,7 +744,7 @@ _edje_devices_add(Edje *ed, Evas *tev)
744 devices = evas_device_list(tev, NULL); 744 devices = evas_device_list(tev, NULL);
745 EINA_LIST_FOREACH(devices, l, dev) 745 EINA_LIST_FOREACH(devices, l, dev)
746 { 746 {
747 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_CLASS_SEAT) 747 if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_TYPE_SEAT)
748 _edje_device_add(ed, dev); 748 _edje_device_add(ed, dev);
749 } 749 }
750 750
diff --git a/src/lib/edje/edje_program.c b/src/lib/edje/edje_program.c
index 2889ed1607..28b9300ccf 100644
--- a/src/lib/edje/edje_program.c
+++ b/src/lib/edje/edje_program.c
@@ -656,7 +656,7 @@ _edje_part_focus_set(Edje *ed, const char *seat_name, Edje_Real_Part *rp)
656 else /* Use default seat name */ 656 else /* Use default seat name */
657 { 657 {
658 e = evas_object_evas_get(ed->obj); 658 e = evas_object_evas_get(ed->obj);
659 seat = evas_canvas_default_device_get(e, EFL_INPUT_DEVICE_CLASS_SEAT); 659 seat = evas_canvas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_SEAT);
660 sname = eina_stringshare_ref(_edje_seat_name_get(ed, seat)); 660 sname = eina_stringshare_ref(_edje_seat_name_get(ed, seat));
661 } 661 }
662 662
@@ -1044,7 +1044,7 @@ low_mem_current:
1044 Evas *e; 1044 Evas *e;
1045 1045
1046 e = evas_object_evas_get(ed->obj); 1046 e = evas_object_evas_get(ed->obj);
1047 seat = evas_canvas_default_device_get(e, EFL_INPUT_DEVICE_CLASS_SEAT); 1047 seat = evas_canvas_default_device_get(e, EFL_INPUT_DEVICE_TYPE_SEAT);
1048 } 1048 }
1049 if (!pr->targets) 1049 if (!pr->targets)
1050 { 1050 {
diff --git a/src/lib/efl/interfaces/efl_common_internal.h b/src/lib/efl/interfaces/efl_common_internal.h
index 77d0c3b5c7..cacb21a252 100644
--- a/src/lib/efl/interfaces/efl_common_internal.h
+++ b/src/lib/efl/interfaces/efl_common_internal.h
@@ -93,9 +93,9 @@ struct _Efl_Input_Device_Data
93 Efl_Input_Device *source; /* ref */ 93 Efl_Input_Device *source; /* ref */
94 Eina_List *children; /* ref'ed by efl_parent, not by this list */ 94 Eina_List *children; /* ref'ed by efl_parent, not by this list */
95 unsigned int id; 95 unsigned int id;
96 Efl_Input_Device_Class klass; 96 Efl_Input_Device_Type klass;
97 Efl_Input_Device_Sub_Class subclass; 97 unsigned int subclass; // Evas_Device_Subclass (unused)
98 unsigned int pointer_count; 98 unsigned int pointer_count;
99}; 99};
100 100
101struct _Efl_Input_Hold_Data 101struct _Efl_Input_Hold_Data
diff --git a/src/lib/efl/interfaces/efl_input_device.c b/src/lib/efl/interfaces/efl_input_device.c
index 51a8aa1e42..667a13fe2d 100644
--- a/src/lib/efl/interfaces/efl_input_device.c
+++ b/src/lib/efl/interfaces/efl_input_device.c
@@ -24,10 +24,10 @@ struct _Child_Device_Iterator
24static Eina_Bool 24static Eina_Bool
25_is_pointer(Efl_Input_Device_Data *pd) 25_is_pointer(Efl_Input_Device_Data *pd)
26{ 26{
27 return (pd->klass == EFL_INPUT_DEVICE_CLASS_MOUSE || 27 return (pd->klass == EFL_INPUT_DEVICE_TYPE_MOUSE ||
28 pd->klass == EFL_INPUT_DEVICE_CLASS_TOUCH || 28 pd->klass == EFL_INPUT_DEVICE_TYPE_TOUCH ||
29 pd->klass == EFL_INPUT_DEVICE_CLASS_PEN || 29 pd->klass == EFL_INPUT_DEVICE_TYPE_PEN ||
30 pd->klass == EFL_INPUT_DEVICE_CLASS_WAND); 30 pd->klass == EFL_INPUT_DEVICE_TYPE_WAND);
31} 31}
32 32
33static void 33static void
@@ -49,7 +49,7 @@ EOLIAN static void
49_efl_input_device_efl_object_destructor(Eo *obj, Efl_Input_Device_Data *pd) 49_efl_input_device_efl_object_destructor(Eo *obj, Efl_Input_Device_Data *pd)
50{ 50{
51 pd->children = eina_list_free(pd->children); 51 pd->children = eina_list_free(pd->children);
52 if (pd->klass != EFL_INPUT_DEVICE_CLASS_SEAT) 52 if (pd->klass != EFL_INPUT_DEVICE_TYPE_SEAT)
53 { 53 {
54 Efl_Input_Device_Data *p; 54 Efl_Input_Device_Data *p;
55 Eo *seat; 55 Eo *seat;
@@ -73,7 +73,7 @@ _efl_input_device_efl_object_parent_set(Eo *obj, Efl_Input_Device_Data *pd EINA_
73 if (efl_isa(parent, MY_CLASS)) 73 if (efl_isa(parent, MY_CLASS))
74 { 74 {
75 p = efl_data_scope_get(parent, MY_CLASS); 75 p = efl_data_scope_get(parent, MY_CLASS);
76 EINA_SAFETY_ON_FALSE_RETURN(p->klass == EFL_INPUT_DEVICE_CLASS_SEAT); 76 EINA_SAFETY_ON_FALSE_RETURN(p->klass == EFL_INPUT_DEVICE_TYPE_SEAT);
77 if (!eina_list_data_find(p->children, obj)) 77 if (!eina_list_data_find(p->children, obj))
78 { 78 {
79 p->children = eina_list_append(p->children, obj); 79 p->children = eina_list_append(p->children, obj);
@@ -102,36 +102,24 @@ _efl_input_device_efl_object_parent_set(Eo *obj, Efl_Input_Device_Data *pd EINA_
102} 102}
103 103
104EOLIAN static void 104EOLIAN static void
105_efl_input_device_device_type_set(Eo *obj, Efl_Input_Device_Data *pd, Efl_Input_Device_Class klass) 105_efl_input_device_device_type_set(Eo *obj, Efl_Input_Device_Data *pd, Efl_Input_Device_Type klass)
106{ 106{
107 EINA_SAFETY_ON_TRUE_RETURN(pd->klass); 107 EINA_SAFETY_ON_TRUE_RETURN(pd->klass);
108 pd->klass = klass; 108 pd->klass = klass;
109 if (klass != EFL_INPUT_DEVICE_CLASS_SEAT) 109 if (klass != EFL_INPUT_DEVICE_TYPE_SEAT)
110 { 110 {
111 Efl_Input_Device_Data *seat = efl_data_scope_get(efl_input_device_seat_get(obj), MY_CLASS); 111 Efl_Input_Device_Data *seat = efl_data_scope_get(efl_input_device_seat_get(obj), MY_CLASS);
112 _seat_pointers_update(seat, pd); 112 _seat_pointers_update(seat, pd);
113 } 113 }
114} 114}
115 115
116EOLIAN static Efl_Input_Device_Class 116EOLIAN static Efl_Input_Device_Type
117_efl_input_device_device_type_get(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd) 117_efl_input_device_device_type_get(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd)
118{ 118{
119 return pd->klass; 119 return pd->klass;
120} 120}
121 121
122EOLIAN static void 122EOLIAN static void
123_efl_input_device_device_subtype_set(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd, Efl_Input_Device_Sub_Class klass)
124{
125 pd->subclass = klass;
126}
127
128EOLIAN static Efl_Input_Device_Sub_Class
129_efl_input_device_device_subtype_get(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd)
130{
131 return pd->subclass;
132}
133
134EOLIAN static void
135_efl_input_device_source_set(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd, Efl_Input_Device *src) 123_efl_input_device_source_set(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd, Efl_Input_Device *src)
136{ 124{
137 if (pd->source == src) return; 125 if (pd->source == src) return;
@@ -148,14 +136,14 @@ _efl_input_device_source_get(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd)
148EOLIAN static void 136EOLIAN static void
149_efl_input_device_seat_id_set(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd, unsigned int id) 137_efl_input_device_seat_id_set(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd, unsigned int id)
150{ 138{
151 EINA_SAFETY_ON_TRUE_RETURN(pd->klass != EFL_INPUT_DEVICE_CLASS_SEAT); 139 EINA_SAFETY_ON_TRUE_RETURN(pd->klass != EFL_INPUT_DEVICE_TYPE_SEAT);
152 pd->id = id; 140 pd->id = id;
153} 141}
154 142
155EOLIAN static unsigned int 143EOLIAN static unsigned int
156_efl_input_device_seat_id_get(Eo *obj, Efl_Input_Device_Data *pd) 144_efl_input_device_seat_id_get(Eo *obj, Efl_Input_Device_Data *pd)
157{ 145{
158 if (pd->klass == EFL_INPUT_DEVICE_CLASS_SEAT) 146 if (pd->klass == EFL_INPUT_DEVICE_TYPE_SEAT)
159 return pd->id; 147 return pd->id;
160 return efl_input_device_seat_id_get(efl_input_device_seat_get(obj)); 148 return efl_input_device_seat_id_get(efl_input_device_seat_get(obj));
161} 149}
@@ -165,7 +153,7 @@ _efl_input_device_seat_get(Eo *obj, Efl_Input_Device_Data *pd)
165{ 153{
166 for (; obj; obj = efl_parent_get(obj)) 154 for (; obj; obj = efl_parent_get(obj))
167 { 155 {
168 if (pd->klass == EFL_INPUT_DEVICE_CLASS_SEAT) 156 if (pd->klass == EFL_INPUT_DEVICE_TYPE_SEAT)
169 return pd->eo; 157 return pd->eo;
170 158
171 if (!efl_isa(obj, MY_CLASS)) break; 159 if (!efl_isa(obj, MY_CLASS)) break;
@@ -224,7 +212,7 @@ _efl_input_device_children_iterate(Eo *obj, Efl_Input_Device_Data *pd)
224EOLIAN static unsigned int 212EOLIAN static unsigned int
225_efl_input_device_has_pointer_caps(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd) 213_efl_input_device_has_pointer_caps(Eo *obj EINA_UNUSED, Efl_Input_Device_Data *pd)
226{ 214{
227 if (pd->klass == EFL_INPUT_DEVICE_CLASS_SEAT) 215 if (pd->klass == EFL_INPUT_DEVICE_TYPE_SEAT)
228 return pd->pointer_count; 216 return pd->pointer_count;
229 return _is_pointer(pd); 217 return _is_pointer(pd);
230} 218}
diff --git a/src/lib/efl/interfaces/efl_input_device.eo b/src/lib/efl/interfaces/efl_input_device.eo
index 1338d34f3b..465d2a537c 100644
--- a/src/lib/efl/interfaces/efl_input_device.eo
+++ b/src/lib/efl/interfaces/efl_input_device.eo
@@ -1,10 +1,8 @@
1enum Efl.Input.Device.Class 1enum Efl.Input.Device.Type
2{ 2{
3 [[General type of input device. 3 [[General type of input device.
4 4
5 Legacy support since 1.8. 5 Legacy support since 1.8 as $Evas_Device_Class.
6
7 @since 1.18
8 ]] 6 ]]
9 none, [[Not a device.]] 7 none, [[Not a device.]]
10 seat, [[The user/seat (the user themselves).]] 8 seat, [[The user/seat (the user themselves).]]
@@ -16,27 +14,6 @@ enum Efl.Input.Device.Class
16 gamepad, [[A gamepad controller or joystick.]] 14 gamepad, [[A gamepad controller or joystick.]]
17} 15}
18 16
19enum Efl.Input.Device.Sub_Class
20{
21 [[Specific type of input device.
22
23 Legacy support since 1.8.
24
25 @since 1.18
26 ]]
27 none, [[Not a device.]]
28 finger, [[The normal flat of your finger.]]
29 fingernail, [[A fingernail.]]
30 knuckle, [[A Knuckle.]]
31 palm, [[The palm of a users hand.]]
32 hand_size, [[The side of your hand.]]
33 hand_flat, [[The flat of your hand.]]
34 pen_tip, [[The tip of a pen.]]
35 trackpad, [[A trackpad style mouse.]]
36 trackpoint, [[A trackpoint style mouse.]]
37 trackball, [[A trackball style mouse.]]
38}
39
40/* TODO: Add canvas property. Current problem is we need to return 17/* TODO: Add canvas property. Current problem is we need to return
41 Efl.Ui.Win and not Evas: 18 Efl.Ui.Win and not Evas:
42 @property canvas { values { canvas: Efl.Canvas; } } 19 @property canvas { values { canvas: Efl.Canvas; } }
@@ -52,13 +29,7 @@ class Efl.Input.Device (Efl.Object)
52 @property device_type { 29 @property device_type {
53 [[Device type property]] 30 [[Device type property]]
54 values { 31 values {
55 klass: Efl.Input.Device.Class; [[Input device class]] 32 klass: Efl.Input.Device.Type; [[Input device class]]
56 }
57 }
58 @property device_subtype {
59 [[Device subtype property]]
60 values {
61 klass: Efl.Input.Device.Sub_Class; [[Input device sub-class]]
62 } 33 }
63 } 34 }
64 @property source { 35 @property source {
@@ -73,7 +44,7 @@ class Efl.Input.Device (Efl.Object)
73 This method will find the seat the device belongs to. 44 This method will find the seat the device belongs to.
74 45
75 For this, it walk through device's parents looking for a device 46 For this, it walk through device's parents looking for a device
76 with @Efl.Input.Device.Class.seat. It may be 47 with @Efl.Input.Device.Type.seat. It may be
77 the device itself. 48 the device itself.
78 49
79 In case no seat is found, $null is returned. 50 In case no seat is found, $null is returned.
diff --git a/src/lib/evas/Evas_Common.h b/src/lib/evas/Evas_Common.h
index dba40e5012..789e3f3242 100644
--- a/src/lib/evas/Evas_Common.h
+++ b/src/lib/evas/Evas_Common.h
@@ -294,31 +294,39 @@ typedef enum _Evas_Engine_Render_Mode
294 294
295typedef Efl_Gfx_Event_Render_Post Evas_Event_Render_Post; /**< Event info sent after a frame was rendered. @since 1.18 */ 295typedef Efl_Gfx_Event_Render_Post Evas_Event_Render_Post; /**< Event info sent after a frame was rendered. @since 1.18 */
296 296
297typedef Efl_Input_Device_Class Evas_Device_Class; 297typedef Efl_Input_Device_Type Evas_Device_Class;
298 298
299#define EVAS_DEVICE_CLASS_NONE EFL_INPUT_DEVICE_CLASS_NONE /**< Not a device @since 1.8 */ 299#define EVAS_DEVICE_CLASS_NONE EFL_INPUT_DEVICE_TYPE_NONE /**< Not a device @since 1.8 */
300#define EVAS_DEVICE_CLASS_SEAT EFL_INPUT_DEVICE_CLASS_SEAT /**< The user/seat (the user themselves) @since 1.8 */ 300#define EVAS_DEVICE_CLASS_SEAT EFL_INPUT_DEVICE_TYPE_SEAT /**< The user/seat (the user themselves) @since 1.8 */
301#define EVAS_DEVICE_CLASS_KEYBOARD EFL_INPUT_DEVICE_CLASS_KEYBOARD /**< A regular keyboard, numberpad or attached buttons @since 1.8 */ 301#define EVAS_DEVICE_CLASS_KEYBOARD EFL_INPUT_DEVICE_TYPE_KEYBOARD /**< A regular keyboard, numberpad or attached buttons @since 1.8 */
302#define EVAS_DEVICE_CLASS_MOUSE EFL_INPUT_DEVICE_CLASS_MOUSE /**< A mouse, trackball or touchpad relative motion device @since 1.8 */ 302#define EVAS_DEVICE_CLASS_MOUSE EFL_INPUT_DEVICE_TYPE_MOUSE /**< A mouse, trackball or touchpad relative motion device @since 1.8 */
303#define EVAS_DEVICE_CLASS_TOUCH EFL_INPUT_DEVICE_CLASS_TOUCH /**< A touchscreen with fingers or stylus @since 1.8 */ 303#define EVAS_DEVICE_CLASS_TOUCH EFL_INPUT_DEVICE_TYPE_TOUCH /**< A touchscreen with fingers or stylus @since 1.8 */
304#define EVAS_DEVICE_CLASS_PEN EFL_INPUT_DEVICE_CLASS_PEN /**< A special pen device @since 1.8 */ 304#define EVAS_DEVICE_CLASS_PEN EFL_INPUT_DEVICE_TYPE_PEN /**< A special pen device @since 1.8 */
305#define EVAS_DEVICE_CLASS_POINTER EFL_INPUT_DEVICE_CLASS_WAND /**< A laser pointer, wii-style or "minority report" pointing device @since 1.8 */ 305#define EVAS_DEVICE_CLASS_POINTER EFL_INPUT_DEVICE_TYPE_WAND /**< A laser pointer, wii-style or "minority report" pointing device @since 1.8 */
306#define EVAS_DEVICE_CLASS_WAND EFL_INPUT_DEVICE_CLASS_WAND /**< A synonym for EVAS_DEVICE_CLASS_POINTER @since 1.18 */ 306#define EVAS_DEVICE_CLASS_WAND EFL_INPUT_DEVICE_TYPE_WAND /**< A synonym for EVAS_DEVICE_CLASS_POINTER @since 1.18 */
307#define EVAS_DEVICE_CLASS_GAMEPAD EFL_INPUT_DEVICE_CLASS_GAMEPAD /**< A gamepad controller or joystick @since 1.8 */ 307#define EVAS_DEVICE_CLASS_GAMEPAD EFL_INPUT_DEVICE_TYPE_GAMEPAD /**< A gamepad controller or joystick @since 1.8 */
308 308
309typedef Efl_Input_Device_Sub_Class Evas_Device_Subclass; 309/**
310 310 * @brief Specific type of input device.
311#define EVAS_DEVICE_SUBCLASS_NONE EFL_INPUT_DEVICE_SUB_CLASS_NONE /**< Not a device @since 1.8 */ 311 *
312#define EVAS_DEVICE_SUBCLASS_FINGER EFL_INPUT_DEVICE_SUB_CLASS_FINGER /**< The normal flat of your finger @since 1.8 */ 312 * Note: Currently not used inside EFL.
313#define EVAS_DEVICE_SUBCLASS_FINGERNAIL EFL_INPUT_DEVICE_SUB_CLASS_FINGERNAIL /**< A fingernail @since 1.8 */ 313 *
314#define EVAS_DEVICE_SUBCLASS_KNUCKLE EFL_INPUT_DEVICE_SUB_CLASS_KNUCKLE /**< A Knuckle @since 1.8 */ 314 * @since 1.8
315#define EVAS_DEVICE_SUBCLASS_PALM EFL_INPUT_DEVICE_SUB_CLASS_PALM /**< The palm of a users hand @since 1.8 */ 315 */
316#define EVAS_DEVICE_SUBCLASS_HAND_SIZE EFL_INPUT_DEVICE_SUB_CLASS_HAND_SIZE /**< The side of your hand @since 1.8 */ 316typedef enum
317#define EVAS_DEVICE_SUBCLASS_HAND_FLAT EFL_INPUT_DEVICE_SUB_CLASS_HAND_FLAT /**< The flat of your hand @since 1.8 */ 317{
318#define EVAS_DEVICE_SUBCLASS_PEN_TIP EFL_INPUT_DEVICE_SUB_CLASS_PEN_TIP /**< The tip of a pen @since 1.8 */ 318 EVAS_DEVICE_SUBCLASS_NONE = 0, /**< Not a device. */
319#define EVAS_DEVICE_SUBCLASS_TRACKPAD EFL_INPUT_DEVICE_SUB_CLASS_TRACKPAD /**< A trackpad style mouse @since 1.8 */ 319 EVAS_DEVICE_SUBCLASS_FINGER, /**< The normal flat of your finger. */
320#define EVAS_DEVICE_SUBCLASS_TRACKPOINT EFL_INPUT_DEVICE_SUB_CLASS_TRACKPOINT /**< A trackpoint style mouse @since 1.8 */ 320 EVAS_DEVICE_SUBCLASS_FINGERNAIL, /**< A fingernail. */
321#define EVAS_DEVICE_SUBCLASS_TRACKBALL EFL_INPUT_DEVICE_SUB_CLASS_TRACKBALL /**< A trackball style mouse @since 1.8 */ 321 EVAS_DEVICE_SUBCLASS_KNUCKLE, /**< A Knuckle. */
322 EVAS_DEVICE_SUBCLASS_PALM, /**< The palm of a users hand. */
323 EVAS_DEVICE_SUBCLASS_HAND_SIZE, /**< The side of your hand. */
324 EVAS_DEVICE_SUBCLASS_HAND_FLAT, /**< The flat of your hand. */
325 EVAS_DEVICE_SUBCLASS_PEN_TIP, /**< The tip of a pen. */
326 EVAS_DEVICE_SUBCLASS_TRACKPAD, /**< A trackpad style mouse. */
327 EVAS_DEVICE_SUBCLASS_TRACKPOINT, /**< A trackpoint style mouse. */
328 EVAS_DEVICE_SUBCLASS_TRACKBALL /**< A trackball style mouse. */
329} Evas_Device_Subclass;
322 330
323typedef Efl_Pointer_Flags Evas_Button_Flags; 331typedef Efl_Pointer_Flags Evas_Button_Flags;
324 332
diff --git a/src/lib/evas/canvas/evas_canvas.eo b/src/lib/evas/canvas/evas_canvas.eo
index 9513bc7dd9..7eb70248f0 100644
--- a/src/lib/evas/canvas/evas_canvas.eo
+++ b/src/lib/evas/canvas/evas_canvas.eo
@@ -1123,7 +1123,7 @@ class Evas.Canvas (Efl.Object, Efl.Canvas, Efl.Animator, Efl.Input.Interface,
1123 ]] 1123 ]]
1124 get {} 1124 get {}
1125 keys { 1125 keys {
1126 type: Efl.Input.Device.Class; [[The class of the default device to fetch.]] 1126 type: Efl.Input.Device.Type; [[The class of the default device to fetch.]]
1127 } 1127 }
1128 values { 1128 values {
1129 seat: Efl.Input.Device; [[The default device or $null on error.]] 1129 seat: Efl.Input.Device; [[The default device or $null on error.]]
diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c
index fafd6a5d5b..19cd1feb61 100644
--- a/src/lib/evas/canvas/evas_device.c
+++ b/src/lib/evas/canvas/evas_device.c
@@ -167,12 +167,14 @@ evas_device_add_full(Evas *eo_e, const char *name, const char *desc,
167 efl_name_set(efl_added, name), 167 efl_name_set(efl_added, name),
168 efl_comment_set(efl_added, desc), 168 efl_comment_set(efl_added, desc),
169 efl_input_device_type_set(efl_added, clas), 169 efl_input_device_type_set(efl_added, clas),
170 efl_input_device_subtype_set(efl_added, sub_clas),
171 efl_input_device_source_set(efl_added, emulation_dev)); 170 efl_input_device_source_set(efl_added, emulation_dev));
172 171
173 d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS); 172 d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
174 d->evas = eo_e; 173 d->evas = eo_e;
175 174
175 // Legacy support, subclass is most likely unused
176 d->subclass = (unsigned) sub_clas;
177
176 e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS); 178 e = efl_data_scope_get(eo_e, EVAS_CANVAS_CLASS);
177 179
178 /* This is the case when the user is using wayland backend, 180 /* This is the case when the user is using wayland backend,
@@ -375,14 +377,17 @@ evas_device_subclass_set(Evas_Device *dev, Evas_Device_Subclass clas)
375 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS); 377 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS);
376 Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS); 378 Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
377 379
378 efl_input_device_subtype_set(dev, clas); 380 d->subclass = (unsigned) clas;
379 evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev); 381 evas_event_callback_call(d->evas, EVAS_CALLBACK_DEVICE_CHANGED, dev);
380} 382}
381 383
382EAPI Evas_Device_Subclass 384EAPI Evas_Device_Subclass
383evas_device_subclass_get(const Evas_Device *dev) 385evas_device_subclass_get(const Evas_Device *dev)
384{ 386{
385 return efl_input_device_subtype_get(dev); 387 SAFETY_CHECK(dev, EFL_INPUT_DEVICE_CLASS, EVAS_DEVICE_SUBCLASS_NONE);
388 Efl_Input_Device_Data *d = efl_data_scope_get(dev, EFL_INPUT_DEVICE_CLASS);
389
390 return (Evas_Device_Subclass) d->subclass;
386} 391}
387 392
388EAPI void 393EAPI void
diff --git a/src/lib/evas/canvas/evas_focus.c b/src/lib/evas/canvas/evas_focus.c
index 30afdaa08e..0b79bf958c 100644
--- a/src/lib/evas/canvas/evas_focus.c
+++ b/src/lib/evas/canvas/evas_focus.c
@@ -172,7 +172,7 @@ _efl_canvas_object_seat_focus_add(Eo *eo_obj,
172 event_id = _evas_event_counter; 172 event_id = _evas_event_counter;
173 if (!seat) seat = _default_seat_get(eo_obj); 173 if (!seat) seat = _default_seat_get(eo_obj);
174 174
175 if (seat && (efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_CLASS_SEAT)) 175 if (seat && (efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_TYPE_SEAT))
176 return EINA_FALSE; 176 return EINA_FALSE;
177 177
178 if (obj->layer && (!seat)) 178 if (obj->layer && (!seat))
diff --git a/src/lib/evas/canvas/evas_key.c b/src/lib/evas/canvas/evas_key.c
index 5a0856cd81..5a86a92ea7 100644
--- a/src/lib/evas/canvas/evas_key.c
+++ b/src/lib/evas/canvas/evas_key.c
@@ -201,7 +201,7 @@ _evas_canvas_seat_key_modifier_on(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e,
201 if (!seat) 201 if (!seat)
202 seat = e->default_seat; 202 seat = e->default_seat;
203 EINA_SAFETY_ON_NULL_RETURN(seat); 203 EINA_SAFETY_ON_NULL_RETURN(seat);
204 if (efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_CLASS_SEAT) return; 204 if (efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_TYPE_SEAT) return;
205 _mask_set(evas_key_modifier_number(&(e->modifiers), keyname), 205 _mask_set(evas_key_modifier_number(&(e->modifiers), keyname),
206 e->modifiers.masks, seat, EINA_TRUE); 206 e->modifiers.masks, seat, EINA_TRUE);
207} 207}
@@ -237,7 +237,7 @@ _evas_canvas_seat_key_lock_on(Eo *eo_e EINA_UNUSED, Evas_Public_Data *e,
237 if (!seat) 237 if (!seat)
238 seat = e->default_seat; 238 seat = e->default_seat;
239 EINA_SAFETY_ON_NULL_RETURN(seat); 239 EINA_SAFETY_ON_NULL_RETURN(seat);
240 if (efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_CLASS_SEAT) return; 240 if (efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_TYPE_SEAT) return;
241 _mask_set(evas_key_lock_number(&(e->locks), keyname), e->locks.masks, 241 _mask_set(evas_key_lock_number(&(e->locks), keyname), e->locks.masks,
242 seat, EINA_TRUE); 242 seat, EINA_TRUE);
243} 243}
diff --git a/src/lib/evas/canvas/evas_main.c b/src/lib/evas/canvas/evas_main.c
index 7f8b2b8501..964b8ccbb3 100644
--- a/src/lib/evas/canvas/evas_main.c
+++ b/src/lib/evas/canvas/evas_main.c
@@ -478,13 +478,13 @@ _evas_canvas_coord_world_y_to_screen(const Eo *eo_e EINA_UNUSED, Evas_Public_Dat
478EOLIAN static Efl_Input_Device * 478EOLIAN static Efl_Input_Device *
479_evas_canvas_default_device_get(Eo *eo_e EINA_UNUSED, 479_evas_canvas_default_device_get(Eo *eo_e EINA_UNUSED,
480 Evas_Public_Data *e, 480 Evas_Public_Data *e,
481 Efl_Input_Device_Class klass) 481 Efl_Input_Device_Type klass)
482{ 482{
483 if (klass == EFL_INPUT_DEVICE_CLASS_SEAT) 483 if (klass == EFL_INPUT_DEVICE_TYPE_SEAT)
484 return e->default_seat; 484 return e->default_seat;
485 if (klass == EFL_INPUT_DEVICE_CLASS_MOUSE) 485 if (klass == EFL_INPUT_DEVICE_TYPE_MOUSE)
486 return e->default_mouse; 486 return e->default_mouse;
487 if (klass == EFL_INPUT_DEVICE_CLASS_KEYBOARD) 487 if (klass == EFL_INPUT_DEVICE_TYPE_KEYBOARD)
488 return e->default_keyboard; 488 return e->default_keyboard;
489 return NULL; 489 return NULL;
490} 490}
@@ -655,7 +655,7 @@ _evas_canvas_seat_focus_in(Eo *eo_e, Evas_Public_Data *e,
655 Efl_Input_Device *seat) 655 Efl_Input_Device *seat)
656{ 656{
657 if (!seat) seat = e->default_seat; 657 if (!seat) seat = e->default_seat;
658 if (!seat || efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_CLASS_SEAT) return; 658 if (!seat || efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_TYPE_SEAT) return;
659 _evas_canvas_focus_inout_dispatch(eo_e, seat, EINA_TRUE); 659 _evas_canvas_focus_inout_dispatch(eo_e, seat, EINA_TRUE);
660} 660}
661 661
@@ -664,7 +664,7 @@ _evas_canvas_seat_focus_out(Eo *eo_e, Evas_Public_Data *e,
664 Efl_Input_Device *seat) 664 Efl_Input_Device *seat)
665{ 665{
666 if (!seat) seat = e->default_seat; 666 if (!seat) seat = e->default_seat;
667 if (!seat || efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_CLASS_SEAT) return; 667 if (!seat || efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_TYPE_SEAT) return;
668 _evas_canvas_focus_inout_dispatch(eo_e, seat, EINA_FALSE); 668 _evas_canvas_focus_inout_dispatch(eo_e, seat, EINA_FALSE);
669} 669}
670 670
diff --git a/src/lib/evas/canvas/evas_object_main.c b/src/lib/evas/canvas/evas_object_main.c
index da13fb144f..9a5ccddfc4 100644
--- a/src/lib/evas/canvas/evas_object_main.c
+++ b/src/lib/evas/canvas/evas_object_main.c
@@ -911,7 +911,7 @@ _efl_canvas_object_efl_input_interface_seat_event_filter_set(Eo *eo_obj,
911{ 911{
912 EINA_SAFETY_ON_NULL_RETURN(seat); 912 EINA_SAFETY_ON_NULL_RETURN(seat);
913 913
914 if (efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_CLASS_SEAT) return; 914 if (efl_input_device_type_get(seat) != EFL_INPUT_DEVICE_TYPE_SEAT) return;
915 915
916 obj->events_filter_enabled = EINA_TRUE; 916 obj->events_filter_enabled = EINA_TRUE;
917 if (add) 917 if (add)
@@ -928,7 +928,7 @@ _efl_canvas_object_efl_input_interface_seat_event_filter_set(Eo *eo_obj,
928 EINA_LIST_FOREACH(devices, l, dev) 928 EINA_LIST_FOREACH(devices, l, dev)
929 { 929 {
930 if ((efl_input_device_type_get(dev) == 930 if ((efl_input_device_type_get(dev) ==
931 EFL_INPUT_DEVICE_CLASS_SEAT) && (dev != seat)) 931 EFL_INPUT_DEVICE_TYPE_SEAT) && (dev != seat))
932 efl_canvas_object_seat_focus_del(eo_obj, dev); 932 efl_canvas_object_seat_focus_del(eo_obj, dev);
933 } 933 }
934 } 934 }
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 ed9710d160..929dd94447 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 a5ffd469e8..d3ea2954d1 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 03954e4ee0..ae402876ad 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 0cc28a8ac8..2cdc1b58f2 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 de97101369..6f7b8a07b1 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);