Merge pull request #973 from sdroege/value-array-pspec

glib: Implement `ValueArray` `Value` traits manually because of the c…

Author: sdroege

glib/src/value_array.rs

@@ -2,7 +2,14 @@
 
 use std::{cmp::Ordering, ops, slice};
 
-use crate::{translate::*, Value};
+use crate::{
+    prelude::*,
+    translate::*,
+    value::{
+        FromValue, GenericValueTypeOrNoneChecker, ToValueOptional, ValueType, ValueTypeOptional,
+    },
+    HasParamSpec, ParamSpecValueArray, ParamSpecValueArrayBuilder, Type, Value,
+};
 
 wrapper! {
     #[derive(Debug)]
@@ -12,7 +19,6 @@ wrapper! {
     match fn {
         copy => |ptr| gobject_ffi::g_value_array_copy(mut_override(ptr)),
         free => |ptr| gobject_ffi::g_value_array_free(ptr),
-        type_ => || gobject_ffi::g_value_array_get_type(),
     }
 }
 
@@ -136,3 +142,110 @@ impl ops::DerefMut for ValueArray {
         }
     }
 }
+
+// Implementing `Value` traits manually because of a custom ParamSpec
+impl StaticType for ValueArray {
+    #[inline]
+    fn static_type() -> Type {
+        unsafe { from_glib(gobject_ffi::g_value_array_get_type()) }
+    }
+}
+
+#[doc(hidden)]
+impl ValueType for ValueArray {
+    type Type = Self;
+}
+
+#[doc(hidden)]
+impl ValueTypeOptional for ValueArray {}
+
+#[doc(hidden)]
+unsafe impl<'a> FromValue<'a> for ValueArray {
+    type Checker = GenericValueTypeOrNoneChecker<Self>;
+
+    #[inline]
+    unsafe fn from_value(value: &'a Value) -> Self {
+        let ptr = gobject_ffi::g_value_dup_boxed(value.to_glib_none().0);
+        debug_assert!(!ptr.is_null());
+        from_glib_full(ptr as *mut gobject_ffi::GValueArray)
+    }
+}
+
+#[doc(hidden)]
+unsafe impl<'a> FromValue<'a> for &'a ValueArray {
+    type Checker = GenericValueTypeOrNoneChecker<Self>;
+
+    #[inline]
+    unsafe fn from_value(value: &'a Value) -> Self {
+        debug_assert_eq!(
+            std::mem::size_of::<Self>(),
+            std::mem::size_of::<ffi::gpointer>()
+        );
+        let value = &*(value as *const Value as *const gobject_ffi::GValue);
+        debug_assert!(!value.data[0].v_pointer.is_null());
+        <ValueArray>::from_glib_ptr_borrow(
+            &value.data[0].v_pointer as *const ffi::gpointer
+                as *const *const gobject_ffi::GValueArray,
+        )
+    }
+}
+
+#[doc(hidden)]
+impl ToValue for ValueArray {
+    #[inline]
+    fn to_value(&self) -> Value {
+        unsafe {
+            let mut value = Value::from_type_unchecked(<Self as StaticType>::static_type());
+            gobject_ffi::g_value_take_boxed(
+                value.to_glib_none_mut().0,
+                ToGlibPtr::<*mut gobject_ffi::GValueArray>::to_glib_full(self) as *mut _,
+            );
+            value
+        }
+    }
+
+    #[inline]
+    fn value_type(&self) -> Type {
+        <Self as StaticType>::static_type()
+    }
+}
+
+impl std::convert::From<ValueArray> for Value {
+    #[inline]
+    fn from(o: ValueArray) -> Self {
+        unsafe {
+            let mut value = Value::from_type_unchecked(<ValueArray as StaticType>::static_type());
+            gobject_ffi::g_value_take_boxed(
+                value.to_glib_none_mut().0,
+                IntoGlibPtr::<*mut gobject_ffi::GValueArray>::into_glib_ptr(o) as *mut _,
+            );
+            value
+        }
+    }
+}
+
+#[doc(hidden)]
+impl ToValueOptional for ValueArray {
+    #[inline]
+    fn to_value_optional(s: Option<&Self>) -> Value {
+        let mut value = Value::for_value_type::<Self>();
+        unsafe {
+            gobject_ffi::g_value_take_boxed(
+                value.to_glib_none_mut().0,
+                ToGlibPtr::<*mut gobject_ffi::GValueArray>::to_glib_full(&s) as *mut _,
+            );
+        }
+
+        value
+    }
+}
+
+impl HasParamSpec for ValueArray {
+    type ParamSpec = ParamSpecValueArray;
+    type SetValue = Self;
+    type BuilderFn = fn(&str) -> ParamSpecValueArrayBuilder;
+
+    fn param_spec_builder() -> Self::BuilderFn {
+        Self::ParamSpec::builder
+    }
+}