From 35bbedc96f158885bf36c741ec402a97a02f52f0 Mon Sep 17 00:00:00 2001 From: Xavi Artigas Date: Fri, 11 May 2018 17:20:40 +0200 Subject: [PATCH] efl: Add missing event types Summary: All events must have a type now, otherwise bindings don't know how to handle the event_info field. Most of the missing event types were actually "void" (no event_info present). Some struct definitions had to be moved to eo instead of h files, so they are available to bindings. Some have not, and are marked with FIXME. Some namespaces have been fixed (like Efl_Event_Cb -> Efl.Event_Cb). In general, there are hundreds of changed files, but mostly to add a type which was not present before, so there's no harm done. Also, A lot of FIXMEs have been added which should be, like, fixed. For example, some events can send different types of event_info, which is very inconvenient (and error prone). Test Plan: make with c# bindings works, make check and make examples work too. Reviewers: cedric, q66, lauromoura Subscribers: zmike Tags: #efl Differential Revision: https://phab.enlightenment.org/D6169 --- src/bindings/mono/eo_mono/workaround.cs | 7 -- src/lib/ecore/efl_app.eo | 12 ++-- src/lib/ecore/efl_io_buffered_stream.eo | 10 +-- src/lib/ecore/efl_io_copier.eo | 4 +- src/lib/ecore/efl_loop.eo | 14 ++-- src/lib/ecore/efl_loop_fd.eo | 6 +- src/lib/ecore/efl_loop_handler.eo | 10 +-- src/lib/ecore/efl_loop_timer.eo | 2 +- .../ecore/efl_model_composite_selection.eo | 6 +- src/lib/ecore_audio/ecore_audio_in.eo | 6 +- src/lib/ecore_audio/ecore_audio_out_pulse.eo | 4 +- src/lib/ecore_audio/ecore_audio_out_wasapi.eo | 8 ++- .../ecore_con/efl_net_control_access_point.eo | 2 +- src/lib/ecore_con/efl_net_control_manager.eo | 8 +-- .../ecore_con/efl_net_control_technology.eo | 2 +- src/lib/ecore_con/efl_net_dialer.eo | 3 +- src/lib/ecore_con/efl_net_dialer_http.eo | 2 +- src/lib/ecore_con/efl_net_server.eo | 2 +- src/lib/ecore_con/efl_net_session.eo | 2 +- src/lib/ecore_con/efl_net_socket_ssl.eo | 2 +- src/lib/ector/ector_buffer.eo | 2 +- src/lib/edje/efl_layout_calc.eo | 5 +- src/lib/efl/Efl_Model_Common.h | 23 ------ src/lib/efl/interfaces/efl_canvas_scene.eo | 6 +- src/lib/efl/interfaces/efl_gfx_entity.eo | 8 +-- src/lib/efl/interfaces/efl_gfx_image.eo | 8 +-- .../efl_gfx_image_load_controller.eo | 9 +-- src/lib/efl/interfaces/efl_gfx_size_hint.eo | 2 +- src/lib/efl/interfaces/efl_gfx_stack.eo | 2 +- src/lib/efl/interfaces/efl_io_buffer.eo | 6 +- src/lib/efl/interfaces/efl_io_closer.eo | 2 +- src/lib/efl/interfaces/efl_io_positioner.eo | 2 +- src/lib/efl/interfaces/efl_io_queue.eo | 2 +- src/lib/efl/interfaces/efl_io_reader.eo | 4 +- src/lib/efl/interfaces/efl_io_sizer.eo | 2 +- src/lib/efl/interfaces/efl_io_writer.eo | 2 +- src/lib/efl/interfaces/efl_model.eo | 15 +++- src/lib/efl/interfaces/efl_pack.eo | 2 +- src/lib/efl/interfaces/efl_ui_clickable.eo | 20 +++--- src/lib/efl/interfaces/efl_ui_draggable.eo | 17 ++--- src/lib/efl/interfaces/efl_ui_scrollable.eo | 30 ++++---- src/lib/efl/interfaces/efl_ui_scrollbar.eo | 14 ++-- src/lib/efl/interfaces/efl_ui_selectable.eo | 18 ++--- src/lib/efl/interfaces/efl_ui_zoom.eo | 6 +- src/lib/eldbus/eldbus_model_method.eo | 2 +- src/lib/elementary/efl_access_object.eo | 13 ++-- src/lib/elementary/efl_access_selection.eo | 2 +- src/lib/elementary/efl_access_text.eo | 14 ++-- src/lib/elementary/efl_access_window.eo | 14 ++-- src/lib/elementary/efl_selection.eo | 2 +- src/lib/elementary/efl_text_interactive.eo | 2 +- src/lib/elementary/efl_ui_calendar.eo | 2 +- src/lib/elementary/efl_ui_clock.eo | 2 +- src/lib/elementary/efl_ui_datepicker.eo | 2 +- src/lib/elementary/efl_ui_dnd.eo | 13 ++-- src/lib/elementary/efl_ui_flip.eo | 4 +- src/lib/elementary/efl_ui_focus_manager.eo | 4 +- src/lib/elementary/efl_ui_image.eo | 2 +- src/lib/elementary/efl_ui_image_zoomable.eo | 22 +++--- .../elementary/efl_ui_image_zoomable_pan.eo | 2 + src/lib/elementary/efl_ui_layout_object.eo | 2 +- src/lib/elementary/efl_ui_model_state.eo | 2 + src/lib/elementary/efl_ui_nstate.eo | 2 +- src/lib/elementary/efl_ui_pan.eo | 6 +- src/lib/elementary/efl_ui_panes.eo | 4 +- src/lib/elementary/efl_ui_popup.eo | 4 +- src/lib/elementary/efl_ui_progressbar.eo | 2 +- src/lib/elementary/efl_ui_slider.eo | 8 +-- src/lib/elementary/efl_ui_spin.eo | 6 +- src/lib/elementary/efl_ui_spin_button.eo | 2 +- src/lib/elementary/efl_ui_stack.eo | 8 +-- src/lib/elementary/efl_ui_tags.eo | 18 ++--- src/lib/elementary/efl_ui_text.eo | 41 ++++++----- src/lib/elementary/efl_ui_timepicker.eo | 2 +- src/lib/elementary/efl_ui_view_list_pan.eo | 6 +- src/lib/elementary/efl_ui_widget.eo | 6 +- src/lib/elementary/efl_ui_win.eo | 36 +++++----- src/lib/elementary/elm_actionslider.eo | 2 +- src/lib/elementary/elm_atspi_bridge.eo | 4 +- src/lib/elementary/elm_box.eo | 4 +- src/lib/elementary/elm_calendar.eo | 4 +- src/lib/elementary/elm_clock.eo | 2 +- src/lib/elementary/elm_code_widget.eo | 45 ++++++------ src/lib/elementary/elm_colorselector.eo | 8 +-- src/lib/elementary/elm_combobox.eo | 12 ++-- src/lib/elementary/elm_conformant.eo | 8 +-- src/lib/elementary/elm_ctxpopup.eo | 2 +- src/lib/elementary/elm_dayselector.eo | 2 + src/lib/elementary/elm_entry.eo | 43 ++++++------ src/lib/elementary/elm_fileselector.eo | 9 +-- src/lib/elementary/elm_fileselector_button.eo | 3 +- src/lib/elementary/elm_fileselector_entry.eo | 9 +-- src/lib/elementary/elm_flipselector.eo | 4 +- src/lib/elementary/elm_general.eot | 10 ++- src/lib/elementary/elm_gengrid.eo | 32 ++++----- src/lib/elementary/elm_genlist.eo | 70 +++++++++---------- src/lib/elementary/elm_genlist_pan.eo | 2 + src/lib/elementary/elm_glview.eo | 12 ++-- src/lib/elementary/elm_hover.eo | 4 +- src/lib/elementary/elm_hoversel.eo | 8 +-- src/lib/elementary/elm_icon.eo | 4 +- src/lib/elementary/elm_index.eo | 8 +-- .../elementary/elm_interface_scrollable.eo | 2 +- src/lib/elementary/elm_label.eo | 2 +- src/lib/elementary/elm_list.eo | 22 +++--- src/lib/elementary/elm_map.eo | 28 ++++---- src/lib/elementary/elm_map_pan.eo | 2 + src/lib/elementary/elm_menu.eo | 7 +- src/lib/elementary/elm_multibuttonentry.eo | 17 ++--- src/lib/elementary/elm_naviframe.eo | 8 +-- src/lib/elementary/elm_notify.eo | 6 +- src/lib/elementary/elm_pan.eo | 2 +- src/lib/elementary/elm_panel.eo | 2 +- src/lib/elementary/elm_player.eo | 22 +++--- src/lib/elementary/elm_plug.eo | 4 +- src/lib/elementary/elm_popup.eo | 10 +-- src/lib/elementary/elm_prefs.eo | 12 ++-- src/lib/elementary/elm_scroller.eo | 30 ++++---- src/lib/elementary/elm_segment_control.eo | 2 +- src/lib/elementary/elm_slideshow.eo | 4 +- src/lib/elementary/elm_spinner.eo | 13 ++-- src/lib/elementary/elm_thumb.eo | 10 +-- src/lib/elementary/elm_toolbar.eo | 4 +- src/lib/elementary/elm_view_list.eo | 2 +- src/lib/elementary/elm_web.eo | 2 + src/lib/emotion/efl_canvas_video.eo | 36 +++++----- src/lib/eo/efl_object.eo | 8 +-- src/lib/eo/eina_types.eot | 6 +- .../canvas/efl_canvas_animation_player.eo | 8 ++- src/lib/evas/canvas/efl_canvas_text.eo | 6 +- src/lib/evas/canvas/evas_box.eo | 4 +- src/lib/evas/canvas/evas_canvas3d_object.eo | 5 +- .../gesture/efl_canvas_gesture_long_tap.eo | 2 +- .../evas/gesture/efl_canvas_gesture_tap.eo | 2 +- src/tests/eolian_cxx/generic.eo | 8 +-- 135 files changed, 616 insertions(+), 569 deletions(-) diff --git a/src/bindings/mono/eo_mono/workaround.cs b/src/bindings/mono/eo_mono/workaround.cs index cf95b71002..925e437908 100644 --- a/src/bindings/mono/eo_mono/workaround.cs +++ b/src/bindings/mono/eo_mono/workaround.cs @@ -106,10 +106,6 @@ public struct Description { public delegate void Event_Cb(System.IntPtr data, ref Event evt); #pragma warning disable 0169 -public struct Callback_Array_Item { - IntPtr desc; - IntPtr func; -}; public struct Dbg_Info { IntPtr name; IntPtr value; @@ -480,9 +476,6 @@ public struct Elm_Atspi_Action IntPtr func; } -// Some places stil use the non-namespaced Efl_Event_Cb -public delegate void Efl_Event_Cb(System.IntPtr data, ref efl.Event evt); - [StructLayout(LayoutKind.Sequential)] public struct Tm { int tm_sec; diff --git a/src/lib/ecore/efl_app.eo b/src/lib/ecore/efl_app.eo index ee8e63acdc..d5ef77d44d 100644 --- a/src/lib/ecore/efl_app.eo +++ b/src/lib/ecore/efl_app.eo @@ -34,12 +34,12 @@ class Efl.App (Efl.Loop) } } events { - pause; [[Called when the application is not going be displayed or otherwise used by a user for some time]] - resume; [[Called before a window is rendered after a pause event]] - terminate; [[Called before starting the shutdown of the application]] - signal,usr1; [[System specific, but on unix maps to SIGUSR1 signal to the process - only called on main loop object]] - signal,usr2; [[System specific, but on unix maps to SIGUSR2 signal to the process - only called on main loop object]] - signal,hup; [[System specific, but on unix maps to SIGHUP signal to the process - only called on main loop object]] + pause: void; [[Called when the application is not going be displayed or otherwise used by a user for some time]] + resume: void; [[Called before a window is rendered after a pause event]] + terminate: void; [[Called before starting the shutdown of the application]] + signal,usr1: void; [[System specific, but on unix maps to SIGUSR1 signal to the process - only called on main loop object]] + signal,usr2: void; [[System specific, but on unix maps to SIGUSR2 signal to the process - only called on main loop object]] + signal,hup: void; [[System specific, but on unix maps to SIGHUP signal to the process - only called on main loop object]] } implements { Efl.Object.constructor; diff --git a/src/lib/ecore/efl_io_buffered_stream.eo b/src/lib/ecore/efl_io_buffered_stream.eo index 973de1849e..2285b37f2c 100644 --- a/src/lib/ecore/efl_io_buffered_stream.eo +++ b/src/lib/ecore/efl_io_buffered_stream.eo @@ -236,12 +236,12 @@ class Efl.Io.Buffered_Stream (Efl.Loop_Consumer, Efl.Io.Reader, Efl.Io.Writer, E } events { - write,finished; [[@.eos_mark was called and all available data was sent to destination]] - read,finished; [[Same as @Efl.Io.Reader "eos", for consistency.]] - finished; [[Both read and write are finished.]] + write,finished: void; [[@.eos_mark was called and all available data was sent to destination]] + read,finished: void; [[Same as @Efl.Io.Reader "eos", for consistency.]] + finished: void; [[Both read and write are finished.]] error: Eina.Error; [[An error has occurred and I/O has stopped]] - progress; [[Property @.progress changed]] - slice,changed; [[The read-slice returned by @.slice may have changed.]] + progress: void; [[Property @.progress changed]] + slice,changed: void; [[The read-slice returned by @.slice may have changed.]] line: ptr(const(Eina.Slice)); [[If @.line_delimiter is set, will be emitted with current line. The memory is only valid during event callback dispatched and should not be modified. Note that the line slice may not be inside @.slice.]] } diff --git a/src/lib/ecore/efl_io_copier.eo b/src/lib/ecore/efl_io_copier.eo index ae40851681..37918d05c5 100644 --- a/src/lib/ecore/efl_io_copier.eo +++ b/src/lib/ecore/efl_io_copier.eo @@ -361,9 +361,9 @@ class Efl.Io.Copier (Efl.Loop_Consumer, Efl.Io.Closer) { } events { - done; [[All available data was copied from source to destination]] + done: void; [[All available data was copied from source to destination]] error: Eina.Error; [[An error happened and the copy stopped]] - progress; [[Total size changed or Data was read/written]] + progress: void; [[Total size changed or Data was read/written]] data: ptr(const(Eina.Slice)); [[When data is read to internal buffer, it's emitted in this event. The memory is only valid during event callback dispatched and should not be modified.]] line: ptr(const(Eina.Slice)); [[If @.line_delimiter is set, will be emitted with current line. The memory is only valid during event callback dispatched and should not be modified.]] } diff --git a/src/lib/ecore/efl_loop.eo b/src/lib/ecore/efl_loop.eo index f3f0139340..1aa21cd15f 100644 --- a/src/lib/ecore/efl_loop.eo +++ b/src/lib/ecore/efl_loop.eo @@ -111,14 +111,14 @@ class Efl.Loop (Efl.Task) } } events { - idle,enter @restart; [[Event occurs once the main loop enters the idle state.]] - idle,exit @restart; [[Event occurs once the main loop exits the idle state.]] - idle @restart; [[Event occurs once the main loop is idle. If you keep listening on this event it may increase the burden on your CPU.]] + idle,enter @restart: void; [[Event occurs once the main loop enters the idle state.]] + idle,exit @restart: void; [[Event occurs once the main loop exits the idle state.]] + idle @restart: void; [[Event occurs once the main loop is idle. If you keep listening on this event it may increase the burden on your CPU.]] arguments: Efl.Loop_Arguments; [[Event happens when args are provided to the loop by args_add().]] - poll,high; [[Event occurs multiple times per second. The exact tick is undefined and can be adjusted system wide.]] - poll,medium; [[Event occurs multiple times per minute. The exact tick is undefined and can be adjusted system wide.]] - poll,low; [[Event occurs multiple times every 15 minutes. The exact tick is undefined and can be adjusted system wide.]] - quit; [[Event occurs when the loop was requested to quit externally e.g. by a ctrl+c signal or a request from a parent loop/thread to have the child exit.]] + poll,high: void; [[Event occurs multiple times per second. The exact tick is undefined and can be adjusted system wide.]] + poll,medium: void; [[Event occurs multiple times per minute. The exact tick is undefined and can be adjusted system wide.]] + poll,low: void; [[Event occurs multiple times every 15 minutes. The exact tick is undefined and can be adjusted system wide.]] + quit: void; [[Event occurs when the loop was requested to quit externally e.g. by a ctrl+c signal or a request from a parent loop/thread to have the child exit.]] } implements { Efl.Object.constructor; diff --git a/src/lib/ecore/efl_loop_fd.eo b/src/lib/ecore/efl_loop_fd.eo index 34f893e1e6..3a40861e6f 100644 --- a/src/lib/ecore/efl_loop_fd.eo +++ b/src/lib/ecore/efl_loop_fd.eo @@ -32,9 +32,9 @@ class Efl.Loop_Fd (Efl.Loop_Consumer) } } events { - read; [[Called when a read happened on the file descriptor]] - write; [[Called when a write happened on the file descriptor]] - error; [[Called when a error occurred on the file descriptor]] + read: void; [[Called when a read happened on the file descriptor]] + write: void; [[Called when a write happened on the file descriptor]] + error: void; [[Called when a error occurred on the file descriptor]] } implements { Efl.Object.constructor; diff --git a/src/lib/ecore/efl_loop_handler.eo b/src/lib/ecore/efl_loop_handler.eo index 77259b0fea..e33610680f 100644 --- a/src/lib/ecore/efl_loop_handler.eo +++ b/src/lib/ecore/efl_loop_handler.eo @@ -54,11 +54,11 @@ class Efl.Loop_Handler (Efl.Object) } } events { - read; [[ Called when a read occurs on the descriptor. ]] - write; [[ Called when a write occurs on the descriptor. ]] - error; [[ Called when a error occurrs on the descriptor. ]] - buffer; [[ Called when buffered data already read from the descriptor should be processed. ]] - prepare; [[ Called when preparing a descriptor for listening. ]] + read: void; [[ Called when a read occurs on the descriptor. ]] + write: void; [[ Called when a write occurs on the descriptor. ]] + error: void; [[ Called when a error occurrs on the descriptor. ]] + buffer: void; [[ Called when buffered data already read from the descriptor should be processed. ]] + prepare: void; [[ Called when preparing a descriptor for listening. ]] } implements { diff --git a/src/lib/ecore/efl_loop_timer.eo b/src/lib/ecore/efl_loop_timer.eo index fcea276a11..2b5ce084f6 100644 --- a/src/lib/ecore/efl_loop_timer.eo +++ b/src/lib/ecore/efl_loop_timer.eo @@ -54,7 +54,7 @@ class Efl.Loop_Timer (Efl.Loop_Consumer) } } events { - tick; [[Event triggered when the specified time as passed.]] + tick: void; [[Event triggered when the specified time as passed.]] } implements { Efl.Object.constructor; diff --git a/src/lib/ecore/efl_model_composite_selection.eo b/src/lib/ecore/efl_model_composite_selection.eo index 20ef5e27eb..782a928a64 100644 --- a/src/lib/ecore/efl_model_composite_selection.eo +++ b/src/lib/ecore/efl_model_composite_selection.eo @@ -7,7 +7,9 @@ class Efl.Model_Composite_Selection (Efl.Model_Composite_Boolean) Efl.Model.property { get; set; } } events { - selected; - unselected; + /* FIXME: The object is emitted in the event_info. This is redundant. */ + selected: Efl.Object; + /* FIXME: The object is emitted in the event_info. This is redundant. */ + unselected: Efl.Object; } } diff --git a/src/lib/ecore_audio/ecore_audio_in.eo b/src/lib/ecore_audio/ecore_audio_in.eo index 6e3fbc0527..d46f99d64a 100644 --- a/src/lib/ecore_audio/ecore_audio_in.eo +++ b/src/lib/ecore_audio/ecore_audio_in.eo @@ -155,8 +155,8 @@ class Ecore.Audio.In (Ecore.Audio) Ecore.Audio.vio_set; } events { - in,looped; [[Called when an input has looped.]] - in,stopped; [[Called when an input has stopped playing.]] - in,samplerate,changed; [[Called when the input samplerate has changed.]] + in,looped: void; [[Called when an input has looped.]] + in,stopped: void; [[Called when an input has stopped playing.]] + in,samplerate,changed: void; [[Called when the input samplerate has changed.]] } } diff --git a/src/lib/ecore_audio/ecore_audio_out_pulse.eo b/src/lib/ecore_audio/ecore_audio_out_pulse.eo index d7a478f226..2e97f4ea08 100644 --- a/src/lib/ecore_audio/ecore_audio_out_pulse.eo +++ b/src/lib/ecore_audio/ecore_audio_out_pulse.eo @@ -11,7 +11,7 @@ class Ecore.Audio.Out.Pulse (Ecore.Audio.Out) Ecore.Audio.Out.input_detach; } events { - context,ready; [[Called when the output is ready for playback.]] - context,fail; [[Called when context fails.]] + context,ready: void; [[Called when the output is ready for playback.]] + context,fail: void; [[Called when context fails.]] } } diff --git a/src/lib/ecore_audio/ecore_audio_out_wasapi.eo b/src/lib/ecore_audio/ecore_audio_out_wasapi.eo index fd362f18c0..14c912753b 100644 --- a/src/lib/ecore_audio/ecore_audio_out_wasapi.eo +++ b/src/lib/ecore_audio/ecore_audio_out_wasapi.eo @@ -11,8 +11,10 @@ class Ecore.Audio.Out.Wasapi (Ecore.Audio.Out) Ecore.Audio.Out.input_detach; } events { - context,ready; [[Called when the output is ready for playback.]] - context,fail; [[Called when context fails.]] - stop; [[Called when need to stop.]] + /* FIXME: Make sure that this event is actually emitted */ + context,ready: void; [[Called when the output is ready for playback.]] + /* FIXME: Make sure that this event is actually emitted */ + context,fail: void; [[Called when context fails.]] + stop: void; [[Called when need to stop.]] } } diff --git a/src/lib/ecore_con/efl_net_control_access_point.eo b/src/lib/ecore_con/efl_net_control_access_point.eo index f97ba2ddd0..ec8cce7a1b 100644 --- a/src/lib/ecore_con/efl_net_control_access_point.eo +++ b/src/lib/ecore_con/efl_net_control_access_point.eo @@ -87,7 +87,7 @@ class Efl.Net.Control.Access_Point (Efl.Loop_Consumer) { ]] events { - changed; [[Called when some properties were changed.]] + changed: void; [[Called when some properties were changed.]] } methods { diff --git a/src/lib/ecore_con/efl_net_control_manager.eo b/src/lib/ecore_con/efl_net_control_manager.eo index d9ce75d4b1..3250c4be32 100644 --- a/src/lib/ecore_con/efl_net_control_manager.eo +++ b/src/lib/ecore_con/efl_net_control_manager.eo @@ -110,13 +110,13 @@ class Efl.Net.Control.Manager (Efl.Loop_Consumer) { events { access_point,add: Efl.Net.Control.Access_Point; [[The given access point has been added]] access_point,del: Efl.Net.Control.Access_Point; [[The given access point will be deleted]] - access_points,changed; [[Access points were added, deleted or reordered.]] + access_points,changed: void; [[Access points were added, deleted or reordered.]] technology,add: Efl.Net.Control.Technology; [[The given technology has been added]] technology,del: Efl.Net.Control.Technology; [[The given technology will be deleted]] - radios_offline,changed; [[Property @.radios_offline changed]] - state,changed; [[Property @.state changed]] + radios_offline,changed: void; [[Property @.radios_offline changed]] + state,changed: void; [[Property @.state changed]] - agent_released; [[Notifies we're not the agent anymore]] + agent_released: void; [[Notifies we're not the agent anymore]] agent_error: Efl.Net.Control.Agent_Error; [[Requires the error to be reported to the user]] agent_browser_url: Efl.Net.Control.Agent_Browser_Url; [[Requires the user to visit a web page]] agent_request_input: Efl.Net.Control.Agent_Request_Input; [[Requires the user to enter information in order to proceed, such as hidden SSID, passphrase, etc. After the user enters the information, reply by calling @.agent_reply]] diff --git a/src/lib/ecore_con/efl_net_control_technology.eo b/src/lib/ecore_con/efl_net_control_technology.eo index bbf7af81ea..04e0a4c783 100644 --- a/src/lib/ecore_con/efl_net_control_technology.eo +++ b/src/lib/ecore_con/efl_net_control_technology.eo @@ -28,7 +28,7 @@ class Efl.Net.Control.Technology (Efl.Loop_Consumer) { @since 1.19 ]] events { - changed; [[Called when some properties were changed.]] + changed: void; [[Called when some properties were changed.]] } methods { diff --git a/src/lib/ecore_con/efl_net_dialer.eo b/src/lib/ecore_con/efl_net_dialer.eo index 756643ed07..b1f2afe80c 100644 --- a/src/lib/ecore_con/efl_net_dialer.eo +++ b/src/lib/ecore_con/efl_net_dialer.eo @@ -111,6 +111,7 @@ interface Efl.Net.Dialer (Efl.Net.Socket) { } events { + /* FIXME: Might be NULL, but @nullable does not work on event types */ resolved: string; [[Notifies @.address_dial was resolved to @Efl.Net.Socket.address_remote. @@ -126,6 +127,6 @@ interface Efl.Net.Dialer (Efl.Net.Socket) { error: Eina.Error; [[Some error happened and the socket stopped working. ]] - connected; [[Notifies the socket is connected to the remote peer.]] + connected: void; [[Notifies the socket is connected to the remote peer.]] } } diff --git a/src/lib/ecore_con/efl_net_dialer_http.eo b/src/lib/ecore_con/efl_net_dialer_http.eo index 7aab27cefb..7a3f864338 100644 --- a/src/lib/ecore_con/efl_net_dialer_http.eo +++ b/src/lib/ecore_con/efl_net_dialer_http.eo @@ -388,7 +388,7 @@ class Efl.Net.Dialer_Http (Efl.Loop_Consumer, Efl.Net.Dialer, Efl.Io.Sizer) { } events { - headers,done; [[Notifies all headers were parsed and are available.]] + headers,done: void; [[Notifies all headers were parsed and are available.]] } implements { diff --git a/src/lib/ecore_con/efl_net_server.eo b/src/lib/ecore_con/efl_net_server.eo index f6d29c4066..8a84fdbaf3 100644 --- a/src/lib/ecore_con/efl_net_server.eo +++ b/src/lib/ecore_con/efl_net_server.eo @@ -29,7 +29,7 @@ interface Efl.Net.Server { error: Eina.Error; [[An error has occurred and the server needs to be stopped. ]] - serving; [[Notifies the server is ready to accept clients. + serving: void; [[Notifies the server is ready to accept clients. See property @.serving]] } diff --git a/src/lib/ecore_con/efl_net_session.eo b/src/lib/ecore_con/efl_net_session.eo index 96d4aa4cca..8bfd4497cd 100644 --- a/src/lib/ecore_con/efl_net_session.eo +++ b/src/lib/ecore_con/efl_net_session.eo @@ -51,7 +51,7 @@ class Efl.Net.Session (Efl.Loop_Consumer) { @since 1.19 ]] events { - changed; [[Called when some properties were changed.]] + changed: void; [[Called when some properties were changed.]] } methods { diff --git a/src/lib/ecore_con/efl_net_socket_ssl.eo b/src/lib/ecore_con/efl_net_socket_ssl.eo index 4f461814b3..c8e306630f 100644 --- a/src/lib/ecore_con/efl_net_socket_ssl.eo +++ b/src/lib/ecore_con/efl_net_socket_ssl.eo @@ -13,7 +13,7 @@ class Efl.Net.Socket_Ssl (Efl.Loop_Consumer, Efl.Net.Socket) { ]] events { - ssl,ready; [[Notifies the SSL handshake has been performed and the socket is now able to communicate]] + ssl,ready: void; [[Notifies the SSL handshake has been performed and the socket is now able to communicate]] ssl,error: Eina.Error; [[An error such as @Efl.Net.Socket_Ssl_Error.HANDSHAKE]] } diff --git a/src/lib/ector/ector_buffer.eo b/src/lib/ector/ector_buffer.eo index 58d5409f37..9d0aaf4040 100644 --- a/src/lib/ector/ector_buffer.eo +++ b/src/lib/ector/ector_buffer.eo @@ -92,6 +92,6 @@ mixin Ector.Buffer } } events { - detached; [[Emitted whenever the previously attached pixels are detached during pixels_set]] + detached: ptr(ubyte); [[Emitted whenever the previously attached pixels are detached during pixels_set]] } } diff --git a/src/lib/edje/efl_layout_calc.eo b/src/lib/edje/efl_layout_calc.eo index 77852fefff..018cd7e197 100644 --- a/src/lib/edje/efl_layout_calc.eo +++ b/src/lib/edje/efl_layout_calc.eo @@ -108,8 +108,9 @@ interface Efl.Layout.Calc } } events { - recalc; [[The layout was recalculated.]] - circular,dependency; [[A circular dependency between parts of the + recalc: void; [[The layout was recalculated.]] + /* FIXME: The actual type is list but the C# bindings do not support that yet */ + circular,dependency: void; [[A circular dependency between parts of the object was found.]] } } diff --git a/src/lib/efl/Efl_Model_Common.h b/src/lib/efl/Efl_Model_Common.h index 789ea36e38..8ed3858bbb 100644 --- a/src/lib/efl/Efl_Model_Common.h +++ b/src/lib/efl/Efl_Model_Common.h @@ -12,29 +12,6 @@ EAPI extern Eina_Error EFL_MODEL_ERROR_INCORRECT_VALUE; EAPI extern Eina_Error EFL_MODEL_ERROR_PERMISSION_DENIED; EAPI extern Eina_Error EFL_MODEL_ERROR_INVALID_OBJECT; /**< @since 1.19 */ -/** - * @struct _Efl_Model_Children_Event - * Every time a child id added the event - * EFL_MODEL_EVENT_CHILD_ADDED is dispatched - * passing along this structure. - */ -struct _Efl_Model_Children_Event -{ - /** - * index is a hint and is intended - * to provide a way for applications - * to control/know children relative - * positions through listings. - */ - unsigned int index; - /** - * If an object has been build for this index and - * is currently tracked by the parent, it wild be - * available here. - */ - Eo *child; -}; - /** * @struct Efl_Model_Children_Event */ diff --git a/src/lib/efl/interfaces/efl_canvas_scene.eo b/src/lib/efl/interfaces/efl_canvas_scene.eo index 979a9d8916..1e8703a3a8 100644 --- a/src/lib/efl/interfaces/efl_canvas_scene.eo +++ b/src/lib/efl/interfaces/efl_canvas_scene.eo @@ -1,4 +1,5 @@ import efl_input_device; +import efl_gfx_types; interface Efl.Canvas.Scene () { @@ -231,8 +232,9 @@ interface Efl.Canvas.Scene () focus,out: Efl.Input.Focus; [[Called when canvas lost focus]] object,focus,in: Efl.Input.Focus; [[Called when object got focus]] object,focus,out: Efl.Input.Focus; [[Called when object lost focus]] - render,pre; [[Called when pre render happens]] - render,post; [[Called when post render happens]] + render,pre: void; [[Called when pre render happens]] + /* FIXME: event_info can be NULL, but @nullable tag does not work on events yet */ + render,post: Efl.Gfx.Event.Render_Post; [[Called when post render happens]] device,changed: Efl.Input.Device; [[Called when input device changed]] device,added: Efl.Input.Device; [[Called when input device was added]] device,removed: Efl.Input.Device; [[Called when input device was removed]] diff --git a/src/lib/efl/interfaces/efl_gfx_entity.eo b/src/lib/efl/interfaces/efl_gfx_entity.eo index b304a3ed10..30131d6ba3 100644 --- a/src/lib/efl/interfaces/efl_gfx_entity.eo +++ b/src/lib/efl/interfaces/efl_gfx_entity.eo @@ -101,9 +101,9 @@ interface Efl.Gfx.Entity { } } events { - show; [[Object just became visible.]] - hide; [[Object just became invisible.]] - move; [[Object was moved, its position during the event is the new one.]] - resize; [[Object was resized, its size during the event is the new one.]] + show: void; [[Object just became visible.]] + hide: void; [[Object just became invisible.]] + move: void; [[Object was moved, its position during the event is the new one.]] + resize: void; [[Object was resized, its size during the event is the new one.]] } } diff --git a/src/lib/efl/interfaces/efl_gfx_image.eo b/src/lib/efl/interfaces/efl_gfx_image.eo index 6a0d10cdf1..1dd77f3058 100644 --- a/src/lib/efl/interfaces/efl_gfx_image.eo +++ b/src/lib/efl/interfaces/efl_gfx_image.eo @@ -204,9 +204,9 @@ interface Efl.Gfx.Image () } } events { - preload; [[Image data has been preloaded.]] - resize; [[Image was resized (its pixel data).]] - unload; [[Image data has been unloaded (by some mechanism in - EFL that threw out the original image data).]] + preload: void; [[Image data has been preloaded.]] + resize: void; [[Image was resized (its pixel data).]] + unload: void; [[Image data has been unloaded (by some mechanism in + EFL that threw out the original image data).]] } } diff --git a/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo b/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo index e05ddfc49c..89a065b442 100644 --- a/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo +++ b/src/lib/efl/interfaces/efl_gfx_image_load_controller.eo @@ -28,10 +28,8 @@ interface Efl.Gfx.Image_Load_Controller () load_async_cancel { [[Cancel preloading an image object's image data in the background. - The event $load,cancelled should be triggered soon after - cancellation occurs and the object should be left in a state - where it has no image data. If cancel is called too late, the image - will be kept in memory. + The object should be left in a state where it has no image data. + If cancel is called too late, the image will be kept in memory. ]] } /* @@ -181,8 +179,7 @@ interface Efl.Gfx.Image_Load_Controller () } } events { - load,done; [[Called when he image was loaded]] + load,done: void; [[Called when he image was loaded]] load,error: Efl.Gfx.Image_Load_Error; [[Called when an error happened during image loading]] - load,cancelled; [[Called when the image loading was cancelled]] } } diff --git a/src/lib/efl/interfaces/efl_gfx_size_hint.eo b/src/lib/efl/interfaces/efl_gfx_size_hint.eo index e7e659432b..3186d7b9ed 100644 --- a/src/lib/efl/interfaces/efl_gfx_size_hint.eo +++ b/src/lib/efl/interfaces/efl_gfx_size_hint.eo @@ -235,6 +235,6 @@ interface Efl.Gfx.Size_Hint } } events { - change,size,hints; [[Object size hints changed.]] + change,size,hints: void; [[Object size hints changed.]] } } diff --git a/src/lib/efl/interfaces/efl_gfx_stack.eo b/src/lib/efl/interfaces/efl_gfx_stack.eo index 0ef35adfc0..c122b48260 100644 --- a/src/lib/efl/interfaces/efl_gfx_stack.eo +++ b/src/lib/efl/interfaces/efl_gfx_stack.eo @@ -129,6 +129,6 @@ interface Efl.Gfx.Stack } } events { - restack; [[Object stacking was changed.]] + restack: void; [[Object stacking was changed.]] } } diff --git a/src/lib/efl/interfaces/efl_io_buffer.eo b/src/lib/efl/interfaces/efl_io_buffer.eo index 428d45aeaa..b7d90d6418 100644 --- a/src/lib/efl/interfaces/efl_io_buffer.eo +++ b/src/lib/efl/interfaces/efl_io_buffer.eo @@ -137,9 +137,9 @@ class Efl.Io.Buffer (Efl.Object, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer, Ef } events { - position_read,changed; [[Notifies @.position_read changed]] - position_write,changed; [[Notifies @.position_write changed]] - reallocated; [[Notifies the internal buffer was reallocated, thus whatever was returned by @.slice becomes invalid]] + position_read,changed: void; [[Notifies @.position_read changed]] + position_write,changed: void; [[Notifies @.position_write changed]] + reallocated: void; [[Notifies the internal buffer was reallocated, thus whatever was returned by @.slice becomes invalid]] } implements { diff --git a/src/lib/efl/interfaces/efl_io_closer.eo b/src/lib/efl/interfaces/efl_io_closer.eo index 863be86c31..b7a6684fb6 100644 --- a/src/lib/efl/interfaces/efl_io_closer.eo +++ b/src/lib/efl/interfaces/efl_io_closer.eo @@ -74,6 +74,6 @@ mixin Efl.Io.Closer { } events { - closed; [[Notifies closed, when property is marked as true]] + closed: void; [[Notifies closed, when property is marked as true]] } } diff --git a/src/lib/efl/interfaces/efl_io_positioner.eo b/src/lib/efl/interfaces/efl_io_positioner.eo index e958ad95aa..4b4033c670 100644 --- a/src/lib/efl/interfaces/efl_io_positioner.eo +++ b/src/lib/efl/interfaces/efl_io_positioner.eo @@ -39,6 +39,6 @@ mixin Efl.Io.Positioner { } events { - position,changed; [[Notifies position changed]] + position,changed: void; [[Notifies position changed]] } } diff --git a/src/lib/efl/interfaces/efl_io_queue.eo b/src/lib/efl/interfaces/efl_io_queue.eo index f89c683c3e..ae298273bd 100644 --- a/src/lib/efl/interfaces/efl_io_queue.eo +++ b/src/lib/efl/interfaces/efl_io_queue.eo @@ -102,7 +102,7 @@ class Efl.Io.Queue (Efl.Object, Efl.Io.Reader, Efl.Io.Writer, Efl.Io.Closer) { } events { - slice,changed; [[The read-slice returned by @.slice may have changed.]] + slice,changed: void; [[The read-slice returned by @.slice may have changed.]] } implements { diff --git a/src/lib/efl/interfaces/efl_io_reader.eo b/src/lib/efl/interfaces/efl_io_reader.eo index 6a6e5eae59..ccb3efe90f 100644 --- a/src/lib/efl/interfaces/efl_io_reader.eo +++ b/src/lib/efl/interfaces/efl_io_reader.eo @@ -55,7 +55,7 @@ interface Efl.Io.Reader { } events { - can_read,changed; [[Notifies can_read property changed. + can_read,changed: void; [[Notifies can_read property changed. If @.can_read is $true there is data to @.read without blocking/error. If @@ -66,7 +66,7 @@ interface Efl.Io.Reader { from inside @Efl.Io.Reader.read, thus before it returns. ]] - eos; [[Notifies end of stream, when property is marked as true. + eos: void; [[Notifies end of stream, when property is marked as true. If this is used alongside with an @Efl.Io.Closer, then it should be emitted before that call. diff --git a/src/lib/efl/interfaces/efl_io_sizer.eo b/src/lib/efl/interfaces/efl_io_sizer.eo index 64a14f99ec..a91cf665a1 100644 --- a/src/lib/efl/interfaces/efl_io_sizer.eo +++ b/src/lib/efl/interfaces/efl_io_sizer.eo @@ -34,6 +34,6 @@ mixin Efl.Io.Sizer { } events { - size,changed; [[Notifies size changed]] + size,changed: void; [[Notifies size changed]] } } diff --git a/src/lib/efl/interfaces/efl_io_writer.eo b/src/lib/efl/interfaces/efl_io_writer.eo index f640e733cb..7e109cf372 100644 --- a/src/lib/efl/interfaces/efl_io_writer.eo +++ b/src/lib/efl/interfaces/efl_io_writer.eo @@ -47,7 +47,7 @@ interface Efl.Io.Writer { } events { - can_write,changed; [[Notifies can_write property changed. + can_write,changed: void; [[Notifies can_write property changed. If @.can_write is $true there is data to @.write without blocking/error. If diff --git a/src/lib/efl/interfaces/efl_model.eo b/src/lib/efl/interfaces/efl_model.eo index cc46f5654b..88260db317 100644 --- a/src/lib/efl/interfaces/efl_model.eo +++ b/src/lib/efl/interfaces/efl_model.eo @@ -4,6 +4,15 @@ struct Efl.Model_Property_Event { invalidated_properties: array; [[Removed properties identified by name]] } +struct Efl.Model_Children_Event { + [[Every time a child is added the event EFL_MODEL_EVENT_CHILD_ADDED is dispatched + passing along this structure.]] + index: uint; [[index is a hint and is intended to provide a way for applications + to control/know children relative positions through listings.]] + child: Efl.Object; [[If an object has been built for this index and it is currently tracked by + the parent, it will be available here.]] +} + interface Efl.Model () { [[Efl model interface]] @@ -152,8 +161,8 @@ interface Efl.Model () properties,changed: Efl.Model_Property_Event; [[Event dispatched when properties list is available.]] - child,added; [[Event dispatched when new child is added.]] - child,removed; [[Event dispatched when child is removed.]] - children,count,changed; [[Event dispatched when children count is finished.]] + child,added: Efl.Model_Children_Event; [[Event dispatched when new child is added.]] + child,removed: Efl.Model_Children_Event; [[Event dispatched when child is removed.]] + children,count,changed: void; [[Event dispatched when children count is finished.]] } } diff --git a/src/lib/efl/interfaces/efl_pack.eo b/src/lib/efl/interfaces/efl_pack.eo index 88efd16e23..6da85cb8fd 100644 --- a/src/lib/efl/interfaces/efl_pack.eo +++ b/src/lib/efl/interfaces/efl_pack.eo @@ -58,6 +58,6 @@ interface Efl.Pack (Efl.Container) } } events { - layout,updated; [[Sent after the layout was updated.]] + layout,updated: void; [[Sent after the layout was updated.]] } } diff --git a/src/lib/efl/interfaces/efl_ui_clickable.eo b/src/lib/efl/interfaces/efl_ui_clickable.eo index 6706630302..15c7e27a27 100644 --- a/src/lib/efl/interfaces/efl_ui_clickable.eo +++ b/src/lib/efl/interfaces/efl_ui_clickable.eo @@ -3,13 +3,17 @@ interface Efl.Ui.Clickable () [[Efl UI clickable interface]] event_prefix: efl_ui; events { - clicked; [[Called when object iss clicked]] - clicked,double; [[Called when object receives a double click]] - clicked,triple; [[Called when object receives a triple click]] - clicked,right; [[Called when object receives a right click]] - pressed; [[Called when the object is pressed]] - unpressed; [[Called when the object is no longer pressed]] - longpressed; [[Called when the object receives a long press]] - repeated; [[Called when the object receives repeated presses/clicks]] + /* FIXME: Explain what are the objects passed through the event_infos */ + clicked: void; [[Called when object is clicked]] + clicked,double: void; [[Called when object receives a double click]] + clicked,triple: void; [[Called when object receives a triple click]] + clicked,right: Efl.Object; [[Called when object receives a right click]] + /* FIXME: Might be NULL */ + pressed: Efl.Object; [[Called when the object is pressed]] + /* FIXME: Might be NULL */ + unpressed: Efl.Object; [[Called when the object is no longer pressed]] + /* FIXME: Might be NULL */ + longpressed: Efl.Object; [[Called when the object receives a long press]] + repeated: void; [[Called when the object receives repeated presses/clicks]] } } diff --git a/src/lib/efl/interfaces/efl_ui_draggable.eo b/src/lib/efl/interfaces/efl_ui_draggable.eo index 750bf46a57..e38e7f4416 100644 --- a/src/lib/efl/interfaces/efl_ui_draggable.eo +++ b/src/lib/efl/interfaces/efl_ui_draggable.eo @@ -24,13 +24,14 @@ interface Efl.Ui.Draggable () } events { - drag; [[Called when drag operation starts]] - drag,start; [[Called when drag started]] - drag,stop; [[Called when drag stopped]] - drag,end; [[Called when drag operation ends]] - drag,start,up; [[Called when drag starts into up direction]] - drag,start,down; [[Called when drag starts into down direction]] - drag,start,right; [[Called when drag starts into right direction]] - drag,start,left; [[Called when drag starts into left direction]] + /* FIXME: Explain what is the object passed through the event_infos */ + drag: Efl.Object; [[Called when drag operation starts]] + drag,start: void; [[Called when drag started]] + drag,stop: Efl.Object; [[Called when drag stopped]] + drag,end: void; [[Called when drag operation ends]] + drag,start,up: Efl.Object; [[Called when drag starts into up direction]] + drag,start,down: Efl.Object; [[Called when drag starts into down direction]] + drag,start,right: Efl.Object; [[Called when drag starts into right direction]] + drag,start,left: Efl.Object; [[Called when drag starts into left direction]] } } diff --git a/src/lib/efl/interfaces/efl_ui_scrollable.eo b/src/lib/efl/interfaces/efl_ui_scrollable.eo index 34b440d9af..2f6d0a1053 100644 --- a/src/lib/efl/interfaces/efl_ui_scrollable.eo +++ b/src/lib/efl/interfaces/efl_ui_scrollable.eo @@ -17,20 +17,20 @@ interface Efl.Ui.Scrollable () [[Efl UI scrollable interface]] event_prefix: efl_ui; events { - scroll,start; [[Called when scroll operation starts]] - scroll; [[Called when scrolling]] - scroll,stop; [[Called when scroll operation stops]] - scroll,up; [[Called when scrolling upwards]] - scroll,down; [[Called when scrolling downwards]] - scroll,left; [[Called when scrolling left]] - scroll,right; [[Called when scrolling right]] - edge,up; [[Called when hitting the top edge]] - edge,down; [[Called when hitting the bottom edge]] - edge,left; [[Called when hitting the left edge]] - edge,right; [[Called when hitting the right edge]] - scroll,anim,start; [[Called when scroll animation starts]] - scroll,anim,stop; [[Called when scroll animation stopps]] - scroll,drag,start; [[Called when scroll drag starts]] - scroll,drag,stop; [[Called when scroll drag stops]] + scroll,start: void; [[Called when scroll operation starts]] + scroll: void; [[Called when scrolling]] + scroll,stop: void; [[Called when scroll operation stops]] + scroll,up: void; [[Called when scrolling upwards]] + scroll,down: void; [[Called when scrolling downwards]] + scroll,left: void; [[Called when scrolling left]] + scroll,right: void; [[Called when scrolling right]] + edge,up: void; [[Called when hitting the top edge]] + edge,down: void; [[Called when hitting the bottom edge]] + edge,left: void; [[Called when hitting the left edge]] + edge,right: void; [[Called when hitting the right edge]] + scroll,anim,start: void; [[Called when scroll animation starts]] + scroll,anim,stop: void; [[Called when scroll animation stopps]] + scroll,drag,start: void; [[Called when scroll drag starts]] + scroll,drag,stop: void; [[Called when scroll drag stops]] } } diff --git a/src/lib/efl/interfaces/efl_ui_scrollbar.eo b/src/lib/efl/interfaces/efl_ui_scrollbar.eo index a539e82d24..2e2f0d08df 100644 --- a/src/lib/efl/interfaces/efl_ui_scrollbar.eo +++ b/src/lib/efl/interfaces/efl_ui_scrollbar.eo @@ -59,12 +59,12 @@ interface Efl.Ui.Scrollbar () } } events { - bar,press; [[Called when bar is pressed]] - bar,unpress; [[Called when bar is unpressed]] - bar,drag; [[Called when bar is dragged]] - bar,size,changed; [[Called when bar size is changed]] - bar,pos,changed; [[Called when bar position is changed]] - bar,show; [[Callend when bar is shown]] - bar,hide; [[Called when bar is hidden]] + bar,press: Efl.Ui.Scrollbar_Direction; [[Called when bar is pressed]] + bar,unpress: Efl.Ui.Scrollbar_Direction; [[Called when bar is unpressed]] + bar,drag: Efl.Ui.Scrollbar_Direction; [[Called when bar is dragged]] + bar,size,changed: void; [[Called when bar size is changed]] + bar,pos,changed: void; [[Called when bar position is changed]] + bar,show: Efl.Ui.Scrollbar_Direction; [[Callend when bar is shown]] + bar,hide: Efl.Ui.Scrollbar_Direction; [[Called when bar is hidden]] } } diff --git a/src/lib/efl/interfaces/efl_ui_selectable.eo b/src/lib/efl/interfaces/efl_ui_selectable.eo index f7cf257a5e..3f98ddf4f9 100644 --- a/src/lib/efl/interfaces/efl_ui_selectable.eo +++ b/src/lib/efl/interfaces/efl_ui_selectable.eo @@ -3,13 +3,15 @@ interface Efl.Ui.Selectable () [[Efl UI selectable interface]] event_prefix: efl_ui; events { - selected; [[Called when selected]] - unselected; [[Called when no longer selected]] - selection,paste; [[Called when selection is pasted]] - selection,copy; [[Called when selection is copied]] - selection,cut; [[Called when selection is cut]] - selection,start; [[Called at selection start]] - selection,changed; [[Called when selection is changed]] - selection,cleared; [[Called when selection is cleared]] + /* FIXME: Called with multiple types of event_info! */ + selected: void; [[Called when selected]] + /* FIXME: Called with multiple types of event_info! */ + unselected: void; [[Called when no longer selected]] + selection,paste: void; [[Called when selection is pasted]] + selection,copy: void; [[Called when selection is copied]] + selection,cut: void; [[Called when selection is cut]] + selection,start: void; [[Called at selection start]] + selection,changed: void; [[Called when selection is changed]] + selection,cleared: void; [[Called when selection is cleared]] } } diff --git a/src/lib/efl/interfaces/efl_ui_zoom.eo b/src/lib/efl/interfaces/efl_ui_zoom.eo index 8c602a455f..4618070676 100644 --- a/src/lib/efl/interfaces/efl_ui_zoom.eo +++ b/src/lib/efl/interfaces/efl_ui_zoom.eo @@ -93,8 +93,8 @@ interface Efl.Ui.Zoom () } } events { - zoom,start; [[Called when zooming started]] - zoom,stop; [[Called when zooming stopped]] - zoom,change; [[Called when zooming changed]] + zoom,start: void; [[Called when zooming started]] + zoom,stop: void; [[Called when zooming stopped]] + zoom,change: void; [[Called when zooming changed]] } } diff --git a/src/lib/eldbus/eldbus_model_method.eo b/src/lib/eldbus/eldbus_model_method.eo index ef5ab1001a..ae74f80295 100644 --- a/src/lib/eldbus/eldbus_model_method.eo +++ b/src/lib/eldbus/eldbus_model_method.eo @@ -38,7 +38,7 @@ class Eldbus.Model.Method (Eldbus.Model.Arguments) { .method; } events { - successful,call; [[Event dispatched for a successful method call.]] + successful,call: void; [[Event dispatched for a successful method call.]] } } diff --git a/src/lib/elementary/efl_access_object.eo b/src/lib/elementary/efl_access_object.eo index 1abaeb549e..b2d28d1686 100644 --- a/src/lib/elementary/efl_access_object.eo +++ b/src/lib/elementary/efl_access_object.eo @@ -1,6 +1,3 @@ -/* FIXME: This definitely shouldn't be here. */ -type Efl_Event_Cb: __undefined_type; [[Efl event callback type]] - enum Efl.Access.Type { [[Type of accessibility object]] @@ -364,7 +361,7 @@ mixin Efl.Access.Object (Efl.Interface, Efl.Object) event_handler_add @class @protected @beta { [[Register accessibility event listener]] params { - @in cb: Efl_Event_Cb; [[Callback]] + @in cb: Efl.Event_Cb; [[Callback]] @in data: void_ptr; [[Data]] } return: ptr(Efl.Access.Event.Handler); [[Event handler]] @@ -466,9 +463,9 @@ mixin Efl.Access.Object (Efl.Interface, Efl.Object) children,changed: Efl.Access.Event.Children_Changed.Data; [[Called when children have changed]] state,changed: Efl.Access.Event.State_Changed.Data; [[Called when state has changed]] bounds,changed: Efl.Access.Event.Geometry_Changed.Data; [[Called when boundaries have changed]] - visible,data,changed; [[Called when visibility has changed]] - active,descendant,changed; [[Called when active state of descendant has changed]] - added; [[Called when item is added]] - removed; [[Called when item is removed]] + visible,data,changed: void; [[Called when visibility has changed]] + active,descendant,changed: Efl.Object; [[Called when active state of descendant has changed]] + added: void; [[Called when item is added]] + removed: void; [[Called when item is removed]] } } diff --git a/src/lib/elementary/efl_access_selection.eo b/src/lib/elementary/efl_access_selection.eo index dd6ff8f792..82e3202109 100644 --- a/src/lib/elementary/efl_access_selection.eo +++ b/src/lib/elementary/efl_access_selection.eo @@ -55,6 +55,6 @@ interface Efl.Access.Selection () } } events { - selection,changed; [[Called when selection has been changed.]] + selection,changed: void; [[Called when selection has been changed.]] } } diff --git a/src/lib/elementary/efl_access_text.eo b/src/lib/elementary/efl_access_text.eo index 92b5d6e696..c4b616d57e 100644 --- a/src/lib/elementary/efl_access_text.eo +++ b/src/lib/elementary/efl_access_text.eo @@ -232,11 +232,13 @@ interface Efl.Access.Text () } } events { - access,text,bounds,changed; [[Text bounds have changed]] - access,text,attributes,changed; [[Text attributes have changed]] - access,text,caret,moved; [[Caret moved]] - access,text,inserted; [[Text was inserted]] - access,text,removed; [[Text was removed]] - access,text,selection,changed; [[Text selection has changed]] + /* FIXME: Nobody emits these + access,text,bounds,changed: void; [[Text bounds have changed]] + access,text,attributes,changed: void; [[Text attributes have changed]] + */ + access,text,caret,moved: void; [[Caret moved]] + access,text,inserted: Efl.Access.Text_Change_Info; [[Text was inserted]] + access,text,removed: Efl.Access.Text_Change_Info; [[Text was removed]] + access,text,selection,changed: void; [[Text selection has changed]] } } diff --git a/src/lib/elementary/efl_access_window.eo b/src/lib/elementary/efl_access_window.eo index 2fcb738b60..bc91e3494e 100644 --- a/src/lib/elementary/efl_access_window.eo +++ b/src/lib/elementary/efl_access_window.eo @@ -2,12 +2,12 @@ interface Efl.Access.Window () { [[Elementary accessible window interface]] events { - window,created; [[Called when new window has been created.]] - window,destroyed; [[Called when window has been destroyed.]] - window,activated; [[Called when window has been activated. (unfocused)]] - window,deactivated; [[Called when window has been deactivated (unfocused).]] - window,maximized; [[Called when window has been maximmized]] - window,minimized; [[Called when window has been minimized]] - window,restored; [[Called when window has been restored]] + window,created: void; [[Called when new window has been created.]] + window,destroyed: void; [[Called when window has been destroyed.]] + window,activated: void; [[Called when window has been activated. (unfocused)]] + window,deactivated: void; [[Called when window has been deactivated (unfocused).]] + window,maximized: void; [[Called when window has been maximmized]] + window,minimized: void; [[Called when window has been minimized]] + window,restored: void; [[Called when window has been restored]] } } diff --git a/src/lib/elementary/efl_selection.eo b/src/lib/elementary/efl_selection.eo index bdb6d51d55..8dda11cb08 100644 --- a/src/lib/elementary/efl_selection.eo +++ b/src/lib/elementary/efl_selection.eo @@ -40,6 +40,6 @@ mixin Efl.Selection { } } events { - selection,changed; [[Called when display server's selection has changed]] + selection,changed: Efl.Selection.Changed; [[Called when display server's selection has changed]] } } diff --git a/src/lib/elementary/efl_text_interactive.eo b/src/lib/elementary/efl_text_interactive.eo index 8730cb6e66..16d0448854 100644 --- a/src/lib/elementary/efl_text_interactive.eo +++ b/src/lib/elementary/efl_text_interactive.eo @@ -45,6 +45,6 @@ interface Efl.Text_Interactive (Efl.Text, Efl.Text_Font, } } events { - selection,changed; [[The selection on the object has changed. Query using @.selection_cursors]] + selection,changed: void; [[The selection on the object has changed. Query using @.selection_cursors]] } } diff --git a/src/lib/elementary/efl_ui_calendar.eo b/src/lib/elementary/efl_ui_calendar.eo index c4193395a4..08a95ef20d 100644 --- a/src/lib/elementary/efl_ui_calendar.eo +++ b/src/lib/elementary/efl_ui_calendar.eo @@ -114,6 +114,6 @@ class Efl.Ui.Calendar (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Acces Efl.Ui.Format.format_cb { set; } } events { - changed; [[Emitted when the selected date in the calendar is changed]] + changed: void; [[Emitted when the selected date in the calendar is changed]] } } diff --git a/src/lib/elementary/efl_ui_clock.eo b/src/lib/elementary/efl_ui_clock.eo index d37db28e5c..962b7bac19 100644 --- a/src/lib/elementary/efl_ui_clock.eo +++ b/src/lib/elementary/efl_ui_clock.eo @@ -229,6 +229,6 @@ class Efl.Ui.Clock (Efl.Ui.Layout.Object) Efl.Ui.Translatable.translation_update; } events { - changed; [[Called when clock changed]] + changed: void; [[Called when clock changed]] } } diff --git a/src/lib/elementary/efl_ui_datepicker.eo b/src/lib/elementary/efl_ui_datepicker.eo index 2ba89236e2..7b769e9bae 100644 --- a/src/lib/elementary/efl_ui_datepicker.eo +++ b/src/lib/elementary/efl_ui_datepicker.eo @@ -70,6 +70,6 @@ class Efl.Ui.Datepicker (Efl.Ui.Layout.Object) Efl.Object.destructor; } events { - changed; [[Called when date value is changed]] + changed: void; [[Called when date value is changed]] } } diff --git a/src/lib/elementary/efl_ui_dnd.eo b/src/lib/elementary/efl_ui_dnd.eo index 192644e7b1..a8d5563600 100644 --- a/src/lib/elementary/efl_ui_dnd.eo +++ b/src/lib/elementary/efl_ui_dnd.eo @@ -52,11 +52,12 @@ mixin Efl.Ui.Dnd { } } events { - drag,accept; [[accept drag data]] - drag,done; [[drag is done (mouse up)]] - drag,enter; [[called when the drag object enters this object]] - drag,leave; [[called when the drag object leaves this object]] - drag,pos; [[called when the drag object changes drag position]] - drag,drop; [[called when the drag object dropped on this object]] + /* FIXME: This is not very future-proof. Better return a struct. */ + drag,accept: ptr(bool); [[accept drag data]] + drag,done: void; [[drag is done (mouse up)]] + drag,enter: void; [[called when the drag object enters this object]] + drag,leave: void; [[called when the drag object leaves this object]] + drag,pos: Efl.Dnd.Drag_Pos; [[called when the drag object changes drag position]] + drag,drop: Efl.Selection.Data; [[called when the drag object dropped on this object]] } } diff --git a/src/lib/elementary/efl_ui_flip.eo b/src/lib/elementary/efl_ui_flip.eo index 7e9da0c8fb..95b14109c4 100644 --- a/src/lib/elementary/efl_ui_flip.eo +++ b/src/lib/elementary/efl_ui_flip.eo @@ -249,7 +249,7 @@ class Efl.Ui.Flip (Efl.Ui.Widget, Efl.Pack_Linear, Efl.Part) Efl.Pack_Linear.pack_index_get; } events { - animate,begin; [[Called when flip animation begins]] - animate,done; [[Called when flip animation is done]] + animate,begin: void; [[Called when flip animation begins]] + animate,done: void; [[Called when flip animation is done]] } } diff --git a/src/lib/elementary/efl_ui_focus_manager.eo b/src/lib/elementary/efl_ui_focus_manager.eo index 7a4e93b442..e5e91f3519 100644 --- a/src/lib/elementary/efl_ui_focus_manager.eo +++ b/src/lib/elementary/efl_ui_focus_manager.eo @@ -159,8 +159,8 @@ interface Efl.Ui.Focus.Manager { events { redirect,changed : Efl.Ui.Focus.Manager; [[Emitted when the redirect object has changed, the old manager is passed as event info]] - flush,pre; [[Emitted once the graph calculationg will be performed]] - coords,dirty; [[Emitted once the graph is dirty, this means there are + flush,pre: void; [[Emitted once the graph calculationg will be performed]] + coords,dirty: void; [[Emitted once the graph is dirty, this means there are potential changes in border_elements you want to know about]] focused : Efl.Ui.Focus.Object; [[Emitted if the manager has focused an object, the passed focus object is the last focused object]] diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo index dee9712f25..a572d468d0 100644 --- a/src/lib/elementary/efl_ui_image.eo +++ b/src/lib/elementary/efl_ui_image.eo @@ -121,6 +121,6 @@ class Efl.Ui.Image (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Draggable, Efl.Access.Widget.Action.elm_actions { get; } } events { - drop; [[Called when drop from drag and drop happened]] /* FIXME - Belongs to DnD interface */ + drop: string; [[Called when drop from drag and drop happened]] /* FIXME - Belongs to DnD interface */ } } diff --git a/src/lib/elementary/efl_ui_image_zoomable.eo b/src/lib/elementary/efl_ui_image_zoomable.eo index 3c0fb24417..7695b592ac 100644 --- a/src/lib/elementary/efl_ui_image_zoomable.eo +++ b/src/lib/elementary/efl_ui_image_zoomable.eo @@ -1,3 +1,7 @@ +/* FIXME: Define these structs in EO, or they are useless to bindings */ +struct @extern Elm.Photocam.Error; +struct @extern Elm.Photocam.Progress; + class Efl.Ui.Image_Zoomable (Efl.Ui.Widget, Efl.Ui.Image, Efl.Ui.Zoom, Efl.Ui.Scrollable_Interactive, Efl.Ui.Scrollbar) @@ -73,14 +77,14 @@ class Efl.Ui.Image_Zoomable (Efl.Ui.Widget, Efl.Ui.Image, Efl.Ui.Zoom, //Efl.Canvas.Layout_Group.group_data { get; } } events { - press; [[Called when photocam got pressed]] - load; [[Called when photocam loading started]] - loaded; [[Called when photocam loading finished]] - load,detail; [[Called when photocal detail loading started]] - loaded,detail; [[Called when photocam detail loading finished]] - download,start; [[Called when photocam download started]] - download,progress; [[Called when photocam download progress updated]] - download,done; [[Called when photocam download finished]] - download,error; [[Called when photocam download failed]] + press: void; [[Called when photocam got pressed]] + load: void; [[Called when photocam loading started]] + loaded: void; [[Called when photocam loading finished]] + load,detail: void; [[Called when photocal detail loading started]] + loaded,detail: void; [[Called when photocam detail loading finished]] + download,start: void; [[Called when photocam download started]] + download,progress: Elm.Photocam.Progress; [[Called when photocam download progress updated]] + download,done: void; [[Called when photocam download finished]] + download,error: Elm.Photocam.Error; [[Called when photocam download failed]] } } diff --git a/src/lib/elementary/efl_ui_image_zoomable_pan.eo b/src/lib/elementary/efl_ui_image_zoomable_pan.eo index 87f5d06804..a9c9cb3b4d 100644 --- a/src/lib/elementary/efl_ui_image_zoomable_pan.eo +++ b/src/lib/elementary/efl_ui_image_zoomable_pan.eo @@ -14,6 +14,7 @@ class Efl.Ui.Image_Zoomable_Pan (Efl.Ui.Pan) Efl.Ui.Pan.pan_position_max { get; } } events { + /* FIXME: Nobody is emitting these load; [[Called when load started]] loaded; [[Called when load finished]] load,detail; [[Called when load details started]] @@ -22,5 +23,6 @@ class Efl.Ui.Image_Zoomable_Pan (Efl.Ui.Pan) download,progress; [[Called with download progress updates]] download,done; [[Called when download finished]] download,error; [[Called when download failed with an error]] + */ } } diff --git a/src/lib/elementary/efl_ui_layout_object.eo b/src/lib/elementary/efl_ui_layout_object.eo index d12c5c9146..c5d86526e2 100644 --- a/src/lib/elementary/efl_ui_layout_object.eo +++ b/src/lib/elementary/efl_ui_layout_object.eo @@ -75,6 +75,6 @@ class Efl.Ui.Layout.Object (Efl.Ui.Widget, Efl.Part, Efl.Container, Efl.File, Efl.Ui.Factory.model_connect; } events { - theme,changed; [[Called when theme changed]] + theme,changed: void; [[Called when theme changed]] } } diff --git a/src/lib/elementary/efl_ui_model_state.eo b/src/lib/elementary/efl_ui_model_state.eo index c76ccab1e0..3192df1b61 100644 --- a/src/lib/elementary/efl_ui_model_state.eo +++ b/src/lib/elementary/efl_ui_model_state.eo @@ -6,11 +6,13 @@ class Efl.Ui.Model_State (Efl.Model_Composite_Boolean) Efl.Model.property { set; } } events { + /* FIXME: Nobody is emitting these enable; disable; show; hide; selected; unselected; + */ } } diff --git a/src/lib/elementary/efl_ui_nstate.eo b/src/lib/elementary/efl_ui_nstate.eo index baa97332f0..8c3f1de642 100644 --- a/src/lib/elementary/efl_ui_nstate.eo +++ b/src/lib/elementary/efl_ui_nstate.eo @@ -34,6 +34,6 @@ class Efl.Ui.Nstate(Efl.Ui.Button) Efl.Ui.Widget.widget_event; } events { - changed; [[Called when the value changed.]] + changed: void; [[Called when the value changed.]] } } diff --git a/src/lib/elementary/efl_ui_pan.eo b/src/lib/elementary/efl_ui_pan.eo index 8085cfd8ba..b27b8ca77d 100644 --- a/src/lib/elementary/efl_ui_pan.eo +++ b/src/lib/elementary/efl_ui_pan.eo @@ -48,8 +48,8 @@ class Efl.Ui.Pan (Efl.Canvas.Group, Efl.Canvas.Group.group_calculate; } events { - content,changed; [[Called when pan content changed]] - viewport,changed; [[Called when pan viewport changed]] - position,changed; [[Called when pan position changed]] + content,changed: void; [[Called when pan content changed]] + viewport,changed: void; [[Called when pan viewport changed]] + position,changed: void; [[Called when pan position changed]] } } diff --git a/src/lib/elementary/efl_ui_panes.eo b/src/lib/elementary/efl_ui_panes.eo index 3ad14c77e9..c83a1ce93d 100644 --- a/src/lib/elementary/efl_ui_panes.eo +++ b/src/lib/elementary/efl_ui_panes.eo @@ -55,7 +55,7 @@ class Efl.Ui.Panes (Efl.Ui.Layout.Object, Efl.Ui.Direction, Efl.Part.part; } events { - press; [[Called when panes got pressed]] - unpress; [[Called when panes are no longer pressed]] + press: void; [[Called when panes got pressed]] + unpress: void; [[Called when panes are no longer pressed]] } } diff --git a/src/lib/elementary/efl_ui_popup.eo b/src/lib/elementary/efl_ui_popup.eo index 676f769ee7..9c70895353 100644 --- a/src/lib/elementary/efl_ui_popup.eo +++ b/src/lib/elementary/efl_ui_popup.eo @@ -64,7 +64,7 @@ class Efl.Ui.Popup(Efl.Ui.Layout.Object, Efl.Content) Efl.Part.part; } events { - backwall,clicked; [[This is called whenever the user clicks back wall of popup.]] - timeout; [[This is called when popup times out.]] + backwall,clicked: void; [[This is called whenever the user clicks back wall of popup.]] + timeout: void; [[This is called when popup times out.]] } } diff --git a/src/lib/elementary/efl_ui_progressbar.eo b/src/lib/elementary/efl_ui_progressbar.eo index a42116cfaf..846ab32262 100644 --- a/src/lib/elementary/efl_ui_progressbar.eo +++ b/src/lib/elementary/efl_ui_progressbar.eo @@ -64,6 +64,6 @@ class Efl.Ui.Progressbar (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Format, Efl.Ui.Translatable.translatable_text { get; set; } } events { - changed; [[Called when progressbar changed]] + changed: void; [[Called when progressbar changed]] } } diff --git a/src/lib/elementary/efl_ui_slider.eo b/src/lib/elementary/efl_ui_slider.eo index 39f54ac9bb..0fe181a675 100644 --- a/src/lib/elementary/efl_ui_slider.eo +++ b/src/lib/elementary/efl_ui_slider.eo @@ -22,9 +22,9 @@ class Efl.Ui.Slider (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Direction, Efl.Access.Widget.Action.elm_actions { get; } } events { - changed; [[Called when slider changed]] - delay,changed; [[Called when delay changed]] - slider,drag,start; [[Called when slider drag started]] - slider,drag,stop; [[Called when slider drag stopped]] + changed: void; [[Called when slider changed]] + delay,changed: void; [[Called when delay changed]] + slider,drag,start: void; [[Called when slider drag started]] + slider,drag,stop: void; [[Called when slider drag stopped]] } } diff --git a/src/lib/elementary/efl_ui_spin.eo b/src/lib/elementary/efl_ui_spin.eo index 08934b4a6b..5ed516659d 100644 --- a/src/lib/elementary/efl_ui_spin.eo +++ b/src/lib/elementary/efl_ui_spin.eo @@ -18,8 +18,8 @@ class Efl.Ui.Spin (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Format, Efl.Ui.Format.format_cb { set; } } events { - changed; [[Called when spin changed]] - min,reached; [[Called when spin value reached min]] - max,reached; [[Called when spin value reached max]] + changed: void; [[Called when spin changed]] + min,reached: void; [[Called when spin value reached min]] + max,reached: void; [[Called when spin value reached max]] } } diff --git a/src/lib/elementary/efl_ui_spin_button.eo b/src/lib/elementary/efl_ui_spin_button.eo index c47ac268c6..4b0b8be632 100644 --- a/src/lib/elementary/efl_ui_spin_button.eo +++ b/src/lib/elementary/efl_ui_spin_button.eo @@ -75,6 +75,6 @@ class Efl.Ui.Spin_Button (Efl.Ui.Spin, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action.elm_actions { get; } } events { - delay,changed; [[Called when spin delay is changed.]] + delay,changed: void; [[Called when spin delay is changed.]] } } diff --git a/src/lib/elementary/efl_ui_stack.eo b/src/lib/elementary/efl_ui_stack.eo index 7adad847f7..33772123db 100644 --- a/src/lib/elementary/efl_ui_stack.eo +++ b/src/lib/elementary/efl_ui_stack.eo @@ -123,9 +123,9 @@ class Efl.Ui.Stack (Efl.Ui.Layout.Object) Efl.Object.constructor; } events { - loaded; [[Called when content is loaded right before transition.]] - unloaded; [[Called when content is unloaded right after being deactivated.]] - activated; [[Called when content is activated right after transition.]] - deactivated; [[Called when content is deactivated right after transition.]] + loaded: Efl.Ui.Stack.Event_Loaded; [[Called when content is loaded right before transition.]] + unloaded: Efl.Ui.Stack.Event_Unloaded; [[Called when content is unloaded right after being deactivated.]] + activated: Efl.Ui.Stack.Event_Activated; [[Called when content is activated right after transition.]] + deactivated: Efl.Ui.Stack.Event_Deactivated; [[Called when content is deactivated right after transition.]] } } diff --git a/src/lib/elementary/efl_ui_tags.eo b/src/lib/elementary/efl_ui_tags.eo index 51005d2142..637b9f81d8 100644 --- a/src/lib/elementary/efl_ui_tags.eo +++ b/src/lib/elementary/efl_ui_tags.eo @@ -45,13 +45,15 @@ class Efl.Ui.Tags (Efl.Ui.Layout.Object, Efl.Text, Efl.Ui.Format) Efl.Ui.Format.format_cb { set; } } events { - item,selected; [[Called when item was selected]] - item,added; [[Called when item was added]] - item,deleted; [[Called when item was deleted]] - item,clicked; [[Called when item was clicked]] - item,longpressed; [[Called when item got a longpress]] - expanded; [[Called when expanded]] - contracted; [[Called when contracted]] - expand,state,changed; [[Called when expanded state changed]] + /* FIXME: Returning a basic type is not future-proof, better return a struct */ + item,selected: string; [[Called when item was selected]] + item,added: string; [[Called when item was added]] + item,deleted: string; [[Called when item was deleted]] + item,clicked: string; [[Called when item was clicked]] + item,longpressed: string; [[Called when item got a longpress]] + expanded: void; [[Called when expanded]] + contracted: void; [[Called when contracted]] + /* FIXME: Not future-proof */ + expand,state,changed: int; [[Called when expanded state changed]] } } diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo index 18a2f7b3a6..398b8041b1 100644 --- a/src/lib/elementary/efl_ui_text.eo +++ b/src/lib/elementary/efl_ui_text.eo @@ -365,27 +365,30 @@ class Efl.Ui.Text (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clicka Efl.Text_Interactive.editable { set; } } events { - activated; [[Called when entry is activated]] - changed; [[Called when entry changes]] + activated: void; [[Called when entry is activated]] + changed: void; [[Called when entry changes]] + /* FIXME: Sometimes it can be NULL but @nullable does not work on events */ changed,user: Efl.Ui.Text.Change_Info; [[The text object has changed due to user interaction]] - validate; [[Called when validating]] - context,open; [[Called when context menu was opened]] - anchor,clicked; [[Called when anchor is clicked]] - rejected; [[Called when entry is rejected]] - maxlength,reached; [[Called when maximum entry length has been reached]] - preedit,changed; [[Called when entry preedit changed]] - press; [[Called when entry pressed]] - redo,request; [[Called when redo is requested]] - undo,request; [[Called when undo is requested]] + validate: Elm.Validate_Content; [[Called when validating]] + context,open: void; [[Called when context menu was opened]] + preedit,changed: void; [[Called when entry preedit changed]] + press: void; [[Called when entry pressed]] + redo,request: void; [[Called when redo is requested]] + undo,request: void; [[Called when undo is requested]] + aborted: void; [[Called when entry is aborted]] + anchor,down: Elm.Entry_Anchor_Info; [[Called on anchor down]] + anchor,hover,opened: Elm.Entry_Anchor_Hover_Info; [[Called when hover opened]] + anchor,in: Elm.Entry_Anchor_Info; [[Called on anchor in]] + anchor,out: Elm.Entry_Anchor_Info; [[Called on anchor out]] + anchor,up: Elm.Entry_Anchor_Info; [[called on anchor up]] + cursor,changed,manual: void; [[Called on manual cursor change]] + /* FIXME: Nobody emits these + anchor,clicked: void; [[Called when anchor is clicked]] + rejected: void; [[Called when entry is rejected]] + maxlength,reached: void; [[Called when maximum entry length has been reached]] text,set,done; [[Called when text set finished]] - aborted; [[Called when entry is aborted]] - anchor,down; [[Called on anchor down]] - anchor,hover,opened; [[Called when hover opened]] - anchor,in; [[Called on anchor in]] - anchor,out; [[Called on anchor out]] - anchor,up; [[called on anchor up]] - cursor,changed; [[Called on cursor changed]] - cursor,changed,manual; [[Called on manual cursor change]] + cursor,changed: void; [[Called on cursor changed]] + */ } } diff --git a/src/lib/elementary/efl_ui_timepicker.eo b/src/lib/elementary/efl_ui_timepicker.eo index 3be8f08a5c..54fd2b6baa 100644 --- a/src/lib/elementary/efl_ui_timepicker.eo +++ b/src/lib/elementary/efl_ui_timepicker.eo @@ -39,6 +39,6 @@ class Efl.Ui.Timepicker (Efl.Ui.Layout.Object) Efl.Object.destructor; } events { - changed; [[Called when date is changed]] + changed: void; [[Called when date is changed]] } } diff --git a/src/lib/elementary/efl_ui_view_list_pan.eo b/src/lib/elementary/efl_ui_view_list_pan.eo index b6b275f204..ceca0744a2 100644 --- a/src/lib/elementary/efl_ui_view_list_pan.eo +++ b/src/lib/elementary/efl_ui_view_list_pan.eo @@ -10,7 +10,9 @@ class Efl.Ui.View_List_Pan (Efl.Ui.Pan) Efl.Canvas.Group.group_calculate; } events { - item,focused; [[Called when item is focused.]] - item,unfocused; [[Called when item has lost focus.]] + /* FIXME: Nobody is emitting these + item,focused: void; [[Called when item is focused.]] + item,unfocused: void; [[Called when item has lost focus.]] + */ } } diff --git a/src/lib/elementary/efl_ui_widget.eo b/src/lib/elementary/efl_ui_widget.eo index 756ebaf725..cf5b834545 100644 --- a/src/lib/elementary/efl_ui_widget.eo +++ b/src/lib/elementary/efl_ui_widget.eo @@ -593,8 +593,8 @@ abstract Efl.Ui.Widget (Efl.Canvas.Group, Efl.Access.Object, Efl.Part.part; [[Returns @Efl.Ui.Widget_Part.]] } events { - moved; [[Called when widget moved]] - language,changed; [[Called when widget language changed]] - access,changed; [[Called when accessibility changed]] + moved: Efl.Object; [[Called when widget moved]] + language,changed: void; [[Called when widget language changed]] + access,changed: void; [[Called when accessibility changed]] } } diff --git a/src/lib/elementary/efl_ui_win.eo b/src/lib/elementary/efl_ui_win.eo index 3e643546b0..876c70fef4 100644 --- a/src/lib/elementary/efl_ui_win.eo +++ b/src/lib/elementary/efl_ui_win.eo @@ -825,23 +825,23 @@ class Efl.Ui.Win (Efl.Ui.Widget, Efl.Canvas.Scene, Efl.Canvas.Pointer, Efl.Acces .accel_preference; } events { - delete,request; [[Called when the window receives a delete request]] - withdrawn; [[Called when window is withdrawn]] - iconified; [[Called when window is iconified]] - normal; [[Called when window is set to normal state]] - stick; [[Called when window is set as sticky]] - unstick; [[Called when window is no longer set as sticky]] - fullscreen; [[Called when window is set to fullscreen]] - unfullscreen; [[Called when window is no longer set to fullscreen]] - maximized; [[Called when window is set to maximized]] - unmaximized; [[Called when window is no longer set to maximized]] - indicator,prop,changed; [[Called when indicator is property changed]] - rotation,changed; [[Called when window rotation is changed]] - profile,changed; [[Called when profile is changed]] - wm,rotation,changed; [[Called when window manager rotation is changed]] - theme,changed; [[Called when theme is changed]] - elm,action,block_menu; [[Called when elementary block menu action occurs]] - pause; [[Called when the window is not going be displayed for some time]] - resume; [[Called before a window is rendered after a pause event]] + delete,request: void; [[Called when the window receives a delete request]] + withdrawn: void; [[Called when window is withdrawn]] + iconified: void; [[Called when window is iconified]] + normal: void; [[Called when window is set to normal state]] + stick: void; [[Called when window is set as sticky]] + unstick: void; [[Called when window is no longer set as sticky]] + fullscreen: void; [[Called when window is set to fullscreen]] + unfullscreen: void; [[Called when window is no longer set to fullscreen]] + maximized: void; [[Called when window is set to maximized]] + unmaximized: void; [[Called when window is no longer set to maximized]] + indicator,prop,changed: void; [[Called when indicator is property changed]] + rotation,changed: void; [[Called when window rotation is changed]] + profile,changed: void; [[Called when profile is changed]] + wm,rotation,changed: void; [[Called when window manager rotation is changed]] + theme,changed: void; [[Called when theme is changed]] + elm,action,block_menu: void; [[Called when elementary block menu action occurs]] + pause: void; [[Called when the window is not going be displayed for some time]] + resume: void; [[Called before a window is rendered after a pause event]] } } diff --git a/src/lib/elementary/elm_actionslider.eo b/src/lib/elementary/elm_actionslider.eo index 1397f3707b..6b9d41544c 100644 --- a/src/lib/elementary/elm_actionslider.eo +++ b/src/lib/elementary/elm_actionslider.eo @@ -75,6 +75,6 @@ class Elm.Actionslider (Efl.Ui.Layout.Object, Efl.Ui.Selectable, Efl.Ui.Legacy) Efl.Part.part; } events { - pos_changed; [[The position of the actionslider has changed]] + pos_changed: string; [[The position of the actionslider has changed]] } } diff --git a/src/lib/elementary/elm_atspi_bridge.eo b/src/lib/elementary/elm_atspi_bridge.eo index c1e7e5d024..9db28c26de 100644 --- a/src/lib/elementary/elm_atspi_bridge.eo +++ b/src/lib/elementary/elm_atspi_bridge.eo @@ -19,7 +19,7 @@ class Elm.Atspi.Bridge (Efl.Object) Efl.Object.destructor; } events { - connected; [[Connected with AT-SPI2 bus]] - disconnected; [[Disconnected from AT-SPI2 bus]] + connected: void; [[Connected with AT-SPI2 bus]] + disconnected: void; [[Disconnected from AT-SPI2 bus]] } } diff --git a/src/lib/elementary/elm_box.eo b/src/lib/elementary/elm_box.eo index 72ce67184d..36bdd9d7bc 100644 --- a/src/lib/elementary/elm_box.eo +++ b/src/lib/elementary/elm_box.eo @@ -252,7 +252,7 @@ class Elm.Box (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Efl.Ui.Legacy) Efl.Ui.Focus.Composition.prepare; } events { - child,added; [[Called when child was added]] - child,removed; [[Called when child was removed]] + child,added: Efl.Object; [[Called when child was added]] + child,removed: Efl.Object; [[Called when child was removed]] } } diff --git a/src/lib/elementary/elm_calendar.eo b/src/lib/elementary/elm_calendar.eo index 1cbe6b3ca1..0bbd10e95e 100644 --- a/src/lib/elementary/elm_calendar.eo +++ b/src/lib/elementary/elm_calendar.eo @@ -420,7 +420,7 @@ class Elm.Calendar (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Access.W Efl.Access.Widget.Action.elm_actions { get; } } events { - changed; [[Emitted when the date in the calendar is changed]] - display,changed; [[Emitted when the current month displayed in the calendar is changed]] + changed: void; [[Emitted when the date in the calendar is changed]] + display,changed: void; [[Emitted when the current month displayed in the calendar is changed]] } } diff --git a/src/lib/elementary/elm_clock.eo b/src/lib/elementary/elm_clock.eo index e77dc49619..e01048d937 100644 --- a/src/lib/elementary/elm_clock.eo +++ b/src/lib/elementary/elm_clock.eo @@ -167,6 +167,6 @@ class Elm.Clock (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Ui.Legacy) Efl.Ui.Widget.theme_apply; } events { - changed; [[The clock's user changed the time]] + changed: void; [[The clock's user changed the time]] } } diff --git a/src/lib/elementary/elm_code_widget.eo b/src/lib/elementary/elm_code_widget.eo index a03c5b11b9..61431168a4 100644 --- a/src/lib/elementary/elm_code_widget.eo +++ b/src/lib/elementary/elm_code_widget.eo @@ -1,8 +1,8 @@ import elm_interface_scrollable; /* FIXME: Those types make elm_code unusable from pure EO */ -struct @extern Elm_Code; [[Elementary code main data structure]] /* The main interface currently defined in code */ -struct @extern Elm_Code_Line; [[Elementary code line data structure]] /* Parts of the interface currently defined in code */ +struct @extern Elm.Code; [[Elementary code main data structure]] /* The main interface currently defined in code */ +struct @extern Elm.Code_Line; [[Elementary code line data structure]] /* Parts of the interface currently defined in code */ class Elm.Code_Widget (Efl.Ui.Layout.Object, Efl.Access.Text) { @@ -20,7 +20,7 @@ class Elm.Code_Widget (Efl.Ui.Layout.Object, Efl.Access.Text) [[Get the underlying code object we are rendering]] } values { - code: ptr(Elm_Code); [[Our underlying Elm_Code object]] + code: ptr(Elm.Code); [[Our underlying Elm.Code object]] } } @property font { @@ -93,15 +93,15 @@ class Elm.Code_Widget (Efl.Ui.Layout.Object, Efl.Access.Text) [[Set whether this widget allows editing If editable then the widget will allow user input to manipulate - the underlying Elm_Code_File of this Elm_Code instance. - Any other Elm_Code_Widget's connected to this Elm_Code will + the underlying Elm.Code_File of this Elm.Code instance. + Any other Elm.Code_Widget's connected to this Elm.Code will update to reflect the changes.]] } get { [[Get the current editable state of this widget returns EINA_TRUE if the widget is editable, EINA_FALSE otherwise. - If this widget is not editable the underlying Elm_Code_File could + If this widget is not editable the underlying Elm.Code_File could still be manipulated by a different widget or the filesystem.]] } values { @@ -197,13 +197,13 @@ class Elm.Code_Widget (Efl.Ui.Layout.Object, Efl.Access.Text) line_refresh { [[Refresh code line in widget]] params { - line: ptr(Elm_Code_Line); [[The line to refresh.]] + line: ptr(Elm.Code_Line); [[The line to refresh.]] } } line_visible_get { [[Check if the code line is currently visible]] params { - line: ptr(Elm_Code_Line); [[The line to test for visibility.]] + line: ptr(Elm.Code_Line); [[The line to test for visibility.]] } return: bool; [[$true if the line specified is currently visible within the scroll region.]] } @@ -259,7 +259,7 @@ class Elm.Code_Widget (Efl.Ui.Layout.Object, Efl.Access.Text) line_text_column_width_to_position { [[Get text column width at given position]] params { - line: ptr(Elm_Code_Line); [[Code line]] + line: ptr(Elm.Code_Line); [[Code line]] position: uint; [[Code position]] } return: uint; [[Text column width]] @@ -267,14 +267,14 @@ class Elm.Code_Widget (Efl.Ui.Layout.Object, Efl.Access.Text) line_text_column_width_get { [[Get text column width for code line]] params { - line: ptr(Elm_Code_Line); [[Code line]] + line: ptr(Elm.Code_Line); [[Code line]] } return: uint; [[Text column width]] } line_text_position_for_column_get { [[Get position from column]] params { - line: ptr(Elm_Code_Line); [[Code line]] + line: ptr(Elm.Code_Line); [[Code line]] column: uint; [[Column]] } return: uint; [[Position]] @@ -289,7 +289,7 @@ class Elm.Code_Widget (Efl.Ui.Layout.Object, Efl.Access.Text) line_status_toggle { [[Toggle the display of the line status widget]] params { - line: ptr(Elm_Code_Line); [[Code line]] + line: ptr(Elm.Code_Line); [[Code line]] } } @@ -319,15 +319,16 @@ class Elm.Code_Widget (Efl.Ui.Layout.Object, Efl.Access.Text) .code; } events { - line,clicked; [[Called when text line was clicked]] - line,gutter,clicked; [[Called when gutter was clicked]] - cursor,changed; [[Called when cursor changed]] - changed,user; [[Called when object changed due to user interaction]] - selection,start; [[Called when a selection is started]] - selection,changed; [[Called when selection changed]] - selection,cleared; [[Called when selection was cleared]] - selection,cut; [[Called when a cut action is performed]] - selection,copy; [[Called when a copy action is performed]] - selection,paste; [[Called when a paste action is performed]] + line,clicked: Elm.Code_Line; [[Called when text line was clicked]] + line,gutter,clicked: Elm.Code_Line; [[Called when gutter was clicked]] + changed,user: void; [[Called when object changed due to user interaction]] + /* FIXME: All events below send the obj in the event_info, which is redundant */ + cursor,changed: Elm.Code_Widget; [[Called when cursor changed]] + selection,start: Elm.Code_Widget; [[Called when a selection is started]] + selection,changed: Elm.Code_Widget; [[Called when selection changed]] + selection,cleared: Elm.Code_Widget; [[Called when selection was cleared]] + selection,cut: Elm.Code_Widget; [[Called when a cut action is performed]] + selection,copy: Elm.Code_Widget; [[Called when a copy action is performed]] + selection,paste: Elm.Code_Widget; [[Called when a paste action is performed]] } } diff --git a/src/lib/elementary/elm_colorselector.eo b/src/lib/elementary/elm_colorselector.eo index 5a87e1ce82..3b106dfde1 100644 --- a/src/lib/elementary/elm_colorselector.eo +++ b/src/lib/elementary/elm_colorselector.eo @@ -118,9 +118,9 @@ class Elm.Colorselector (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.Access.Object.access_children { get; } } events { - color,item,selected; [[Called when color item was selected]] - color,item,longpressed; [[Called when color item got a long press]] - changed; [[Called when colorselector changed]] - changed,user; [[Called when the object changed due to user interaction]] + color,item,selected: Efl.Object; [[Called when color item was selected]] + color,item,longpressed: Efl.Object; [[Called when color item got a long press]] + changed: void; [[Called when colorselector changed]] + changed,user: void; [[Called when the object changed due to user interaction]] } } diff --git a/src/lib/elementary/elm_combobox.eo b/src/lib/elementary/elm_combobox.eo index 91a4ef1a67..62d447024d 100644 --- a/src/lib/elementary/elm_combobox.eo +++ b/src/lib/elementary/elm_combobox.eo @@ -48,11 +48,13 @@ class Elm.Combobox (Efl.Ui.Button, Efl.Ui.Selectable, //Efl.Part.part; // TODO? } events { - dismissed; [[Called when combobox was dismissed]] - expanded; [[Called when combobox was expanded]] + dismissed: void; [[Called when combobox was dismissed]] + expanded: void; [[Called when combobox was expanded]] + /* FIXME: Nobody is emitting this clicked; [[Called when combobox was clicked]] - item,selected; [[Called when combobox item was selected]] - item,pressed; [[Called when combobox item was pressed]] - filter,done; [[Called when combobox filter was done]] + */ + item,selected: Efl.Object; [[Called when combobox item was selected]] + item,pressed: Efl.Object; [[Called when combobox item was pressed]] + filter,done: Efl.Object; [[Called when combobox filter was done]] } } diff --git a/src/lib/elementary/elm_conformant.eo b/src/lib/elementary/elm_conformant.eo index 0c28a57f84..8026cc020e 100644 --- a/src/lib/elementary/elm_conformant.eo +++ b/src/lib/elementary/elm_conformant.eo @@ -11,9 +11,9 @@ class Elm.Conformant (Efl.Ui.Layout.Object, Efl.Ui.Legacy) Efl.Ui.Widget.theme_apply; } events { - virtualkeypad,state,on; [[Called when virtualkeypad was enabled]] - virtualkeypad,state,off; [[Called when virtualkeypad was disabled]] - clipboard,state,on; [[Called when clipboard was enabled]] - clipboard,state,off; [[Called when clipboard was disabled]] + virtualkeypad,state,on: void; [[Called when virtualkeypad was enabled]] + virtualkeypad,state,off: void; [[Called when virtualkeypad was disabled]] + clipboard,state,on: void; [[Called when clipboard was enabled]] + clipboard,state,off: void; [[Called when clipboard was disabled]] } } diff --git a/src/lib/elementary/elm_ctxpopup.eo b/src/lib/elementary/elm_ctxpopup.eo index 1029f1f72e..8004e866cd 100644 --- a/src/lib/elementary/elm_ctxpopup.eo +++ b/src/lib/elementary/elm_ctxpopup.eo @@ -243,7 +243,7 @@ class Elm.Ctxpopup (Efl.Ui.Layout.Object, Efl.Ui.Focus.Layer, Efl.Access.Widget. Efl.Part.part; } events { - dismissed; [[Called when context popup was dismissed]] + dismissed: void; [[Called when context popup was dismissed]] geometry,update: const(ptr(Eina.Rect)); [[Called when context popup geometry was updated]] } } diff --git a/src/lib/elementary/elm_dayselector.eo b/src/lib/elementary/elm_dayselector.eo index 5d124e2ece..5fb912890f 100644 --- a/src/lib/elementary/elm_dayselector.eo +++ b/src/lib/elementary/elm_dayselector.eo @@ -156,6 +156,8 @@ class Elm.Dayselector (Efl.Ui.Layout.Object, Efl.Ui.Legacy) Efl.Part.part; } events { + /* FIXME: Nobody emits this dayselector,changed; [[Called when dayselector widget changed]] + */ } } diff --git a/src/lib/elementary/elm_entry.eo b/src/lib/elementary/elm_entry.eo index 70f6f62267..5f7ce5f1ae 100644 --- a/src/lib/elementary/elm_entry.eo +++ b/src/lib/elementary/elm_entry.eo @@ -880,26 +880,27 @@ class Elm.Entry (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Clickabl Efl.Part.part; } events { - activated; [[Called when entry got activated]] - changed; [[Called when entry changed]] - changed,user; [[Called when the object changed due to user interaction]] - validate; [[Called when validating]] - context,open; [[Called when context menu was opened]] - anchor,clicked; [[Called when anchor was clicked]] - rejected; [[Called when entry was rejected]] - maxlength,reached; [[Called when maximum entry length has been reached]] - preedit,changed; [[Called when entry preedit changed]] - press; [[Called when entry pressed]] - redo,request; [[Called when redo was requested]] - undo,request; [[Called when undo was requested]] - text,set,done; [[Called when text set finished]] - aborted; [[Called when entry was aborted]] - anchor,down; [[Called on anchor down]] - anchor,hover,opened; [[Called when hover opened]] - anchor,in; [[Called on anchor in]] - anchor,out; [[Called on anchor out]] - anchor,up; [[called on anchor up]] - cursor,changed; [[Called on cursor changed]] - cursor,changed,manual; [[Called on manual cursor change]] + activated: void; [[Called when entry got activated]] + changed: void; [[Called when entry changed]] + /* FIXME: Canm be NULL but @nullable does not work on events */ + changed,user: Elm.Entry_Change_Info; [[Called when the object changed due to user interaction]] + validate: Elm.Validate_Content; [[Called when validating]] + context,open: void; [[Called when context menu was opened]] + anchor,clicked: Elm.Entry_Anchor_Info; [[Called when anchor was clicked]] + rejected: void; [[Called when entry was rejected]] + maxlength,reached: void; [[Called when maximum entry length has been reached]] + preedit,changed: void; [[Called when entry preedit changed]] + press: void; [[Called when entry pressed]] + redo,request: void; [[Called when redo was requested]] + undo,request: void; [[Called when undo was requested]] + text,set,done: void; [[Called when text set finished]] + aborted: void; [[Called when entry was aborted]] + anchor,down: Elm.Entry_Anchor_Info; [[Called on anchor down]] + anchor,hover,opened: Elm.Entry_Anchor_Hover_Info; [[Called when hover opened]] + anchor,in: Elm.Entry_Anchor_Info; [[Called on anchor in]] + anchor,out: Elm.Entry_Anchor_Info; [[Called on anchor out]] + anchor,up: Elm.Entry_Anchor_Info; [[called on anchor up]] + cursor,changed: void; [[Called on cursor changed]] + cursor,changed,manual: void; [[Called on manual cursor change]] } } diff --git a/src/lib/elementary/elm_fileselector.eo b/src/lib/elementary/elm_fileselector.eo index 3ef8a517af..616108ad44 100644 --- a/src/lib/elementary/elm_fileselector.eo +++ b/src/lib/elementary/elm_fileselector.eo @@ -57,9 +57,10 @@ class Elm.Fileselector (Efl.Ui.Layout.Object, Elm.Interface.Fileselector, Efl.Part.part; } events { - done; [[Called when OK button was pressed]] - activated; [[Called when the filesector was activated]] - selected,invalid; [[Called when fileselector was selected]] - directory,open; [[Called when a directory was opened]] + done: string; [[Called when OK button was pressed]] + /* FIXME: For all three events below, event_info can either be a string or an Efl.Model */ + activated: void; [[Called when the filesector was activated]] + selected,invalid: void; [[Called when fileselector was selected]] + directory,open: void; [[Called when a directory was opened]] } } diff --git a/src/lib/elementary/elm_fileselector_button.eo b/src/lib/elementary/elm_fileselector_button.eo index 37f7c141e2..579ed656b5 100644 --- a/src/lib/elementary/elm_fileselector_button.eo +++ b/src/lib/elementary/elm_fileselector_button.eo @@ -20,6 +20,7 @@ class Elm.Fileselector_Button (Efl.Ui.Button, Elm.Interface.Fileselector, Elm.Interface.Fileselector.mode { get; set; } } events { - file,chosen; [[Called when a file was chosen in the fileselector]] + /* FIXME: Can be Efl.Model, string and NULL */ + file,chosen: void; [[Called when a file was chosen in the fileselector]] } } diff --git a/src/lib/elementary/elm_fileselector_entry.eo b/src/lib/elementary/elm_fileselector_entry.eo index c3afba8e37..e3ce79a1e8 100644 --- a/src/lib/elementary/elm_fileselector_entry.eo +++ b/src/lib/elementary/elm_fileselector_entry.eo @@ -16,9 +16,10 @@ class Elm.Fileselector_Entry (Efl.Ui.Layout.Object, Elm.Interface.Fileselector, Efl.Part.part; } events { - changed; [[Called when the entry changed]] - activated; [[Called when the entry was activated]] - file,chosen; [[Called when a file was chosen in the fileselector]] - press; [[Called when entry was pressed]] + changed: void; [[Called when the entry changed]] + activated: void; [[Called when the entry was activated]] + /* FIXME: Can be Efl.Model or string */ + file,chosen: void; [[Called when a file was chosen in the fileselector]] + press: void; [[Called when entry was pressed]] } } diff --git a/src/lib/elementary/elm_flipselector.eo b/src/lib/elementary/elm_flipselector.eo index cc17f67ff1..570c642567 100644 --- a/src/lib/elementary/elm_flipselector.eo +++ b/src/lib/elementary/elm_flipselector.eo @@ -169,7 +169,7 @@ class Elm.Flipselector (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Access.Widget.Action.elm_actions { get; } } events { - underflowed; [[Called when flipselector is underflowed]] - overflowed; [[Called when flipselector is overflowed]] + underflowed: void; [[Called when flipselector is underflowed]] + overflowed: void; [[Called when flipselector is overflowed]] } } diff --git a/src/lib/elementary/elm_general.eot b/src/lib/elementary/elm_general.eot index bcefa45410..b4583a02f2 100644 --- a/src/lib/elementary/elm_general.eot +++ b/src/lib/elementary/elm_general.eot @@ -133,10 +133,16 @@ enum Elm.Icon.Type standard [[Icon is of type standard]] } -/* FIXME: shouldn't exist */ +/* FIXME: shouldn't exist, they are unusable by the bindings */ struct @extern Elm_Gen_Item; [[Elementary gen item]] struct @extern Efl_Access_Action_Data; [[Efl access action data]] - +struct @extern Elm.Validate_Content; [[Data for the elm_validator_regexp_helper()]] +struct @extern Elm.Entry_Anchor_Info; [[The info sent in the callback for the "anchor,clicked" signals emitted + by entries.]] +struct @extern Elm.Entry_Anchor_Hover_Info; [[The info sent in the callback for "anchor,hover" signals emitted + by the Anchor_Hover widget]] +struct @extern Elm.Entry_Change_Info; [[This corresponds to Edje_Entry_Change_Info. Includes information about + a change in the entry]] /* Enums from elm_entry.eo, also used by efl_ui_text */ enum Elm.Text_Format diff --git a/src/lib/elementary/elm_gengrid.eo b/src/lib/elementary/elm_gengrid.eo index 314f6485bf..671831a347 100644 --- a/src/lib/elementary/elm_gengrid.eo +++ b/src/lib/elementary/elm_gengrid.eo @@ -530,21 +530,21 @@ class Elm.Gengrid (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Elm.Interface Efl.Ui.Focus.Manager.setup_on_first_touch; } events { - realized; [[Called when gengrid realized]] - unrealized; [[Called when gengrid unrealized]] - index,update; [[Called on gengrid index update]] - scroll,page,changed; [[Called when scroll page changed]] - edge,bottom; [[Called when bottom edge is reached]] - edge,top; [[Called when top edge is reached]] - edge,right; [[Called when right edge is reached]] - edge,left; [[Called when left edge is reached]] - item,focused; [[Called when item got focus]] - item,unfocused; [[Called when item no longer has focus]] - item,reorder,anim,start; [[Called when item reorder animation started]] - item,reorder,anim,stop; [[Called when item reorder animation stopped]] - activated; [[Called when gengrid got activated]] - highlighted; [[Called when gengrid is highlighted]] - unhighlighted; [[Called when gengrid is no longer highlighted]] - released; [[Called when gengrid is released]] + realized: Efl.Object; [[Called when gengrid realized]] + unrealized: Efl.Object; [[Called when gengrid unrealized]] + index,update: Efl.Object; [[Called on gengrid index update]] + scroll,page,changed: void; [[Called when scroll page changed]] + edge,bottom: void; [[Called when bottom edge is reached]] + edge,top: void; [[Called when top edge is reached]] + edge,right: void; [[Called when right edge is reached]] + edge,left: void; [[Called when left edge is reached]] + item,focused: Efl.Object; [[Called when item got focus]] + item,unfocused: Efl.Object; [[Called when item no longer has focus]] + item,reorder,anim,start: Efl.Object; [[Called when item reorder animation started]] + item,reorder,anim,stop: Efl.Object; [[Called when item reorder animation stopped]] + activated: Efl.Object; [[Called when gengrid got activated]] + highlighted: Efl.Object; [[Called when gengrid is highlighted]] + unhighlighted: Efl.Object; [[Called when gengrid is no longer highlighted]] + released: Efl.Object; [[Called when gengrid is released]] } } diff --git a/src/lib/elementary/elm_genlist.eo b/src/lib/elementary/elm_genlist.eo index 2d70cfc8b3..e4ff2d218b 100644 --- a/src/lib/elementary/elm_genlist.eo +++ b/src/lib/elementary/elm_genlist.eo @@ -558,40 +558,40 @@ class Elm.Genlist (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Elm.Interface Efl.Ui.Focus.Manager.setup_on_first_touch; } events { - item,focused; [[Called when genlist item got focus]] - item,unfocused; [[Called when genlist item lost focus]] - vbar,drag; [[Called when vertical bar is dragged]] - vbar,press; [[Called when vertical bar is pressed]] - vbar,unpress; [[Called when vertical bar is no longer pressed]] - hbar,drag; [[Called when horizontal bar is dragged]] - hbar,press; [[Called when horizontal bar is pressed]] - hbar,unpress; [[Called when horizontal bar is no longer pressed]] - edge,top; [[Called when top edge is reached]] - edge,bottom; [[Called when bottom edge is reached]] - edge,left; [[Called when left edge is reached]] - edge,right; [[Called when right edge is reached]] - moved; [[Called when genlist item moved]] - moved,before; [[Called when genlist item moved before]] - moved,after; [[Called when genlist item moved after]] - swipe; [[Called when swipe is detected]] - multi,pinch,in; [[Called when multitouch pinch in detected]] - multi,pinch,out; [[Called when multitouch pinch out detected]] - multi,swipe,down; [[Called when multitouch swipe down detected]] - multi,swipe,up; [[Called when multitouch swipe up detected]] - multi,swipe,right; [[Called when multitouch swipe right detected]] - multi,swipe,left; [[Called when multitouch swipe left detected]] - released; [[Called when genlist is released]] - activated; [[called when genlist is activated]] - highlighted; [[Called when genlist is highlighted]] - unhighlighted; [[Called when genlist is no longer highlighted]] - realized; [[Called when genlist is realized]] - unrealized; [[Called when genlist is unrealized]] - contract,request; [[Called when contract is requested]] - expand,request; [[Called when expand is requested]] - contracted; [[called when genlist is contracted]] - expanded; [[Called when genlist is expanded]] - index,update; [[Called when genlist index updated]] - tree,effect,finished; [[Called when genlist tree effect finished]] - filter,done; [[Called when genlist filter is done]] + item,focused: Efl.Object; [[Called when genlist item got focus]] + item,unfocused: Efl.Object; [[Called when genlist item lost focus]] + vbar,drag: void; [[Called when vertical bar is dragged]] + vbar,press: void; [[Called when vertical bar is pressed]] + vbar,unpress: void; [[Called when vertical bar is no longer pressed]] + hbar,drag: void; [[Called when horizontal bar is dragged]] + hbar,press: void; [[Called when horizontal bar is pressed]] + hbar,unpress: void; [[Called when horizontal bar is no longer pressed]] + edge,top: void; [[Called when top edge is reached]] + edge,bottom: void; [[Called when bottom edge is reached]] + edge,left: void; [[Called when left edge is reached]] + edge,right: void; [[Called when right edge is reached]] + moved: Efl.Object; [[Called when genlist item moved]] + moved,before: Efl.Object; [[Called when genlist item moved before]] + moved,after: Efl.Object; [[Called when genlist item moved after]] + swipe: Efl.Object; [[Called when swipe is detected]] + multi,pinch,in: Efl.Object; [[Called when multitouch pinch in detected]] + multi,pinch,out: Efl.Object; [[Called when multitouch pinch out detected]] + multi,swipe,down: Efl.Object; [[Called when multitouch swipe down detected]] + multi,swipe,up: Efl.Object; [[Called when multitouch swipe up detected]] + multi,swipe,right: Efl.Object; [[Called when multitouch swipe right detected]] + multi,swipe,left: Efl.Object; [[Called when multitouch swipe left detected]] + released: Efl.Object; [[Called when genlist is released]] + activated: Efl.Object; [[called when genlist is activated]] + highlighted: Efl.Object; [[Called when genlist is highlighted]] + unhighlighted: Efl.Object; [[Called when genlist is no longer highlighted]] + realized: Efl.Object; [[Called when genlist is realized]] + unrealized: Efl.Object; [[Called when genlist is unrealized]] + contract,request: Efl.Object; [[Called when contract is requested]] + expand,request: Efl.Object; [[Called when expand is requested]] + contracted: Efl.Object; [[called when genlist is contracted]] + expanded: Efl.Object; [[Called when genlist is expanded]] + index,update: Efl.Object; [[Called when genlist index updated]] + tree,effect,finished: void; [[Called when genlist tree effect finished]] + filter,done: void; [[Called when genlist filter is done]] } } diff --git a/src/lib/elementary/elm_genlist_pan.eo b/src/lib/elementary/elm_genlist_pan.eo index 153d595b4e..9f1966cb31 100644 --- a/src/lib/elementary/elm_genlist_pan.eo +++ b/src/lib/elementary/elm_genlist_pan.eo @@ -16,7 +16,9 @@ class Elm.Genlist.Pan (Elm.Pan) Elm.Pan.pos_max { get; } } events { + /* FIXME: Nobody emits these item,focused; [[Called when item got focus]] item,unfocused; [[Called when item lost focus]] + */ } } diff --git a/src/lib/elementary/elm_glview.eo b/src/lib/elementary/elm_glview.eo index ced30375b7..74cc36fd45 100644 --- a/src/lib/elementary/elm_glview.eo +++ b/src/lib/elementary/elm_glview.eo @@ -194,21 +194,24 @@ class Elm.Glview (Efl.Ui.Widget, Efl.Gfx.View, Efl.Ui.Legacy) Efl.Gfx.View.view_size { get; set; } } events { - created; [[Event dispatched when first render happens. + created: void; + [[Event dispatched when first render happens. The callback function gets called once during the render loop. Callback function allows glview to hide all the rendering context/surface details and have the user just call GL calls that they desire for initialization GL calls. ]] - destroyed; [[Event dispatched when GLView object is deleted. + destroyed: void; + [[Event dispatched when GLView object is deleted. The registered destroyed function gets called when GLView object is deleted. Callback function allows glview to hide all the rendering context/surface details and have the user just call GL calls that they desire when delete happens. ]] - resized; [[Event dispatched when resize happens. + resized: void; + [[Event dispatched when resize happens. The resized event callback functions gets called during the render loop. The callback function allows @@ -216,7 +219,8 @@ class Elm.Glview (Efl.Ui.Widget, Efl.Gfx.View, Efl.Ui.Legacy) details and have the user just call GL alls that they desire when resize happens. ]] - render; [[Event dispatched when GLView is rendered. + render: void; + [[Event dispatched when GLView is rendered. The callback function gets called in the main loop but whether it runs depends on the rendering policy and whether diff --git a/src/lib/elementary/elm_hover.eo b/src/lib/elementary/elm_hover.eo index c488dfe893..c5663c5a7f 100644 --- a/src/lib/elementary/elm_hover.eo +++ b/src/lib/elementary/elm_hover.eo @@ -74,7 +74,7 @@ class Elm.Hover (Efl.Ui.Layout.Object, Efl.Ui.Focus.Layer, Efl.Ui.Clickable, Efl.Part.part; } events { - smart,changed; [[Called when hover changed]] - dismissed; [[Called when hover was dismissed]] + smart,changed: string; [[Called when hover changed]] + dismissed: void; [[Called when hover was dismissed]] } } diff --git a/src/lib/elementary/elm_hoversel.eo b/src/lib/elementary/elm_hoversel.eo index b94625095c..130ef72974 100644 --- a/src/lib/elementary/elm_hoversel.eo +++ b/src/lib/elementary/elm_hoversel.eo @@ -105,9 +105,9 @@ class Elm.Hoversel (Efl.Ui.Button, Efl.Ui.Selectable, Efl.Access.Object.access_children { get; } } events { - dismissed; [[Called when hoversel is dismissed]] - expanded; [[Called when hoversel is expanded]] - item,focused; [[Called when hoversel item got focus]] - item,unfocused; [[Called when hoversel item lost focus]] + dismissed: void; [[Called when hoversel is dismissed]] + expanded: void; [[Called when hoversel is expanded]] + item,focused: Efl.Object; [[Called when hoversel item got focus]] + item,unfocused: Efl.Object; [[Called when hoversel item lost focus]] } } diff --git a/src/lib/elementary/elm_icon.eo b/src/lib/elementary/elm_icon.eo index 774b609a06..8fd9d2eef5 100644 --- a/src/lib/elementary/elm_icon.eo +++ b/src/lib/elementary/elm_icon.eo @@ -13,7 +13,7 @@ class Elm.Icon (Efl.Ui.Image, Efl.Ui.Legacy) Efl.File.file { set; } } events { - thumb,done; [[Called when thumb nailing is successfully done]] - thumb,error; [[Called when thumb nailing failed]] + thumb,done: void; [[Called when thumb nailing is successfully done]] + thumb,error: void; [[Called when thumb nailing failed]] } } diff --git a/src/lib/elementary/elm_index.eo b/src/lib/elementary/elm_index.eo index 53957da09e..9916adcd74 100644 --- a/src/lib/elementary/elm_index.eo +++ b/src/lib/elementary/elm_index.eo @@ -203,9 +203,9 @@ class Elm.Index (Efl.Ui.Layout.Object, Efl.Ui.Direction, Efl.Access.Object.access_children { get; } } events { - changed; [[Called when index changed]] - delay,changed; [[Called when delay changed]] - level,up; [[Called when level increased]] - level,down; [[Called when level decreased]] + changed: Efl.Object; [[Called when index changed]] + delay,changed: Efl.Object; [[Called when delay changed]] + level,up: void; [[Called when level increased]] + level,down: void; [[Called when level decreased]] } } diff --git a/src/lib/elementary/elm_interface_scrollable.eo b/src/lib/elementary/elm_interface_scrollable.eo index 5854033468..02c2739953 100644 --- a/src/lib/elementary/elm_interface_scrollable.eo +++ b/src/lib/elementary/elm_interface_scrollable.eo @@ -663,6 +663,6 @@ mixin Elm.Interface_Scrollable(Efl.Ui.Scrollable, Efl.Ui.Focus.Manager_Sub, Efl. Efl.Ui.Base.mirrored { set; } } events { - changed; [[Called when content changed]] + changed: void; [[Called when content changed]] } } diff --git a/src/lib/elementary/elm_label.eo b/src/lib/elementary/elm_label.eo index 1770f39fb5..86690d7117 100644 --- a/src/lib/elementary/elm_label.eo +++ b/src/lib/elementary/elm_label.eo @@ -128,6 +128,6 @@ class Elm.Label (Efl.Ui.Layout.Object, Efl.Ui.Legacy) Efl.Part.part; } events { - slide,end; [[Called when slide stopped]] + slide,end: void; [[Called when slide stopped]] } } diff --git a/src/lib/elementary/elm_list.eo b/src/lib/elementary/elm_list.eo index c629ed4aa5..f09c5299af 100644 --- a/src/lib/elementary/elm_list.eo +++ b/src/lib/elementary/elm_list.eo @@ -420,17 +420,19 @@ class Elm.List (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Access.Selection.access_selection_clear; } events { - activated; [[Called when activated]] - edge,top; [[Called when top edge was reached]] - edge,bottom; [[Called when bottom edge was reached]] - edge,left; [[Called when left edge was reached]] - edge,right; [[Called when right edge was reached]] - swipe; [[Called when swipe is detected]] - highlighted; [[Called when highlighted]] - unhighlighted; [[Called when no longer highlighted]] - item,focused; [[Called when item got focus]] - item,unfocused; [[Called when item no longer has focus]] + activated: Efl.Object; [[Called when activated]] + edge,top: void; [[Called when top edge was reached]] + edge,bottom: void; [[Called when bottom edge was reached]] + edge,left: void; [[Called when left edge was reached]] + edge,right: void; [[Called when right edge was reached]] + swipe: Efl.Object; [[Called when swipe is detected]] + highlighted: Efl.Object; [[Called when highlighted]] + unhighlighted: Efl.Object; [[Called when no longer highlighted]] + item,focused: Efl.Object; [[Called when item got focus]] + item,unfocused: Efl.Object; [[Called when item no longer has focus]] + /* FIXME: Nobody emits these item,reorder,anim,start; [[Called when item reorder animation started]] item,reorder,anim,stop; [[Called when item reorder animation stopped]] + */ } } diff --git a/src/lib/elementary/elm_map.eo b/src/lib/elementary/elm_map.eo index e73cc0ac30..e780eaa807 100644 --- a/src/lib/elementary/elm_map.eo +++ b/src/lib/elementary/elm_map.eo @@ -5,6 +5,7 @@ type Elm_Map_Overlay: __undefined_type; [[Elementary map overlay type]] type Elm_Map_Name: __undefined_type; [[Elementary map name type]] type Elm_Map_Name_Cb: __undefined_type; [[Elementary map name callback type]] type Elm_Map_Name_List_Cb: __undefined_type; [[Elementary map name list callback type]] +type Evas.Event_Mouse_Down: __undefined_type; enum Elm.Map.Source_Type { @@ -536,18 +537,19 @@ class Elm.Map (Efl.Ui.Widget, Elm.Interface_Scrollable, Elm.Interface_Scrollable.wheel_disabled { set; } } events { - press; [[Called when map was pressed]] - loaded; [[Called when map loaded]] - tile,load; [[Called when title load started]] - tile,loaded; [[Called when title load finished]] - tile,loaded,fail; [[Called when title load failed]] - route,load; [[Called when route load started]] - route,loaded; [[Called when route load finished]] - route,loaded,fail; [[Called when route load failed]] - name,load; [[Called when name load started]] - name,loaded; [[Called when name load finished]] - name,loaded,fail; [[Called when name load failed]] - overlay,clicked; [[Called when overlay was clicked]] - overlay,del; [[Called when overlay was deleted]] + press: Evas.Event_Mouse_Down; [[Called when map was pressed]] + loaded: void; [[Called when map loaded]] + tile,load: void; [[Called when title load started]] + tile,loaded: void; [[Called when title load finished]] + tile,loaded,fail: void; [[Called when title load failed]] + route,load: Elm_Map_Route; [[Called when route load started]] + route,loaded: void; [[Called when route load finished]] + route,loaded,fail: void; [[Called when route load failed]] + /* FIXME: Can be Elm_Map_Name or list */ + name,load: void; [[Called when name load started]] + name,loaded: void; [[Called when name load finished]] + name,loaded,fail: void; [[Called when name load failed]] + overlay,clicked: Elm_Map_Overlay; [[Called when overlay was clicked]] + overlay,del: Elm_Map_Overlay; [[Called when overlay was deleted]] } } diff --git a/src/lib/elementary/elm_map_pan.eo b/src/lib/elementary/elm_map_pan.eo index fe32aac603..d32faa0762 100644 --- a/src/lib/elementary/elm_map_pan.eo +++ b/src/lib/elementary/elm_map_pan.eo @@ -16,6 +16,7 @@ class Elm.Map.Pan (Elm.Pan) Elm.Pan.pos_max { get; } } events { + /* FIXME: Nobody is emitting these loaded; [[Called when map loaded]] tile,load; [[Called when map tile loading started]] tile,loaded; [[Called when map tile loading finished]] @@ -28,5 +29,6 @@ class Elm.Map.Pan (Elm.Pan) name,loaded,fail; [[Called when name loading failed]] overlay,clicked; [[Called when overlay was clicked]] overlay,del; [[Called when overlay was deleted]] + */ } } diff --git a/src/lib/elementary/elm_menu.eo b/src/lib/elementary/elm_menu.eo index 1bc849dbd0..d67f87a81b 100644 --- a/src/lib/elementary/elm_menu.eo +++ b/src/lib/elementary/elm_menu.eo @@ -98,8 +98,9 @@ class Elm.Menu (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Object.provider_find; } events { - dismissed; [[Called when menu widget was dismissed]] - elm,action,block_menu; [[Called when menu blocking have been enabled]] - elm,action,unblock_menu; [[Called when menu blocking has been disabled]] + dismissed: void; [[Called when menu widget was dismissed]] + /* FIXME: Nobody is emitting this, but they are already in use */ + elm,action,block_menu: void; [[Called when menu blocking have been enabled]] + elm,action,unblock_menu: void; [[Called when menu blocking has been disabled]] } } diff --git a/src/lib/elementary/elm_multibuttonentry.eo b/src/lib/elementary/elm_multibuttonentry.eo index 36860f36a2..54ac16527c 100644 --- a/src/lib/elementary/elm_multibuttonentry.eo +++ b/src/lib/elementary/elm_multibuttonentry.eo @@ -186,13 +186,14 @@ class Elm.Multibuttonentry (Efl.Ui.Layout.Object, Efl.Ui.Clickable, Efl.Ui.Legac Efl.Part.part; } events { - item,selected; [[Called when item was selected]] - item,added; [[Called when item was added]] - item,deleted; [[Called when item was deleted]] - item,clicked; [[Called when item was clicked]] - item,longpressed; [[Called when item got a longpress]] - expanded; [[Called when expanded]] - contracted; [[Called when contracted]] - expand,state,changed; [[Called when expanded state changed]] + item,selected: Efl.Object; [[Called when item was selected]] + item,added: Efl.Object; [[Called when item was added]] + item,deleted: Efl.Object; [[Called when item was deleted]] + item,clicked: Efl.Object; [[Called when item was clicked]] + item,longpressed: Efl.Object; [[Called when item got a longpress]] + expanded: void; [[Called when expanded]] + contracted: void; [[Called when contracted]] + /* FIXME: This is not very future-proof, a struct would be better */ + expand,state,changed: int; [[Called when expanded state changed]] } } diff --git a/src/lib/elementary/elm_naviframe.eo b/src/lib/elementary/elm_naviframe.eo index 5ecd5fa107..8d926acc33 100644 --- a/src/lib/elementary/elm_naviframe.eo +++ b/src/lib/elementary/elm_naviframe.eo @@ -154,9 +154,9 @@ class Elm.Naviframe (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Lega Efl.Part.part; } events { - transition,finished; [[Called when naviframe transition finished]] - title,transition,finished; [[Called when naviframe title transaction finished]] - title,clicked; [[Called when naviframe title was clicked]] - item,activated; [[Called when naviframe item was activated]] + transition,finished: Efl.Object; [[Called when naviframe transition finished]] + title,transition,finished: Efl.Object; [[Called when naviframe title transaction finished]] + title,clicked: Efl.Object; [[Called when naviframe title was clicked]] + item,activated: Efl.Object; [[Called when naviframe item was activated]] } } diff --git a/src/lib/elementary/elm_notify.eo b/src/lib/elementary/elm_notify.eo index d13090f008..4fdaa9c690 100644 --- a/src/lib/elementary/elm_notify.eo +++ b/src/lib/elementary/elm_notify.eo @@ -91,8 +91,8 @@ class Elm.Notify (Efl.Ui.Widget, Efl.Ui.Focus.Layer, Efl.Content, Efl.Part, Efl. Efl.Part.part; } events { - block,clicked; [[Called when block was clicked]] - timeout; [[Called when notify timed out]] - dismissed; [[Called when notify was dismissed]] + block,clicked: void; [[Called when block was clicked]] + timeout: void; [[Called when notify timed out]] + dismissed: void; [[Called when notify was dismissed]] } } diff --git a/src/lib/elementary/elm_pan.eo b/src/lib/elementary/elm_pan.eo index 251a447029..81eaad2e5b 100644 --- a/src/lib/elementary/elm_pan.eo +++ b/src/lib/elementary/elm_pan.eo @@ -53,6 +53,6 @@ class Elm.Pan (Efl.Canvas.Group) Efl.Gfx.Entity.size { set; } } events { - changed; [[Called when pan object changed]] + changed: void; [[Called when pan object changed]] } } diff --git a/src/lib/elementary/elm_panel.eo b/src/lib/elementary/elm_panel.eo index 3b600b12b9..8a8a708912 100644 --- a/src/lib/elementary/elm_panel.eo +++ b/src/lib/elementary/elm_panel.eo @@ -88,6 +88,6 @@ class Elm.Panel (Efl.Ui.Layout.Object, Efl.Ui.Focus.Layer, Elm.Interface_Scrolla Efl.Part.part; } events { - toggled; [[Called when the hidden state was toggled]] + toggled: void; [[Called when the hidden state was toggled]] } } diff --git a/src/lib/elementary/elm_player.eo b/src/lib/elementary/elm_player.eo index 01b78fa88a..bdf1e2c573 100644 --- a/src/lib/elementary/elm_player.eo +++ b/src/lib/elementary/elm_player.eo @@ -13,16 +13,16 @@ class Elm.Player (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Legacy) Efl.Part.part; } events { - forward,clicked; [[Called when forward was clicked]] - info,clicked; [[Called when info was clicked]] - next,clicked; [[Called when next was clicked]] - pause,clicked; [[Called when pause was clicked]] - play,clicked; [[Called when play was clicked]] - prev,clicked; [[Called when previous was clicked]] - rewind,clicked; [[Called when rewind was clicked]] - quality,clicked; [[Called when quality was clicked]] - eject,clicked; [[Called when eject was clicked]] - volume,clicked; [[Called when volume was clicked]] - mute,clicked; [[Called when mute was clicked]] + forward,clicked: void; [[Called when forward was clicked]] + info,clicked: void; [[Called when info was clicked]] + next,clicked: void; [[Called when next was clicked]] + pause,clicked: void; [[Called when pause was clicked]] + play,clicked: void; [[Called when play was clicked]] + prev,clicked: void; [[Called when previous was clicked]] + rewind,clicked: void; [[Called when rewind was clicked]] + quality,clicked: void; [[Called when quality was clicked]] + eject,clicked: void; [[Called when eject was clicked]] + volume,clicked: void; [[Called when volume was clicked]] + mute,clicked: void; [[Called when mute was clicked]] } } diff --git a/src/lib/elementary/elm_plug.eo b/src/lib/elementary/elm_plug.eo index 728e9fccaf..d5a54b27b4 100644 --- a/src/lib/elementary/elm_plug.eo +++ b/src/lib/elementary/elm_plug.eo @@ -37,7 +37,7 @@ class Elm.Plug (Efl.Ui.Widget, Efl.Ui.Clickable, Efl.Ui.Legacy) Efl.Ui.Focus.Object.on_focus_update; } events { - image,deleted; [[Called when image was deleted]] - image,resized; [[Called when image was resized]] + image,deleted: void; [[Called when image was deleted]] + image,resized: Eina.Position2D; [[Called when image was resized]] } } diff --git a/src/lib/elementary/elm_popup.eo b/src/lib/elementary/elm_popup.eo index 137fd72ffc..59fb86c0df 100644 --- a/src/lib/elementary/elm_popup.eo +++ b/src/lib/elementary/elm_popup.eo @@ -181,10 +181,10 @@ class Elm.Popup (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Legacy) Efl.Part.part; } events { - block,clicked; [[Called when popup was clicked]] - timeout; [[Called when popup timed out]] - item,focused; [[Called when popup got focus]] - item,unfocused; [[Called when popup lost focus]] - dismissed; [[Called when popup was dismissed]] + block,clicked: void; [[Called when popup was clicked]] + timeout: void; [[Called when popup timed out]] + item,focused: Efl.Object; [[Called when popup got focus]] + item,unfocused: Efl.Object; [[Called when popup lost focus]] + dismissed: void; [[Called when popup was dismissed]] } } diff --git a/src/lib/elementary/elm_prefs.eo b/src/lib/elementary/elm_prefs.eo index 84159f0825..30d22e7869 100644 --- a/src/lib/elementary/elm_prefs.eo +++ b/src/lib/elementary/elm_prefs.eo @@ -216,11 +216,13 @@ class Elm.Prefs (Efl.Ui.Widget, Efl.File, Efl.Ui.Legacy) Efl.File.file { get; set; } } events { - page,changed; [[Called when page changed]] - page,saved; [[Called when page was saved]] + page,changed: string; [[Called when page changed]] + page,saved: string; [[Called when page was saved]] + /* FIXME: Nobody emits this page,reset; [[Called when page was reset]] - page,loaded; [[Called when page got loaded]] - item,changed; [[Called when item changed]] - action; [[Called when action was done]] + */ + page,loaded: string; [[Called when page got loaded]] + item,changed: string; [[Called when item changed]] + action: string; [[Called when action was done]] } } diff --git a/src/lib/elementary/elm_scroller.eo b/src/lib/elementary/elm_scroller.eo index 0ae7bdc912..e69560f4df 100644 --- a/src/lib/elementary/elm_scroller.eo +++ b/src/lib/elementary/elm_scroller.eo @@ -59,20 +59,20 @@ class Elm.Scroller (Efl.Ui.Layout.Object, Elm.Interface_Scrollable, Efl.Ui.Widget.focus_state_apply; } events { - scroll,page,changed; [[Called when scroll page changed]] - hbar,unpress; [[Called when horizontal bar is no longer pressed]] - hbar,press; [[Called when horizontal bar is pressed]] - hbar,drag; [[Called when horizontal bar is dragged]] - vbar,unpress; [[Called when vertical bar is no longer pressed]] - vbar,press; [[Called when vertical bar is pressed]] - vbar,drag; [[Called when vertical bar is dragged]] - scroll,left; [[Called when scrolling to left]] - scroll,right; [[Called when scrolling to right]] - scroll,up; [[Called scrolled upwards]] - scroll,down; [[Called when scrolled downwards]] - edge,left; [[Called when hitting the left edge]] - edge,right; [[Called when hitting the right edge]] - edge,top; [[Called when hitting the top edge]] - edge,bottom; [[Called when hitting the bottom edge]] + scroll,page,changed: void; [[Called when scroll page changed]] + hbar,unpress: void; [[Called when horizontal bar is no longer pressed]] + hbar,press: void; [[Called when horizontal bar is pressed]] + hbar,drag: void; [[Called when horizontal bar is dragged]] + vbar,unpress: void; [[Called when vertical bar is no longer pressed]] + vbar,press: void; [[Called when vertical bar is pressed]] + vbar,drag: void; [[Called when vertical bar is dragged]] + scroll,left: void; [[Called when scrolling to left]] + scroll,right: void; [[Called when scrolling to right]] + scroll,up: void; [[Called scrolled upwards]] + scroll,down: void; [[Called when scrolled downwards]] + edge,left: void; [[Called when hitting the left edge]] + edge,right: void; [[Called when hitting the right edge]] + edge,top: void; [[Called when hitting the top edge]] + edge,bottom: void; [[Called when hitting the bottom edge]] } } diff --git a/src/lib/elementary/elm_segment_control.eo b/src/lib/elementary/elm_segment_control.eo index a06ed47de4..f43efaefdc 100644 --- a/src/lib/elementary/elm_segment_control.eo +++ b/src/lib/elementary/elm_segment_control.eo @@ -142,6 +142,6 @@ class Elm.Segment_Control (Efl.Ui.Layout.Object, Efl.Ui.Focus.Composition, Efl.U Efl.Ui.Translatable.translation_update; } events { - changed; [[Called when segment control changed]] + changed: Efl.Object; [[Called when segment control changed]] } } diff --git a/src/lib/elementary/elm_slideshow.eo b/src/lib/elementary/elm_slideshow.eo index d4fe44c9fe..cdaf8d654a 100644 --- a/src/lib/elementary/elm_slideshow.eo +++ b/src/lib/elementary/elm_slideshow.eo @@ -310,7 +310,7 @@ class Elm.Slideshow (Efl.Ui.Layout.Object, Efl.Access.Widget.Action, Efl.Ui.Lega Efl.Access.Widget.Action.elm_actions { get; } } events { - changed; [[Called when slideshow widget changed]] - transition,end; [[Called on transition end]] + changed: Efl.Object; [[Called when slideshow widget changed]] + transition,end: Efl.Object; [[Called on transition end]] } } diff --git a/src/lib/elementary/elm_spinner.eo b/src/lib/elementary/elm_spinner.eo index bb937b8cfc..c5d1add14c 100644 --- a/src/lib/elementary/elm_spinner.eo +++ b/src/lib/elementary/elm_spinner.eo @@ -184,11 +184,12 @@ class Elm.Spinner (Efl.Ui.Layout.Object, Efl.Ui.Range, Efl.Ui.Focus.Composition, Efl.Access.Widget.Action.elm_actions { get; } } events { - changed; [[Called when spinner changed]] - delay,changed; [[Called when spinner delay changed]] - spinner,drag,start; [[Called when spinner drag started]] - spinner,drag,stop; [[Called when spinner drag stopped]] - min,reached; [[Called when spinner value reached min]] - max,reached; [[Called when spinner value reached max]] + /* FIXME: Colorselector puts Colorselector_Data here! */ + changed: void; [[Called when spinner changed]] + delay,changed: void; [[Called when spinner delay changed]] + spinner,drag,start: void; [[Called when spinner drag started]] + spinner,drag,stop: void; [[Called when spinner drag stopped]] + min,reached: void; [[Called when spinner value reached min]] + max,reached: void; [[Called when spinner value reached max]] } } diff --git a/src/lib/elementary/elm_thumb.eo b/src/lib/elementary/elm_thumb.eo index 9f7b0c508e..3be7e43c92 100644 --- a/src/lib/elementary/elm_thumb.eo +++ b/src/lib/elementary/elm_thumb.eo @@ -13,10 +13,10 @@ class Elm.Thumb (Efl.Ui.Layout.Object, Efl.File, Efl.Ui.Clickable, Efl.Ui.Draggable.drag_target { get; set; } } events { - generate,error; [[Called when an error occurred during thumbnail generation]] - generate,start; [[Called when thumbnail generation started]] - generate,stop; [[Called when thumbnail generation stopped]] - load,error; [[Called when an error occurred during loading]] - press; [[Called when pressed]] + generate,error: void; [[Called when an error occurred during thumbnail generation]] + generate,start: void; [[Called when thumbnail generation started]] + generate,stop: void; [[Called when thumbnail generation stopped]] + load,error: void; [[Called when an error occurred during loading]] + press: void; [[Called when pressed]] } } diff --git a/src/lib/elementary/elm_toolbar.eo b/src/lib/elementary/elm_toolbar.eo index 85e08bd708..4bc7d1661d 100644 --- a/src/lib/elementary/elm_toolbar.eo +++ b/src/lib/elementary/elm_toolbar.eo @@ -373,7 +373,7 @@ class Elm.Toolbar (Efl.Ui.Widget, Efl.Ui.Focus.Composition, Elm.Interface_Scroll Efl.Ui.Focus.Composition.prepare; } events { - item,focused; [[Called when toolbar item got focus]] - item,unfocused; [[Called when toolbar item lost focus]] + item,focused: Efl.Object; [[Called when toolbar item got focus]] + item,unfocused: Efl.Object; [[Called when toolbar item lost focus]] } } diff --git a/src/lib/elementary/elm_view_list.eo b/src/lib/elementary/elm_view_list.eo index 91fb080fd7..1354963429 100644 --- a/src/lib/elementary/elm_view_list.eo +++ b/src/lib/elementary/elm_view_list.eo @@ -54,7 +54,7 @@ class Elm.View.List (Efl.Object) } /* For some reason the following comment after the event doesn't work: Event dispatch when a model is selected */ events { - model,selected; [[Called when model was selected]] + model,selected: Efl.Object; [[Called when model was selected]] } implements { Efl.Object.destructor; diff --git a/src/lib/elementary/elm_web.eo b/src/lib/elementary/elm_web.eo index 0356add1a2..7f66f0c43c 100644 --- a/src/lib/elementary/elm_web.eo +++ b/src/lib/elementary/elm_web.eo @@ -442,8 +442,10 @@ class Elm.Web (Efl.Ui.Widget, Efl.Ui.Legacy, Efl.Ui.Zoom) Efl.Object.constructor; } events { + /* FIXME: Nobody is emitting these uri,changed; [[Called when URI changed]] url,changed; [[Called when URL changed]] windows,close,request; [[Called when window closed event was received]] + */ } } diff --git a/src/lib/emotion/efl_canvas_video.eo b/src/lib/emotion/efl_canvas_video.eo index 9bd0c82859..b4f9647443 100644 --- a/src/lib/emotion/efl_canvas_video.eo +++ b/src/lib/emotion/efl_canvas_video.eo @@ -68,24 +68,24 @@ class Efl.Canvas.Video (Efl.Canvas.Group, Efl.File, Efl.Player, Efl.Gfx.Image, E Efl.Gfx.Image.smooth_scale { get; set; } } events { - frame,decode; [[Called when the frame was decoded]] - position,change; [[Called when the position changed]] - length,change; [[Called when the length changed]] - frame,resize; [[Called when the frame was resized]] - playback,start; [[Called when playback started]] - playback,stop; [[Called when playback stopped]] - volume,change; [[Called when volume changed]] - channels,change; [[Called when the channels changed]] - title,change; [[Called when the title changed]] - progress,change; [[Called when the progress changed]] - ref,change; [[Called when ref changed]] - button,num,change; [[Called when button number changed]] - button,change; [[Called when button changed]] - open,done; [[Called when the files was opened]] - position,save,done; [[Called when the position was saved]] - position,save,fail; [[Called when saving the position failed]] - position,load,done; [[Called when the position loaded]] - position,load,fail; [[Called when loading the position failed]] + frame,decode: void; [[Called when the frame was decoded]] + position,change: void; [[Called when the position changed]] + length,change: void; [[Called when the length changed]] + frame,resize: void; [[Called when the frame was resized]] + playback,start: void; [[Called when playback started]] + playback,stop: void; [[Called when playback stopped]] + volume,change: void; [[Called when volume changed]] + channels,change: void; [[Called when the channels changed]] + title,change: void; [[Called when the title changed]] + progress,change: void; [[Called when the progress changed]] + ref,change: void; [[Called when ref changed]] + button,num,change: void; [[Called when button number changed]] + button,change: void; [[Called when button changed]] + open,done: void; [[Called when the files was opened]] + position,save,done: void; [[Called when the position was saved]] + position,save,fail: void; [[Called when saving the position failed]] + position,load,done: void; [[Called when the position loaded]] + position,load,fail: void; [[Called when loading the position failed]] } } diff --git a/src/lib/eo/efl_object.eo b/src/lib/eo/efl_object.eo index ed69538e43..ba68b77734 100644 --- a/src/lib/eo/efl_object.eo +++ b/src/lib/eo/efl_object.eo @@ -303,10 +303,10 @@ abstract Efl.Object () class.destructor; } events { - del @hot; [[Object is being deleted.]] - invalidate @hot; [[Object is being invalidated and loosing its parent.]] - noref @hot; [[Object has lost its last reference, only parent relationship is keeping it alive.]] - destruct @hot; [[Object has been fully destroyed. It can not be used + del @hot: void; [[Object is being deleted.]] + invalidate @hot: void; [[Object is being invalidated and loosing its parent.]] + noref @hot: void; [[Object has lost its last reference, only parent relationship is keeping it alive.]] + destruct @hot: void; [[Object has been fully destroyed. It can not be used beyond this point. This event should only serve to clean up any dangling pointer.]] } diff --git a/src/lib/eo/eina_types.eot b/src/lib/eo/eina_types.eot index 3858b36eba..95b4ee611d 100644 --- a/src/lib/eo/eina_types.eot +++ b/src/lib/eo/eina_types.eot @@ -97,4 +97,8 @@ struct @extern Eina.Stat { mtimensec: ulong; [[The nano version of the timestmap when the file was modified]] ctime : ulong; [[The tilestamp when the file was created]] ctimensec: ulong; [[The nano version of the timestmap when the file was created]] -} \ No newline at end of file +} + +/* FIXME: This definitely shouldn't be here. */ +type Efl.Event_Cb: __undefined_type; [[Efl event callback type]] + diff --git a/src/lib/evas/canvas/efl_canvas_animation_player.eo b/src/lib/evas/canvas/efl_canvas_animation_player.eo index 61e9f72d49..0418294136 100644 --- a/src/lib/evas/canvas/efl_canvas_animation_player.eo +++ b/src/lib/evas/canvas/efl_canvas_animation_player.eo @@ -47,8 +47,10 @@ class Efl.Canvas.Animation_Player (Efl.Object, Efl.Player) Efl.Player.seekable { get; } } events { - started; [[Animation is started.]] - running; [[Animation is running.]] - ended; [[Animation is ended.]] + /* FIXME: This event is similar to Efl.Canvas.Object.anim_started but with different type, might be confusing. */ + started: void; [[Animation is started.]] + running: Efl.Canvas.Object.Animation_Event; [[Animation is running.]] + /* FIXME: This event is similar to Efl.Canvas.Object.anim_ended but with different type, might be confusing. */ + ended: void; [[Animation is ended.]] } } diff --git a/src/lib/evas/canvas/efl_canvas_text.eo b/src/lib/evas/canvas/efl_canvas_text.eo index 62fcf37a11..b24139e34a 100644 --- a/src/lib/evas/canvas/efl_canvas_text.eo +++ b/src/lib/evas/canvas/efl_canvas_text.eo @@ -355,8 +355,8 @@ class Efl.Canvas.Text (Efl.Canvas.Object, Efl.Text, Efl.Gfx.Entity.scale { set; } } events { - cursor,changed; [[Called when cursor changed]] - changed; [[Called when canvas text changed ]] - style_insets,changed; [[Called when the property @.style_insets changed.]] + cursor,changed: void; [[Called when cursor changed]] + changed: void; [[Called when canvas text changed ]] + style_insets,changed: void; [[Called when the property @.style_insets changed.]] } } diff --git a/src/lib/evas/canvas/evas_box.eo b/src/lib/evas/canvas/evas_box.eo index ba805a3694..719e50aee2 100644 --- a/src/lib/evas/canvas/evas_box.eo +++ b/src/lib/evas/canvas/evas_box.eo @@ -663,7 +663,7 @@ class Evas.Box (Efl.Canvas.Group) Efl.Canvas.Group.group_calculate; } events { - child,added; [[Called when a child object was added to the box]] - child,removed; [[Called when a child object was removed from the box]] + child,added: ptr(Evas_Object_Box_Option); [[Called when a child object was added to the box]] + child,removed: Efl.Canvas.Object; [[Called when a child object was removed from the box]] } } diff --git a/src/lib/evas/canvas/evas_canvas3d_object.eo b/src/lib/evas/canvas/evas_canvas3d_object.eo index 4a6f56b022..0fa7161f29 100644 --- a/src/lib/evas/canvas/evas_canvas3d_object.eo +++ b/src/lib/evas/canvas/evas_canvas3d_object.eo @@ -70,7 +70,8 @@ class Evas.Canvas3D.Object (Efl.Object) Efl.Object.provider_find; } events { - clicked; [[Clicked Event.]] - collision; [[Collision Event.]] + /* FIXME: Make sure that these two events are actually being emitted */ + clicked: Evas.Canvas3D.Node; [[Clicked Event.]] + collision: Evas.Canvas3D.Node; [[Collision Event.]] } } diff --git a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo index 50c73d757a..5edcbcf8e9 100644 --- a/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo +++ b/src/lib/evas/gesture/efl_canvas_gesture_long_tap.eo @@ -4,7 +4,7 @@ class Efl.Canvas.Gesture_Long_Tap (Efl.Canvas.Gesture) eo_prefix: efl_gesture_long_tap; event_prefix: efl; events { - gesture,long_tap; [[Event for tap gesture]] + gesture,long_tap: Efl.Canvas.Gesture; [[Event for tap gesture]] } implements { Efl.Object.constructor; diff --git a/src/lib/evas/gesture/efl_canvas_gesture_tap.eo b/src/lib/evas/gesture/efl_canvas_gesture_tap.eo index dcb4ba6685..60bcdcacfe 100644 --- a/src/lib/evas/gesture/efl_canvas_gesture_tap.eo +++ b/src/lib/evas/gesture/efl_canvas_gesture_tap.eo @@ -4,7 +4,7 @@ class Efl.Canvas.Gesture_Tap(Efl.Canvas.Gesture) eo_prefix: efl_gesture_tap; event_prefix: efl; events { - gesture,tap; [[Event for tap gesture]] + gesture,tap: Efl.Canvas.Gesture; [[Event for tap gesture]] } implements { Efl.Object.constructor; diff --git a/src/tests/eolian_cxx/generic.eo b/src/tests/eolian_cxx/generic.eo index b6d2621448..d21473c067 100644 --- a/src/tests/eolian_cxx/generic.eo +++ b/src/tests/eolian_cxx/generic.eo @@ -105,13 +105,13 @@ class Generic (Efl.Object) Efl.Object.constructor; } events { - prefix,event1; + prefix,event1: void; prefix,event2: Generic; prefix,event3: int; prefix,event4: list; prefix,event5: Generic.Event; - protected,event1 @protected; - beta,event1 @beta; - protected,beta,event1 @beta @protected; + protected,event1 @protected: void; + beta,event1 @beta: void; + protected,beta,event1 @beta @protected: void; } }