Merge pull request #1003 from gtk-rs/bilelmoussaoui/objectimpl

glib: add missing ObjectImpl vfuncs overrides

Author: sdroege

glib/src/subclass/object.rs

@@ -7,12 +7,13 @@
 use std::{mem, ptr};
 
 use super::{prelude::*, Signal};
-use crate::{prelude::*, translate::*, Cast, Object, ParamSpec, Value};
+use crate::{prelude::*, translate::*, Cast, Object, ParamSpec, Slice, Value};
 
 // rustdoc-stripper-ignore-next
 /// Trait for implementors of `glib::Object` subclasses.
 ///
-/// This allows overriding the virtual methods of `glib::Object`.
+/// This allows overriding the virtual methods of `glib::Object`. Except for
+/// `finalize` as implementing `Drop` would allow the same behavior.
 pub trait ObjectImpl: ObjectSubclass + ObjectImplExt {
     // rustdoc-stripper-ignore-next
     /// Properties installed for this type.
@@ -67,6 +68,17 @@ pub trait ObjectImpl: ObjectSubclass + ObjectImplExt {
     /// error code but no memory violation) until it is dropped. `dispose()` can be executed more
     /// than once.
     fn dispose(&self) {}
+
+    // rustdoc-stripper-ignore-next
+    /// Function to be called when property change is notified for with
+    /// `self.notify("property")`.
+    fn notify(&self, pspec: &ParamSpec) {
+        self.parent_notify(pspec)
+    }
+
+    fn dispatch_properties_changed(&self, pspecs: &[ParamSpec]) {
+        self.parent_dispatch_properties_changed(pspecs)
+    }
 }
 
 #[doc(alias = "get_property")]
@@ -116,6 +128,25 @@ unsafe extern "C" fn constructed<T: ObjectImpl>(obj: *mut gobject_ffi::GObject)
     imp.constructed();
 }
 
+unsafe extern "C" fn notify<T: ObjectImpl>(
+    obj: *mut gobject_ffi::GObject,
+    pspec: *mut gobject_ffi::GParamSpec,
+) {
+    let instance = &*(obj as *mut T::Instance);
+    let imp = instance.imp();
+    imp.notify(&from_glib_borrow(pspec));
+}
+
+unsafe extern "C" fn dispatch_properties_changed<T: ObjectImpl>(
+    obj: *mut gobject_ffi::GObject,
+    n_pspecs: u32,
+    pspecs: *mut *mut gobject_ffi::GParamSpec,
+) {
+    let instance = &*(obj as *mut T::Instance);
+    let imp = instance.imp();
+    imp.dispatch_properties_changed(Slice::from_glib_borrow_num(pspecs, n_pspecs as _));
+}
+
 unsafe extern "C" fn dispose<T: ObjectImpl>(obj: *mut gobject_ffi::GObject) {
     let instance = &*(obj as *mut T::Instance);
     let imp = instance.imp();
@@ -183,6 +214,8 @@ unsafe impl<T: ObjectImpl> IsSubclassable<T> for Object {
         klass.set_property = Some(set_property::<T>);
         klass.get_property = Some(property::<T>);
         klass.constructed = Some(constructed::<T>);
+        klass.notify = Some(notify::<T>);
+        klass.dispatch_properties_changed = Some(dispatch_properties_changed::<T>);
         klass.dispose = Some(dispose::<T>);
 
         let pspecs = <T as ObjectImpl>::properties();
@@ -220,6 +253,14 @@ pub trait ObjectImplExt: ObjectSubclass {
     /// Chain up to the parent class' implementation of `glib::Object::constructed()`.
     fn parent_constructed(&self);
 
+    // rustdoc-stripper-ignore-next
+    /// Chain up to the parent class' implementation of `glib::Object::notify()`.
+    fn parent_notify(&self, pspec: &ParamSpec);
+
+    // rustdoc-stripper-ignore-next
+    /// Chain up to the parent class' implementation of `glib::Object::dispatch_properties_changed()`.
+    fn parent_dispatch_properties_changed(&self, pspecs: &[ParamSpec]);
+
     // rustdoc-stripper-ignore-next
     /// Chain up to parent class signal handler.
     fn signal_chain_from_overridden(
@@ -242,6 +283,37 @@ impl<T: ObjectImpl> ObjectImplExt for T {
         }
     }
 
+    #[inline]
+    fn parent_notify(&self, pspec: &ParamSpec) {
+        unsafe {
+            let data = T::type_data();
+            let parent_class = data.as_ref().parent_class() as *mut gobject_ffi::GObjectClass;
+
+            if let Some(ref func) = (*parent_class).notify {
+                func(
+                    self.obj().unsafe_cast_ref::<Object>().to_glib_none().0,
+                    pspec.to_glib_none().0,
+                );
+            }
+        }
+    }
+
+    #[inline]
+    fn parent_dispatch_properties_changed(&self, pspecs: &[ParamSpec]) {
+        unsafe {
+            let data = T::type_data();
+            let parent_class = data.as_ref().parent_class() as *mut gobject_ffi::GObjectClass;
+
+            if let Some(ref func) = (*parent_class).dispatch_properties_changed {
+                func(
+                    self.obj().unsafe_cast_ref::<Object>().to_glib_none().0,
+                    pspecs.len() as _,
+                    pspecs.as_ptr() as *mut _,
+                );
+            }
+        }
+    }
+
     fn signal_chain_from_overridden(
         &self,
         token: &super::SignalClassHandlerToken,