2017-12-06 16:03:55 -08:00
|
|
|
#pragma warning disable 1591
|
|
|
|
|
2017-11-23 16:49:22 -08:00
|
|
|
using System;
|
|
|
|
using System.Runtime.InteropServices;
|
|
|
|
using System.Collections.Generic;
|
2019-10-09 21:46:51 -07:00
|
|
|
using System.ComponentModel;
|
2017-11-23 16:49:22 -08:00
|
|
|
|
csharp: Change to new class API.
Summary:
As discussed in T7204:
- Eo Interfaces/mixins -> C# Interfaces with concrete class
implementations
- Eo Regular/Abstracts -> Proper C# classes
- Added some new generators and helper methods.
- Refactored the class generator, splitting into helper methods
Eo handles now are stored only in the "root" class in any given
inheritance tree (generally, Efl.Object), and accessible to each child.
Methods also are defined in a single place instead of repeatedly
generated in everyfile, reducing the size of the generated .dll from
30MB to around 4.5MB.
Mixins are generated as C# interfaces but any regular class it inherits
from is lost, as we can't have interfaces inheriting from regular
classes. This will be dealt with in a later commit.
Summary of API Changes:
- Merged Inherit/Concrete classes. (These suffixes disappear from
regular classes).
- Interface still have implementations with 'Concrete' suffix for when
they are returned from methods.
- Removed 'I' from interface names.
- Removed interfaces for regular/abstract Eo classes.
- Concrete classes for interfaces/mixins hold the event argument struct.
- Removed '_' from classes, enums, structs, etc, as indicated in C#
naming conventions.
- Namespaces are now Camel.Cased.
- Renamed IWrapper's raw_handle/raw_klass to NativeHandle/NativeClass
Also renamed the test classes as after the namespace change, the
test namespace Test can conflict with the helper Test namespace.
(And use more meaningful names than Test.Testing...)
Also Fixes T7336 by removing a deprecated example and adding
efl_loop_timer_example to build system.
Fixes T7451 by hiding the class_get DllImports and renaming the IWrapper
fields. The native handlers are used in the manual binding.
Still need to work:
- As there are still some events names clashing (e.g. Efl.Ui.Bg with "resize"
from Efl.Gfx.Entity and Efl.Gfx.Image), Events are currently declared on
the interface and implemented "namespaced" in the classes,
requiring the cast to the interface to access the event.
- The Mixin Conundrum. Mixin inheritance will be dealt in a future
commit.
Depends on D7260
Reviewers: segfaultxavi, vitor.sousa, felipealmeida, Jaehyun_Cho
Reviewed By: vitor.sousa
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Maniphest Tasks: T7451, T7336
Differential Revision: https://phab.enlightenment.org/D7262
2018-11-29 15:04:37 -08:00
|
|
|
using static Eina.TraitFunctions;
|
|
|
|
using static Eina.IteratorNativeFunctions;
|
2017-11-23 16:49:22 -08:00
|
|
|
|
mono: fix space and brace warnings of StyleCop
Summary:
The following warning rules of StyleCop are checked.
Space rules : SA1000, SA1003, SA1008, SA1009, SA1010, SA1011
Brace rules : SA1500, SA1501, SA1502, SA1503, SA1513
Indentation is also applied.
Reviewers: lauromoura, felipealmeida, vitor.sousa, woohyun
Reviewed By: vitor.sousa
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D8485
2019-04-02 07:51:05 -07:00
|
|
|
namespace Eina
|
|
|
|
{
|
2017-11-23 16:49:22 -08:00
|
|
|
|
2019-10-09 21:46:51 -07:00
|
|
|
[EditorBrowsable(EditorBrowsableState.Never)]
|
2017-11-23 16:49:22 -08:00
|
|
|
public static class IteratorNativeFunctions
|
|
|
|
{
|
|
|
|
[DllImport(efl.Libs.Eina)] public static extern void
|
|
|
|
eina_iterator_free(IntPtr iterator);
|
|
|
|
[DllImport(efl.Libs.Eina)] public static extern IntPtr
|
|
|
|
eina_iterator_container_get(IntPtr iterator);
|
|
|
|
[DllImport(efl.Libs.Eina)] [return: MarshalAs(UnmanagedType.U1)] public static extern bool
|
|
|
|
eina_iterator_next(IntPtr iterator, out IntPtr data);
|
|
|
|
[DllImport(efl.Libs.Eina)] public static extern void
|
|
|
|
eina_iterator_foreach(IntPtr iterator, IntPtr callback, IntPtr fdata);
|
|
|
|
[DllImport(efl.Libs.Eina)] [return: MarshalAs(UnmanagedType.U1)] public static extern bool
|
|
|
|
eina_iterator_lock(IntPtr iterator);
|
|
|
|
[DllImport(efl.Libs.Eina)] [return: MarshalAs(UnmanagedType.U1)] public static extern bool
|
|
|
|
eina_iterator_unlock(IntPtr iterator);
|
|
|
|
|
|
|
|
[DllImport(efl.Libs.Eina)] public static extern IntPtr
|
|
|
|
eina_carray_iterator_new(IntPtr array);
|
|
|
|
}
|
|
|
|
|
2019-10-03 23:46:29 -07:00
|
|
|
/// <summary>Wrapper around a native Eina iterator.
|
2019-10-09 21:46:51 -07:00
|
|
|
/// <para>Since EFL 1.23.</para>
|
2019-10-03 23:46:29 -07:00
|
|
|
/// </summary>
|
2017-11-23 16:49:22 -08:00
|
|
|
public class Iterator<T> : IEnumerable<T>, IDisposable
|
|
|
|
{
|
2019-10-09 21:46:51 -07:00
|
|
|
[EditorBrowsable(EditorBrowsableState.Never)]
|
2017-11-23 16:49:22 -08:00
|
|
|
public IntPtr Handle {get;set;} = IntPtr.Zero;
|
2019-10-09 21:46:51 -07:00
|
|
|
/// <summary>Whether this wrapper owns the native iterator.
|
|
|
|
/// <para>Since EFL 1.23.</para>
|
|
|
|
/// </summary>
|
2017-11-23 16:49:22 -08:00
|
|
|
public bool Own {get;set;} = true;
|
|
|
|
|
2019-10-09 21:46:51 -07:00
|
|
|
[EditorBrowsable(EditorBrowsableState.Never)]
|
2017-11-23 16:49:22 -08:00
|
|
|
public Iterator(IntPtr handle, bool own)
|
|
|
|
{
|
|
|
|
Handle = handle;
|
|
|
|
Own = own;
|
|
|
|
}
|
|
|
|
|
2019-10-09 21:46:51 -07:00
|
|
|
/// <summary>
|
|
|
|
/// Finalizer to be called from the Garbage Collector.
|
|
|
|
/// <para>Since EFL 1.23.</para>
|
|
|
|
/// </summary>
|
2017-11-23 16:49:22 -08:00
|
|
|
~Iterator()
|
|
|
|
{
|
|
|
|
Dispose(false);
|
|
|
|
}
|
|
|
|
|
2019-10-09 21:46:51 -07:00
|
|
|
/// <summary>Disposes of this wrapper, releasing the native array if owned.
|
|
|
|
/// <para>Since EFL 1.23.</para>
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="disposing">True if this was called from <see cref="Dispose()"/> public method. False if
|
|
|
|
/// called from the C# finalizer.</param>
|
2017-11-23 16:49:22 -08:00
|
|
|
protected virtual void Dispose(bool disposing)
|
|
|
|
{
|
|
|
|
var h = Handle;
|
|
|
|
Handle = IntPtr.Zero;
|
|
|
|
if (h == IntPtr.Zero)
|
mono: fix space and brace warnings of StyleCop
Summary:
The following warning rules of StyleCop are checked.
Space rules : SA1000, SA1003, SA1008, SA1009, SA1010, SA1011
Brace rules : SA1500, SA1501, SA1502, SA1503, SA1513
Indentation is also applied.
Reviewers: lauromoura, felipealmeida, vitor.sousa, woohyun
Reviewed By: vitor.sousa
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D8485
2019-04-02 07:51:05 -07:00
|
|
|
{
|
2017-11-23 16:49:22 -08:00
|
|
|
return;
|
mono: fix space and brace warnings of StyleCop
Summary:
The following warning rules of StyleCop are checked.
Space rules : SA1000, SA1003, SA1008, SA1009, SA1010, SA1011
Brace rules : SA1500, SA1501, SA1502, SA1503, SA1513
Indentation is also applied.
Reviewers: lauromoura, felipealmeida, vitor.sousa, woohyun
Reviewed By: vitor.sousa
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D8485
2019-04-02 07:51:05 -07:00
|
|
|
}
|
2017-11-23 16:49:22 -08:00
|
|
|
|
|
|
|
if (Own)
|
mono: fix space and brace warnings of StyleCop
Summary:
The following warning rules of StyleCop are checked.
Space rules : SA1000, SA1003, SA1008, SA1009, SA1010, SA1011
Brace rules : SA1500, SA1501, SA1502, SA1503, SA1513
Indentation is also applied.
Reviewers: lauromoura, felipealmeida, vitor.sousa, woohyun
Reviewed By: vitor.sousa
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D8485
2019-04-02 07:51:05 -07:00
|
|
|
{
|
2019-04-05 15:57:29 -07:00
|
|
|
if (disposing)
|
|
|
|
{
|
|
|
|
eina_iterator_free(h);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2019-04-15 10:09:49 -07:00
|
|
|
Efl.Eo.Globals.ThreadSafeFreeCbExec(eina_iterator_free, h);
|
2019-04-05 15:57:29 -07:00
|
|
|
}
|
mono: fix space and brace warnings of StyleCop
Summary:
The following warning rules of StyleCop are checked.
Space rules : SA1000, SA1003, SA1008, SA1009, SA1010, SA1011
Brace rules : SA1500, SA1501, SA1502, SA1503, SA1513
Indentation is also applied.
Reviewers: lauromoura, felipealmeida, vitor.sousa, woohyun
Reviewed By: vitor.sousa
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D8485
2019-04-02 07:51:05 -07:00
|
|
|
}
|
2017-11-23 16:49:22 -08:00
|
|
|
}
|
|
|
|
|
2019-10-09 21:46:51 -07:00
|
|
|
/// <summary>Releases the native resources held by this instance.
|
|
|
|
/// <para>Since EFL 1.23.</para>
|
|
|
|
/// </summary>
|
2017-11-23 16:49:22 -08:00
|
|
|
public void Dispose()
|
|
|
|
{
|
|
|
|
Dispose(true);
|
|
|
|
GC.SuppressFinalize(this);
|
|
|
|
}
|
|
|
|
|
2019-10-09 21:46:51 -07:00
|
|
|
/// <summary>Releases the native resources held by this instance.
|
|
|
|
/// <para>Since EFL 1.23.</para>
|
|
|
|
/// </summary>
|
2017-11-23 16:49:22 -08:00
|
|
|
public void Free()
|
|
|
|
{
|
|
|
|
Dispose();
|
|
|
|
}
|
|
|
|
|
2019-10-09 21:46:51 -07:00
|
|
|
/// <summary>
|
|
|
|
/// Releases the native iterator.
|
|
|
|
/// <para>Since EFL 1.23.</para>
|
|
|
|
/// </summary>
|
|
|
|
/// <returns>The native array.</returns>
|
2017-11-23 16:49:22 -08:00
|
|
|
public IntPtr Release()
|
|
|
|
{
|
|
|
|
IntPtr h = Handle;
|
|
|
|
Handle = IntPtr.Zero;
|
|
|
|
return h;
|
|
|
|
}
|
|
|
|
|
2019-10-09 21:46:51 -07:00
|
|
|
/// <summary>Sets own.
|
|
|
|
/// <para>Since EFL 1.23.</para>
|
|
|
|
/// </summary>
|
|
|
|
/// <param name="own">If own the object.</param>
|
2019-06-27 09:49:42 -07:00
|
|
|
public void SetOwnership(bool own)
|
2017-11-23 16:49:22 -08:00
|
|
|
{
|
|
|
|
Own = own;
|
|
|
|
}
|
|
|
|
|
2019-10-09 21:46:51 -07:00
|
|
|
/// <summary>
|
|
|
|
/// Go to the next one.
|
|
|
|
/// <para>Since EFL 1.23.</para>
|
|
|
|
/// </summary>
|
|
|
|
///
|
2017-11-23 16:49:22 -08:00
|
|
|
public bool Next(out T res)
|
|
|
|
{
|
|
|
|
IntPtr data;
|
|
|
|
if (!eina_iterator_next(Handle, out data))
|
|
|
|
{
|
|
|
|
res = default(T);
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
res = NativeToManaged<T>(data);
|
|
|
|
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2019-10-09 21:46:51 -07:00
|
|
|
/// <summary>
|
|
|
|
/// Locks the container of the iterator.
|
|
|
|
/// <para>Since EFL 1.23.</para>
|
|
|
|
/// </summary>
|
|
|
|
/// <returns>true on success, false otherwise.</returns>
|
2017-11-23 16:49:22 -08:00
|
|
|
public bool Lock()
|
|
|
|
{
|
|
|
|
return eina_iterator_lock(Handle);
|
|
|
|
}
|
|
|
|
|
2019-10-09 21:46:51 -07:00
|
|
|
/// <summary>
|
|
|
|
/// Unlocks the container of the iterator.
|
|
|
|
/// <para>Since EFL 1.23.</para>
|
|
|
|
/// </summary>
|
|
|
|
/// <returns>true on success, false otherwise.</returns>
|
2017-11-23 16:49:22 -08:00
|
|
|
public bool Unlock()
|
|
|
|
{
|
|
|
|
return eina_iterator_unlock(Handle);
|
|
|
|
}
|
|
|
|
|
2019-10-09 21:46:51 -07:00
|
|
|
/// <summary> Gets an Enumerator for this iterator.
|
|
|
|
/// <para>Since EFL 1.23.</para>
|
|
|
|
/// </summary>
|
2017-11-23 16:49:22 -08:00
|
|
|
public IEnumerator<T> GetEnumerator()
|
|
|
|
{
|
mono: fix space and brace warnings of StyleCop
Summary:
The following warning rules of StyleCop are checked.
Space rules : SA1000, SA1003, SA1008, SA1009, SA1010, SA1011
Brace rules : SA1500, SA1501, SA1502, SA1503, SA1513
Indentation is also applied.
Reviewers: lauromoura, felipealmeida, vitor.sousa, woohyun
Reviewed By: vitor.sousa
Subscribers: cedric, #reviewers, #committers
Tags: #efl
Differential Revision: https://phab.enlightenment.org/D8485
2019-04-02 07:51:05 -07:00
|
|
|
for (T curr; Next(out curr);)
|
2017-11-23 16:49:22 -08:00
|
|
|
{
|
|
|
|
yield return curr;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()
|
|
|
|
{
|
|
|
|
return this.GetEnumerator();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|