ryujinx/GtkSharp
1
0
Fork 0
mirror of https://github.com/Ryujinx/GtkSharp.git synced 2025-11-04 13:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

glib: Add GVariant to fundamental types

Browse source 
GVariant is a fundamental type since 2.26, this commit adds it to the
fundamental type list and adds operators to construct and convert from
and to a GValue.

https://developer.gnome.org/gobject/stable/gobject-Type-Information.html#G-TYPE-VARIANT:CAPS

Signed-off-by: Bertrand Lorentz <bertrand.lorentz@gmail.com>
This commit is contained in:
Stephan Sundermann 2014-05-22 01:35:10 +02:00 committed by Bertrand Lorentz
parent b6e95af4a3
commit f38daf0d49
3 changed files with 26 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
glib/GType.cs
View file

@ -92,6 +92,8 @@ namespace GLib {
public static readonly GType Boxed = new GType ((IntPtr) TypeFundamentals.TypeBoxed);
public static readonly GType Param = new GType ((IntPtr) TypeFundamentals.TypeParam);
public static readonly GType Object = new GType ((IntPtr) TypeFundamentals.TypeObject);
public static readonly GType Variant = new GType ((IntPtr) TypeFundamentals.TypeVariant);
static IDictionary<IntPtr, Type> types = new Dictionary<IntPtr, Type> ();
static IDictionary<Type, GType> gtypes = new Dictionary<Type, GType> ();
@ -126,6 +128,7 @@ namespace GLib {
Register (GType.Pointer, typeof (IntPtr));
Register (GType.Object, typeof (GLib.Object));
Register (GType.Pointer, typeof (IntPtr));
Register (GType.Variant, typeof (GLib.Variant));
// One-way mapping
gtypes[typeof (char)] = GType.UInt;

1
glib/TypeFundamentals.cs
View file

@ -43,5 +43,6 @@ namespace GLib {
TypeBoxed = 18 << 2,
TypeParam = 19 << 2,
TypeObject = 20 << 2,
TypeVariant = 21 << 2
}
}

23
glib/Value.cs
View file

@ -121,6 +121,11 @@ namespace GLib {
g_value_set_pointer (ref this, val);
}
public Value (Variant variant) : this (GType.Variant)
{
g_value_set_variant (ref this, variant == null ? IntPtr.Zero : variant.Handle);
}
public Value (Opaque val, string type_name)
{
type = IntPtr.Zero;
@ -174,7 +179,6 @@ namespace GLib {
Marshal.FreeHGlobal (native_array);
}
public void Dispose ()
{
g_value_unset (ref this);
@ -271,6 +275,11 @@ namespace GLib {
return GLib.Opaque.GetOpaque (g_value_get_boxed (ref val), (Type) new GType (val.type), false);
}
public static explicit operator GLib.Variant (Value Val)
{
return new Variant (g_value_get_variant (ref Val));
}
public static explicit operator GLib.VariantType (Value val)
{
return new VariantType (g_value_get_boxed (ref val));
@ -467,6 +476,8 @@ namespace GLib {
return (string) this;
else if (type == GType.Pointer.Val)
return (IntPtr) this;
else if (type == GType.Variant.Val)
return (GLib.Variant) this;
else if (type == GType.Param.Val)
return g_value_get_param (ref this);
else if (type == ValueArray.GType.Val)
@ -511,6 +522,8 @@ namespace GLib {
g_value_set_float (ref this, (float) value);
else if (type == GType.Double.Val)
g_value_set_double (ref this, (double) value);
else if (type == GType.Variant.Val)
g_value_set_variant (ref this, ((GLib.Variant) value).Handle);
else if (type == GType.String.Val) {
IntPtr native = GLib.Marshaller.StringToPtrGStrdup ((string)value);
g_value_set_string (ref this, native);
@ -657,9 +670,13 @@ namespace GLib {
[DllImport (Global.GObjectNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void g_value_set_enum (ref Value val, int data);
[DllImport (Global.GObjectNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void g_value_set_flags (ref Value val, uint data);
[DllImport (Global.GObjectNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern void g_value_set_variant (ref Value val, IntPtr data);
[DllImport (Global.GObjectNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern bool g_value_get_boolean (ref Value val);
@ -716,10 +733,14 @@ namespace GLib {
[DllImport (Global.GObjectNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern int g_value_get_enum (ref Value val);
[DllImport (Global.GObjectNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern uint g_value_get_flags (ref Value val);
[DllImport (Global.GObjectNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_strv_get_type ();
[DllImport (Global.GObjectNativeDll, CallingConvention = CallingConvention.Cdecl)]
static extern IntPtr g_value_get_variant (ref Value val);
}
}