Backport official GLib iterator safety fix for Linux desktop
This commit is contained in:
1 parent
43c43ebdc9
commit
8ef874c609
133 files changed
+55342
-2
No files matched your search
@@ -0,0 +1,251 @@
|
||||
// Take a look at the license at the top of the repository in the LICENSE file.
|
||||
|
||||
use std::{cmp::Ordering, ops, slice};
|
||||
|
||||
use crate::{
|
||||
prelude::*,
|
||||
translate::*,
|
||||
value::{
|
||||
FromValue, GenericValueTypeOrNoneChecker, ToValueOptional, ValueType, ValueTypeOptional,
|
||||
},
|
||||
HasParamSpec, ParamSpecValueArray, ParamSpecValueArrayBuilder, Type, Value,
|
||||
};
|
||||
|
||||
wrapper! {
|
||||
#[derive(Debug)]
|
||||
#[doc(alias = "GValueArray")]
|
||||
pub struct ValueArray(Boxed<gobject_ffi::GValueArray>);
|
||||
|
||||
match fn {
|
||||
copy => |ptr| gobject_ffi::g_value_array_copy(mut_override(ptr)),
|
||||
free => |ptr| gobject_ffi::g_value_array_free(ptr),
|
||||
}
|
||||
}
|
||||
|
||||
impl ValueArray {
|
||||
#[doc(alias = "g_value_array_new")]
|
||||
pub fn new(n_prealloced: u32) -> ValueArray {
|
||||
unsafe { from_glib_full(gobject_ffi::g_value_array_new(n_prealloced)) }
|
||||
}
|
||||
|
||||
#[doc(alias = "g_value_array_append")]
|
||||
pub fn append(&mut self, value: &Value) {
|
||||
let value = value.to_glib_none();
|
||||
unsafe {
|
||||
gobject_ffi::g_value_array_append(self.to_glib_none_mut().0, value.0);
|
||||
}
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn is_empty(&self) -> bool {
|
||||
self.len() == 0
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn len(&self) -> usize {
|
||||
self.inner.n_values as usize
|
||||
}
|
||||
|
||||
#[doc(alias = "get_nth")]
|
||||
#[doc(alias = "g_value_array_get_nth")]
|
||||
pub fn nth(&self, index_: u32) -> Option<Value> {
|
||||
unsafe {
|
||||
from_glib_none(gobject_ffi::g_value_array_get_nth(
|
||||
mut_override(self.to_glib_none().0),
|
||||
index_,
|
||||
))
|
||||
}
|
||||
}
|
||||
|
||||
#[doc(alias = "g_value_array_insert")]
|
||||
pub fn insert(&mut self, index_: u32, value: &Value) {
|
||||
let value = value.to_glib_none();
|
||||
unsafe {
|
||||
gobject_ffi::g_value_array_insert(self.to_glib_none_mut().0, index_, value.0);
|
||||
}
|
||||
}
|
||||
|
||||
#[doc(alias = "g_value_array_prepend")]
|
||||
pub fn prepend(&mut self, value: &Value) {
|
||||
let value = value.to_glib_none();
|
||||
unsafe {
|
||||
gobject_ffi::g_value_array_prepend(self.to_glib_none_mut().0, value.0);
|
||||
}
|
||||
}
|
||||
|
||||
#[doc(alias = "g_value_array_remove")]
|
||||
pub fn remove(&mut self, index_: u32) {
|
||||
unsafe {
|
||||
gobject_ffi::g_value_array_remove(self.to_glib_none_mut().0, index_);
|
||||
}
|
||||
}
|
||||
|
||||
#[doc(alias = "g_value_array_sort_with_data")]
|
||||
pub fn sort_with_data<F: FnMut(&Value, &Value) -> Ordering>(&mut self, compare_func: F) {
|
||||
unsafe extern "C" fn compare_func_trampoline(
|
||||
a: ffi::gconstpointer,
|
||||
b: ffi::gconstpointer,
|
||||
func: ffi::gpointer,
|
||||
) -> i32 {
|
||||
let func = func as *mut &mut (dyn FnMut(&Value, &Value) -> Ordering);
|
||||
|
||||
let a = &*(a as *const Value);
|
||||
let b = &*(b as *const Value);
|
||||
|
||||
(*func)(a, b).into_glib()
|
||||
}
|
||||
unsafe {
|
||||
let mut func = compare_func;
|
||||
let func_obj: &mut (dyn FnMut(&Value, &Value) -> Ordering) = &mut func;
|
||||
let func_ptr =
|
||||
&func_obj as *const &mut (dyn FnMut(&Value, &Value) -> Ordering) as ffi::gpointer;
|
||||
|
||||
gobject_ffi::g_value_array_sort_with_data(
|
||||
self.to_glib_none_mut().0,
|
||||
Some(compare_func_trampoline),
|
||||
func_ptr,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ops::Deref for ValueArray {
|
||||
type Target = [Value];
|
||||
|
||||
#[inline]
|
||||
fn deref(&self) -> &[Value] {
|
||||
if self.is_empty() {
|
||||
return &[];
|
||||
}
|
||||
|
||||
unsafe {
|
||||
slice::from_raw_parts(
|
||||
(*self.as_ptr()).values as *const Value,
|
||||
(*self.as_ptr()).n_values as usize,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl ops::DerefMut for ValueArray {
|
||||
#[inline]
|
||||
fn deref_mut(&mut self) -> &mut [Value] {
|
||||
if self.is_empty() {
|
||||
return &mut [];
|
||||
}
|
||||
|
||||
unsafe {
|
||||
slice::from_raw_parts_mut(
|
||||
(*self.as_ptr()).values as *mut Value,
|
||||
(*self.as_ptr()).n_values as usize,
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 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
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user