summaryrefslogtreecommitdiff
path: root/src/lib/evas/canvas/evas_device.c
diff options
context:
space:
mode:
authorXavi Artigas <xavierartigas@yahoo.es>2018-03-26 15:21:21 +0200
committerCedric Bail <cedric@osg.samsung.com>2018-04-24 09:03:23 -0700
commit65ee277a6674dcad9c938b8b0ac9b56520105fc4 (patch)
tree1ed89932d2279c2f237bef50f733adef0fc51a0b /src/lib/evas/canvas/evas_device.c
parentf6fc78119b3309fbd22f6a2b115caaf30b98169a (diff)
Efl.Canvas.Scene (from Efl.Canvas)
Ref https://phab.enlightenment.org/T6847 Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
Diffstat (limited to 'src/lib/evas/canvas/evas_device.c')
-rw-r--r--src/lib/evas/canvas/evas_device.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/lib/evas/canvas/evas_device.c b/src/lib/evas/canvas/evas_device.c
index 23eb01d..e67350d 100644
--- a/src/lib/evas/canvas/evas_device.c
+++ b/src/lib/evas/canvas/evas_device.c
@@ -111,12 +111,12 @@ _del_cb(void *data, const Efl_Event *ev)
111 _evas_pointer_data_remove(e, ev->object); 111 _evas_pointer_data_remove(e, ev->object);
112 eina_hash_del_by_key(e->locks.masks, &ev->object); 112 eina_hash_del_by_key(e->locks.masks, &ev->object);
113 eina_hash_del_by_key(e->modifiers.masks, &ev->object); 113 eina_hash_del_by_key(e->modifiers.masks, &ev->object);
114 efl_event_callback_call(e->evas, EFL_CANVAS_EVENT_DEVICE_REMOVED, 114 efl_event_callback_call(e->evas, EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED,
115 ev->object); 115 ev->object);
116} 116}
117 117
118EOLIAN Efl_Input_Device * 118EOLIAN Efl_Input_Device *
119_evas_canvas_efl_canvas_device_get(Evas *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *name) 119_evas_canvas_efl_canvas_scene_device_get(Evas *eo_e EINA_UNUSED, Evas_Public_Data *e, const char *name)
120{ 120{
121 const char *dev_name; 121 const char *dev_name;
122 Evas_Device *dev; 122 Evas_Device *dev;
@@ -138,11 +138,11 @@ _evas_canvas_efl_canvas_device_get(Evas *eo_e EINA_UNUSED, Evas_Public_Data *e,
138EAPI Evas_Device * 138EAPI Evas_Device *
139evas_device_get(Evas *eo_e, const char *name) 139evas_device_get(Evas *eo_e, const char *name)
140{ 140{
141 return efl_canvas_device_get(eo_e, name); 141 return efl_canvas_scene_device_get(eo_e, name);
142} 142}
143 143
144EOLIAN Efl_Input_Device * 144EOLIAN Efl_Input_Device *
145_evas_canvas_efl_canvas_seat_get(Evas *eo_e EINA_UNUSED, Evas_Public_Data *e, unsigned int id) 145_evas_canvas_efl_canvas_scene_seat_get(Evas *eo_e EINA_UNUSED, Evas_Public_Data *e, unsigned int id)
146{ 146{
147 Evas_Device *dev; 147 Evas_Device *dev;
148 Eina_List *l; 148 Eina_List *l;
@@ -162,7 +162,7 @@ _evas_canvas_efl_canvas_seat_get(Evas *eo_e EINA_UNUSED, Evas_Public_Data *e, un
162EAPI Evas_Device * 162EAPI Evas_Device *
163evas_device_get_by_seat_id(Evas *eo_e, unsigned int id) 163evas_device_get_by_seat_id(Evas *eo_e, unsigned int id)
164{ 164{
165 return efl_canvas_seat_get(eo_e, id); 165 return efl_canvas_scene_seat_get(eo_e, id);
166} 166}
167 167
168EAPI Evas_Device * 168EAPI Evas_Device *
@@ -247,7 +247,7 @@ evas_device_add_full(Evas *eo_e, const char *name, const char *desc,
247 e->devices = eina_list_append(e->devices, dev); 247 e->devices = eina_list_append(e->devices, dev);
248 efl_event_callback_add(dev, EFL_EVENT_DEL, _del_cb, e); 248 efl_event_callback_add(dev, EFL_EVENT_DEL, _del_cb, e);
249 249
250 efl_event_callback_call(eo_e, EFL_CANVAS_EVENT_DEVICE_ADDED, dev); 250 efl_event_callback_call(eo_e, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED, dev);
251 // Keeping this event to do not break things... 251 // Keeping this event to do not break things...
252 evas_event_callback_call(eo_e, EVAS_CALLBACK_DEVICE_CHANGED, dev); 252 evas_event_callback_call(eo_e, EVAS_CALLBACK_DEVICE_CHANGED, dev);
253 if (e->pending_default_focus_obj && (e->default_seat == dev)) 253 if (e->pending_default_focus_obj && (e->default_seat == dev))
@@ -500,7 +500,7 @@ again:
500 */ 500 */
501 EINA_LIST_FREE(e->devices, dev) 501 EINA_LIST_FREE(e->devices, dev)
502 { 502 {
503 efl_event_callback_call(e->evas, EFL_CANVAS_EVENT_DEVICE_REMOVED, dev); 503 efl_event_callback_call(e->evas, EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED, dev);
504 efl_event_callback_del(dev, EFL_EVENT_DEL, _del_cb, e); 504 efl_event_callback_del(dev, EFL_EVENT_DEL, _del_cb, e);
505 } 505 }
506} 506}