2018-05-17 20:50:37 -07:00
|
|
|
using System;
|
|
|
|
using System.Collections;
|
|
|
|
using System.Collections.Generic;
|
|
|
|
using System.Runtime.InteropServices;
|
|
|
|
|
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;
|
2018-05-17 20:50:37 -07: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.AccessorNativeFunctions;
|
2018-05-17 20:50:37 -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
|
|
|
namespace Eina
|
|
|
|
{
|
2018-05-17 20:50:37 -07:00
|
|
|
|
|
|
|
internal class AccessorNativeFunctions
|
|
|
|
{
|
|
|
|
[DllImport(efl.Libs.Eina)] [return: MarshalAs(UnmanagedType.U1)] public static extern bool
|
|
|
|
eina_accessor_data_get(IntPtr accessor, uint position, IntPtr data);
|
|
|
|
[DllImport(efl.Libs.Eina)] public static extern void
|
|
|
|
eina_accessor_free(IntPtr accessor);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// <summary>Accessors provide an uniform way of accessing Eina containers, similar to C++ STL's and C# IEnumerable.</summary>
|
|
|
|
public class Accessor<T> : IEnumerable<T>, IDisposable
|
|
|
|
{
|
|
|
|
/// <summary>Pointer to the native accessor.</summary>
|
|
|
|
public IntPtr Handle { get; private set; } = IntPtr.Zero;
|
|
|
|
|
|
|
|
/// <summary>Who is in charge of releasing the resources wrapped by this instance.</summary>
|
|
|
|
private Ownership Ownership { get; set; }
|
|
|
|
|
2018-05-18 19:43:09 -07:00
|
|
|
// FIXME Part of the implicit EFL Container interface. Need to make it explicit.
|
2019-03-20 03:26:49 -07:00
|
|
|
///<summary>Whether this wrapper owns the native accessor.</summary>
|
2018-05-18 19:43:09 -07:00
|
|
|
public bool Own
|
|
|
|
{
|
|
|
|
get
|
|
|
|
{
|
|
|
|
return Ownership == Ownership.Managed;
|
|
|
|
}
|
|
|
|
set
|
|
|
|
{
|
|
|
|
Ownership = value ? Ownership.Managed : Ownership.Unmanaged;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-17 20:50:37 -07:00
|
|
|
/// <summary>Create a new accessor wrapping the given pointer.</summary>
|
2019-03-20 03:26:49 -07:00
|
|
|
/// <param name="handle">The native handle to be wrapped.</param>
|
|
|
|
/// <param name="owner">Whether this wrapper owns the native accessor.</param>
|
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
|
|
|
public Accessor(IntPtr handle, Ownership owner = Ownership.Managed)
|
2018-05-17 20:50:37 -07:00
|
|
|
{
|
|
|
|
Handle = handle;
|
|
|
|
Ownership = owner;
|
|
|
|
}
|
|
|
|
|
2019-03-20 03:26:49 -07:00
|
|
|
/// <summary>Create a new accessor wrapping the given pointer.</summary>
|
|
|
|
/// <param name="handle">The native handle to be wrapped.</param>
|
|
|
|
/// <param name="own">Whether this wrapper owns the native accessor.</param>
|
|
|
|
/// <param name="ownContent">For compatibility with other EFL# containers. Ignored in acessors.</param>
|
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
|
|
|
public Accessor(IntPtr handle, bool own, bool ownContent = false)
|
2018-05-18 19:43:09 -07:00
|
|
|
: this(handle, own ? Ownership.Managed : Ownership.Unmanaged)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2018-05-17 20:50:37 -07:00
|
|
|
/// <summary>Release the native resources held by this instance.</summary>
|
|
|
|
public void Dispose()
|
|
|
|
{
|
|
|
|
Dispose(true);
|
|
|
|
}
|
|
|
|
|
2019-03-20 03:26:49 -07:00
|
|
|
/// <summary>Disposes of this wrapper, releasing the native accessor if owned.</summary>
|
|
|
|
/// <param name="disposing">True if this was called from <see cref="Dispose()"/> public method. False if
|
|
|
|
/// called from the C# finalizer.</param>
|
2018-05-17 20:50:37 -07:00
|
|
|
protected virtual void Dispose(bool disposing)
|
|
|
|
{
|
|
|
|
if (Ownership == Ownership.Managed && Handle != IntPtr.Zero)
|
|
|
|
{
|
|
|
|
eina_accessor_free(Handle);
|
|
|
|
Handle = IntPtr.Zero;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-20 03:26:49 -07:00
|
|
|
/// <summary>Finalizer to be called from the Garbage Collector.</summary>
|
2018-05-17 20:50:37 -07:00
|
|
|
~Accessor()
|
|
|
|
{
|
|
|
|
Dispose(false);
|
|
|
|
}
|
|
|
|
|
2019-03-20 03:26:49 -07:00
|
|
|
/// <summary>Convert the native data into managed. This is used when returning the data through a
|
|
|
|
/// <see cref="System.Collections.Generic.IEnumerator<T>"/>.</summary>
|
|
|
|
/// <param name="data">The data to be converted</param>
|
|
|
|
/// <returns>The managed data representing <c>data</c>.</returns>
|
|
|
|
protected virtual T Convert(IntPtr data)
|
2018-05-17 20:50:37 -07:00
|
|
|
{
|
|
|
|
return NativeToManaged<T>(data);
|
|
|
|
}
|
|
|
|
|
|
|
|
/// <summary>Returns an enumerator that iterates throught this accessor.</summary>
|
2019-03-20 03:26:49 -07:00
|
|
|
/// <returns>An enumerator to walk through the acessor items.</returns>
|
2018-05-17 20:50:37 -07:00
|
|
|
public IEnumerator<T> GetEnumerator()
|
|
|
|
{
|
|
|
|
if (Handle == 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
|
|
|
{
|
2018-05-17 20:50:37 -07:00
|
|
|
throw new ObjectDisposedException(base.GetType().Name);
|
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
|
|
|
}
|
|
|
|
|
2018-05-17 20:50:37 -07:00
|
|
|
IntPtr tmp = MemoryNative.Alloc(Marshal.SizeOf(typeof(IntPtr)));
|
|
|
|
uint position = 0;
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
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
|
|
|
while (eina_accessor_data_get(Handle, position, tmp))
|
2018-05-17 20:50:37 -07:00
|
|
|
{
|
|
|
|
IntPtr data = (IntPtr)Marshal.PtrToStructure(tmp, typeof(IntPtr));
|
|
|
|
yield return Convert(data);
|
|
|
|
position += 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
finally
|
|
|
|
{
|
|
|
|
MemoryNative.Free(tmp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
IEnumerator IEnumerable.GetEnumerator()
|
|
|
|
{
|
|
|
|
return this.GetEnumerator();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-20 03:26:49 -07:00
|
|
|
///<summary>Accessor for Inlists.</summary>
|
2018-05-17 20:50:37 -07:00
|
|
|
public class AccessorInList<T> : Accessor<T>
|
|
|
|
{
|
2019-03-20 03:26:49 -07:00
|
|
|
/// <summary>Create a new accessor wrapping the given pointer.</summary>
|
|
|
|
/// <param name="handle">The native handle to be wrapped.</param>
|
|
|
|
/// <param name="own">Whether this wrapper owns the native accessor.</param>
|
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
|
|
|
public AccessorInList(IntPtr handle, Ownership own) : base(handle, own)
|
|
|
|
{
|
|
|
|
}
|
2019-03-20 03:26:49 -07:00
|
|
|
|
|
|
|
/// <summary>Convert the native data into managed. This is used when returning the data through a
|
|
|
|
/// <see cref="System.Collections.Generic.IEnumerator<T>"/>.</summary>
|
|
|
|
/// <param name="data">The data to be converted</param>
|
|
|
|
/// <returns>The managed data representing <c>data</c>.</returns>
|
|
|
|
protected override T Convert(IntPtr data)
|
2018-05-17 20:50:37 -07:00
|
|
|
{
|
|
|
|
return NativeToManagedInlistNode<T>(data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-03-20 03:26:49 -07:00
|
|
|
///<summary>Accessor for Inarrays.</summary>
|
2018-05-17 20:50:37 -07:00
|
|
|
public class AccessorInArray<T> : Accessor<T>
|
|
|
|
{
|
2019-03-20 03:26:49 -07:00
|
|
|
/// <summary>Create a new accessor wrapping the given pointer.</summary>
|
|
|
|
/// <param name="handle">The native handle to be wrapped.</param>
|
|
|
|
/// <param name="own">Whether this wrapper owns the native accessor.</param>
|
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
|
|
|
public AccessorInArray(IntPtr handle, Ownership own) : base(handle, own)
|
|
|
|
{
|
|
|
|
}
|
2019-03-20 03:26:49 -07:00
|
|
|
|
|
|
|
/// <summary>Convert the native data into managed. This is used when returning the data through a
|
|
|
|
/// <see cref="System.Collections.Generic.IEnumerator<T>"/>.</summary>
|
|
|
|
/// <param name="data">The data to be converted</param>
|
|
|
|
/// <returns>The managed data representing <c>data</c>.</returns>
|
|
|
|
protected override T Convert(IntPtr data)
|
2018-05-17 20:50:37 -07:00
|
|
|
{
|
|
|
|
return NativeToManagedInplace<T>(data);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|