enlightenment
/
examples
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Efl.Canvas.Scene (from Efl.Canvas) 

Ref https://phab.enlightenment.org/T6847

Reviewed-by: Cedric Bail <cedric@osg.samsung.com>
This commit is contained in:
Xavi Artigas 2018-03-26 15:21:21 +02:00 committed by Cedric Bail
parent bd5a732370
commit 9793a51e1e
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unsorted/ecore/ecore_evas_cursor_example.c
View File

@ -202,7 +202,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
}
t = ecore_timer_add(TIMEOUT, _mouse_pos_print, ee);
efl_event_callback_add(e, EFL_CANVAS_EVENT_DEVICE_ADDED,
efl_event_callback_add(e, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
_device_added, ee);
ecore_evas_callback_resize_set(ee, _resize_cb);
ecore_evas_callback_delete_request_set(ee, _delete_request_cb);

6
unsorted/ecore/ecore_evas_vnc_example.c
View File

@ -188,7 +188,7 @@ _dev_added_or_removed(void *data EINA_UNUSED, const Efl_Event *event)
efl_name_get(dev),
_device_type_to_string(efl_input_device_type_get(dev)),
efl_comment_get(dev),
event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED ? "added" : "removed");
event->desc == EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED ? "added" : "removed");
if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_TYPE_SEAT)
_seat_children_print(dev);
@ -301,9 +301,9 @@ main(int argc, char *argv[])
_mouse_wheel, NULL);
_seat_children_print(evas_default_device_get(evas, EFL_INPUT_DEVICE_TYPE_SEAT));
efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_ADDED,
efl_event_callback_add(evas, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
_dev_added_or_removed, NULL);
efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_REMOVED,
efl_event_callback_add(evas, EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED,
_dev_added_or_removed, NULL);
ecore_main_loop_begin();

14
unsorted/ecore/ecore_evas_wayland_multiseat_example.c
View File

@ -106,7 +106,7 @@ _dev_added_or_removed(void *data, const Efl_Event *event)
dev, efl_name_get(dev),
_device_type_to_string(efl_input_device_type_get(dev)),
efl_comment_get(dev),
event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED ? "added" : "removed",
event->desc == EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED ? "added" : "removed",
data);
}
@ -197,18 +197,18 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
mouse_wheel = ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL,
_mouse_wheel, NULL);
efl_event_callback_add(evas1, EFL_CANVAS_EVENT_DEVICE_ADDED,
efl_event_callback_add(evas1, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
_dev_added_or_removed, ee1);
efl_event_callback_add(evas1, EFL_CANVAS_EVENT_DEVICE_REMOVED,
efl_event_callback_add(evas1, EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED,
_dev_added_or_removed, ee1);
efl_event_callback_add(evas1, EFL_CANVAS_EVENT_DEVICE_CHANGED,
efl_event_callback_add(evas1, EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED,
_dev_changed, ee1);
efl_event_callback_add(evas2, EFL_CANVAS_EVENT_DEVICE_ADDED,
efl_event_callback_add(evas2, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
_dev_added_or_removed, ee2);
efl_event_callback_add(evas2, EFL_CANVAS_EVENT_DEVICE_REMOVED,
efl_event_callback_add(evas2, EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED,
_dev_added_or_removed, ee2);
efl_event_callback_add(evas2, EFL_CANVAS_EVENT_DEVICE_CHANGED,
efl_event_callback_add(evas2, EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED,
_dev_changed, ee2);
ecore_main_loop_begin();

4
unsorted/edje/edje-multiseat-custom-names.c
View File

@ -123,9 +123,9 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
if (efl_input_device_type_get(dev) == EFL_INPUT_DEVICE_TYPE_SEAT)
_device_rename(dev);
}
efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_ADDED,
efl_event_callback_add(evas, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
_device_added, NULL);
efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_CHANGED,
efl_event_callback_add(evas, EFL_CANVAS_SCENE_EVENT_DEVICE_CHANGED,
_device_changed, NULL);
printf("Running example on evas engine %s\n",

2
unsorted/edje/edje-multiseat-filter.c
View File

@ -108,7 +108,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
efl_canvas_object_seat_focus_add(edje_obj, dev);
}
efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_ADDED,
efl_event_callback_add(evas, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
_device_added, edje_obj);
ecore_evas_show(ee);

2
unsorted/edje/edje-multiseat.c
View File

@ -255,7 +255,7 @@ main(int argc EINA_UNUSED, char *argv[] EINA_UNUSED)
efl_canvas_object_seat_focus_add(edje_obj, dev);
}
efl_event_callback_add(evas, EFL_CANVAS_EVENT_DEVICE_ADDED,
efl_event_callback_add(evas, EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
_device_added, edje_obj);
evas_object_event_callback_add(edje_obj, EVAS_CALLBACK_KEY_DOWN,
_on_key_down, evas);

6
unsorted/evas/evas-event-filter.c
View File

@ -165,7 +165,7 @@ _device_added_removed_cb(void *data, const Efl_Event *event)
if (efl_input_device_type_get(dev) != EFL_INPUT_DEVICE_TYPE_SEAT)
return;
if (event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED)
if (event->desc == EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED)
{
if (ctx->allowed_seat)
efl_input_seat_event_filter_set(ctx->filtered_obj,
@ -180,8 +180,8 @@ _device_added_removed_cb(void *data, const Efl_Event *event)
}
EFL_CALLBACKS_ARRAY_DEFINE(_device_callbacks,
{ EFL_CANVAS_EVENT_DEVICE_ADDED, _device_added_removed_cb },
{ EFL_CANVAS_EVENT_DEVICE_REMOVED, _device_added_removed_cb });
{ EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED, _device_added_removed_cb },
{ EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED, _device_added_removed_cb });
EFL_CALLBACKS_ARRAY_DEFINE(_obj_callbacks,
{ EFL_EVENT_FOCUS_IN, _obj_events_cb },

8
unsorted/evas/evas-multiseat-events.c
View File

@ -212,15 +212,15 @@ _dev_added_or_removed(void *data EINA_UNUSED, const Efl_Event *event)
printf("The seat '%s' - description: '%s' was '%s'\n",
efl_name_get(dev),
efl_comment_get(dev),
event->desc == EFL_CANVAS_EVENT_DEVICE_ADDED ? "added" : "removed");
event->desc == EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED ? "added" : "removed");
}
EFL_CALLBACKS_ARRAY_DEFINE(canvas_callbacks,
{ EFL_CANVAS_EVENT_OBJECT_FOCUS_IN,
{ EFL_CANVAS_SCENE_EVENT_OBJECT_FOCUS_IN,
_canvas_focus_in_cb },
{ EFL_CANVAS_EVENT_DEVICE_ADDED,
{ EFL_CANVAS_SCENE_EVENT_DEVICE_ADDED,
_dev_added_or_removed },
{ EFL_CANVAS_EVENT_DEVICE_REMOVED,
{ EFL_CANVAS_SCENE_EVENT_DEVICE_REMOVED,
_dev_added_or_removed });
EFL_CALLBACKS_ARRAY_DEFINE(callbacks,