Author: mkestner
Date: 2007-10-11 12:52:26 -0400 (Thu, 11 Oct 2007)
New Revision: 87342

Added:
   branches/gtk-sharp-2-468-branch/gtk-sharp/glib/ToggleRef.cs
Modified:
   branches/gtk-sharp-2-468-branch/gtk-sharp/ChangeLog
   branches/gtk-sharp-2-468-branch/gtk-sharp/glib/Makefile.am
   branches/gtk-sharp-2-468-branch/gtk-sharp/glib/Object.cs
   branches/gtk-sharp-2-468-branch/gtk-sharp/gtk/Gtk.metadata
   branches/gtk-sharp-2-468-branch/gtk-sharp/gtk/Object.custom
Log:

2007-10-11  Mike Kestner  <[EMAIL PROTECTED]>

        * glib/Object.cs: finalization and toggle ref rework.  Queue handles
        and ToggleRefs for disposal in finalizer instead of Object references.
        Not even sure how that worked.
        * glib/ToggleRef.cs : backport from trunk. Class for GObject
        toggle ref management.
        * gtk/Object.custom: backport destroy signal implementation from
        trunk.
        * gtk/Gtk.metadata: hide Object:destroy signal.


Modified: branches/gtk-sharp-2-468-branch/gtk-sharp/ChangeLog
===================================================================
--- branches/gtk-sharp-2-468-branch/gtk-sharp/ChangeLog 2007-10-11 16:37:29 UTC 
(rev 87341)
+++ branches/gtk-sharp-2-468-branch/gtk-sharp/ChangeLog 2007-10-11 16:52:26 UTC 
(rev 87342)
@@ -1,3 +1,14 @@
+2007-10-11  Mike Kestner  <[EMAIL PROTECTED]>
+
+       * glib/Object.cs: finalization and toggle ref rework.  Queue handles
+       and ToggleRefs for disposal in finalizer instead of Object references.
+       Not even sure how that worked.
+       * glib/ToggleRef.cs : backport from trunk. Class for GObject
+       toggle ref management.
+       * gtk/Object.custom: backport destroy signal implementation from
+       trunk.
+       * gtk/Gtk.metadata: hide Object:destroy signal.
+
 2007-09-21  Mike Kestner  <[EMAIL PROTECTED]>
 
        * bootstrap-2.8: bump version for a performance and bugfix

Modified: branches/gtk-sharp-2-468-branch/gtk-sharp/glib/Makefile.am
===================================================================
--- branches/gtk-sharp-2-468-branch/gtk-sharp/glib/Makefile.am  2007-10-11 
16:37:29 UTC (rev 87341)
+++ branches/gtk-sharp-2-468-branch/gtk-sharp/glib/Makefile.am  2007-10-11 
16:52:26 UTC (rev 87342)
@@ -57,6 +57,7 @@
        Source.cs                               \
        Thread.cs                               \
        Timeout.cs                              \
+       ToggleRef.cs                            \
        TypeConverter.cs                        \
        TypeFundamentals.cs                     \
        TypeInitializerAttribute.cs             \

Modified: branches/gtk-sharp-2-468-branch/gtk-sharp/glib/Object.cs
===================================================================
--- branches/gtk-sharp-2-468-branch/gtk-sharp/glib/Object.cs    2007-10-11 
16:37:29 UTC (rev 87341)
+++ branches/gtk-sharp-2-468-branch/gtk-sharp/glib/Object.cs    2007-10-11 
16:52:26 UTC (rev 87342)
@@ -40,7 +40,19 @@
 
                ~Object ()
                {
-                       Dispose ();
+                       lock (PendingDestroys){
+                               lock (Objects) {
+                                       if (Objects[Handle] is ToggleRef)
+                                               PendingDestroys.Add 
(Objects[Handle]);
+                                       else
+                                               PendingDestroys.Add (Handle);
+                                       Objects.Remove(Handle);
+                               }
+                               if (!idle_queued){
+                                       Timeout.Add (50, new TimeoutHandler 
(PerformQueuedUnrefs));
+                                       idle_queued = true;
+                               }
+                       }
                }
 
                [DllImport("libgobject-2.0-0.dll")]
@@ -48,28 +60,20 @@
                
                static bool PerformQueuedUnrefs ()
                {
-                       Object [] objects;
+                       object[] references;
 
                        lock (PendingDestroys){
-                               objects = new Object [PendingDestroys.Count];
-                               PendingDestroys.CopyTo (objects, 0);
+                               references = new object [PendingDestroys.Count];
+                               PendingDestroys.CopyTo (references, 0);
                                PendingDestroys.Clear ();
+                               idle_queued = false;
                        }
-                       lock (typeof (Object))
-                               idle_queued = false;
 
-                       foreach (Object o in objects){
-                               if (o._obj == IntPtr.Zero)
-                                       continue;
-
-                               try {
-                                       g_object_unref (o._obj);
-                               } catch (Exception e) {
-                                       Console.WriteLine ("Exception while 
disposing a " + o + " in Gtk#");
-                                       throw e;
-                               }
-                               Objects.Remove (o._obj);
-                               o._obj = IntPtr.Zero;
+                       foreach (object r in references){
+                               if (r is ToggleRef)
+                                       (r as ToggleRef).Free ();
+                               else if (((IntPtr)r) != IntPtr.Zero)
+                                       g_object_unref ((IntPtr)r);
                        }
                        return false;
                }
@@ -80,15 +84,19 @@
                                return;
 
                        disposed = true;
-                       lock (PendingDestroys){
-                               PendingDestroys.Add (this);
-                               lock (typeof (Object)){
-                                       if (!idle_queued){
-                                               Timeout.Add (50, new 
TimeoutHandler (PerformQueuedUnrefs));
-                                               idle_queued = true;
-                                       }
-                               }
+                       try {
+                               ToggleRef toggle_ref = Objects [_obj] as 
ToggleRef;
+                               if (toggle_ref == null) {
+                                       if (_obj != IntPtr.Zero)
+                                               g_object_unref (_obj);
+                               } else
+                                       toggle_ref.Free ();
+                       } catch (Exception e) {
+                               Console.WriteLine ("Exception while disposing a 
" + this + " in Gtk#");
+                               throw e;
                        }
+                       Objects.Remove (_obj);
+                       _obj = IntPtr.Zero;
                        GC.SuppressFinalize (this);
                }
 
@@ -101,20 +109,19 @@
                                return null;
 
                        Object obj = null;
-                       WeakReference weak_ref = Objects[o] as WeakReference;
+                       object reference = Objects[o];
 
-                       if (weak_ref != null && weak_ref.IsAlive)
+                       if (reference is WeakReference) {
+                               WeakReference weak_ref = reference as 
WeakReference;
+                               if (weak_ref.IsAlive)
                                obj = weak_ref.Target as Object;
+                       } else if (reference is ToggleRef) {
+                               ToggleRef toggle_ref = reference as ToggleRef;
+                               if (toggle_ref.IsAlive)
+                                       obj = toggle_ref.Target;
+                       }
 
-                       if (obj == null)
-                               obj = Objects[o] as Object;
-
                        if (obj != null && obj._obj == o) {
-                               if (obj.disposed) {
-                                       lock (PendingDestroys)
-                                               PendingDestroys.Remove (obj);
-                                       obj.disposed = false;
-                               }
                                if (owned_ref)
                                        g_object_unref (obj._obj);
                                return obj;
@@ -180,7 +187,6 @@
                [DllImport("glibsharpglue-2")]
                static extern IntPtr gtksharp_register_type (IntPtr name, 
IntPtr parent_type);
 
-
                static int type_uid;
                static string BuildEscapedName (System.Type t)
                {
@@ -245,6 +251,11 @@
                        Raw = raw;
                }
 
+               protected Object ()
+               {
+                       CreateNativeObject (new string [0], new GLib.Value [0]);
+               }
+
                [DllImport("libgobject-2.0-0.dll")]
                static extern IntPtr g_object_new (IntPtr gtype, IntPtr dummy);
 
@@ -263,7 +274,7 @@
                        for (int i = 0; i < names.Length; i++)
                                native_names [i] = 
GLib.Marshaller.StringToPtrGStrdup (names [i]);
                        Raw = gtksharp_object_newv (LookupGType ().Val, 
names.Length, native_names, vals);
-                       Objects [_obj] = this;
+                       Objects [_obj] = new ToggleRef (this);
                        foreach (IntPtr p in native_names)
                                GLib.Marshaller.Free (p);
                }

Added: branches/gtk-sharp-2-468-branch/gtk-sharp/glib/ToggleRef.cs
===================================================================
--- branches/gtk-sharp-2-468-branch/gtk-sharp/glib/ToggleRef.cs 2007-10-11 
16:37:29 UTC (rev 87341)
+++ branches/gtk-sharp-2-468-branch/gtk-sharp/glib/ToggleRef.cs 2007-10-11 
16:52:26 UTC (rev 87342)
@@ -0,0 +1,113 @@
+// GLib.ToggleRef.cs - GLib ToggleRef class implementation
+//
+// Author: Mike Kestner <[EMAIL PROTECTED]>
+//
+// Copyright <c> 2007 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the Lesser GNU General 
+// Public License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GLib {
+
+       using System;
+       using System.Runtime.InteropServices;
+
+       internal class ToggleRef {
+
+               IntPtr handle;
+               object reference;
+               GCHandle gch;
+
+               public ToggleRef (GLib.Object target)
+               {
+                       handle = target.Handle;
+                       gch = GCHandle.Alloc (this);
+                       reference = target;
+                       g_object_add_toggle_ref (target.Handle, 
ToggleNotifyCallback, (IntPtr) gch);
+                       g_object_unref (target.Handle);
+               }
+
+               public bool IsAlive {
+                       get {
+                               if (reference is WeakReference) {
+                                       WeakReference weak = reference as 
WeakReference;
+                                       return weak.IsAlive;
+                               }
+                               return true;
+                       }
+               }
+
+               public GLib.Object Target {
+                       get {
+                               if (reference is GLib.Object)
+                                       return reference as GLib.Object;
+
+                               WeakReference weak = reference as WeakReference;
+                               return weak.Target as GLib.Object;
+                       }
+               }
+
+               public void Free ()
+               {
+                       g_object_remove_toggle_ref (handle, 
ToggleNotifyCallback, (IntPtr) gch);
+                       reference = null;
+                       gch.Free ();
+               }
+
+               void Toggle (bool is_last_ref)
+               {
+                       if (is_last_ref && reference is GLib.Object)
+                               reference = new WeakReference (reference);
+                       else if (!is_last_ref && reference is WeakReference) {
+                               WeakReference weak = reference as WeakReference;
+                               if (weak.IsAlive)
+                                       reference = weak.Target;
+                       }
+               }
+
+               [CDeclCallback]
+               delegate void ToggleNotifyHandler (IntPtr data, IntPtr handle, 
bool is_last_ref);
+
+               static void RefToggled (IntPtr data, IntPtr handle, bool 
is_last_ref)
+               {
+                       try {
+                               GCHandle gch = (GCHandle) data;
+                               ToggleRef tref = gch.Target as ToggleRef;
+                               tref.Toggle (is_last_ref);
+                       } catch (Exception e) {
+                               ExceptionManager.RaiseUnhandledException (e, 
false);
+                       }
+               }
+
+               static ToggleNotifyHandler toggle_notify_callback;
+               static ToggleNotifyHandler ToggleNotifyCallback {
+                       get {
+                               if (toggle_notify_callback == null)
+                                       toggle_notify_callback = new 
ToggleNotifyHandler (RefToggled);
+                               return toggle_notify_callback;
+                       }
+               }
+
+               [DllImport("libgobject-2.0-0.dll")]
+               static extern void g_object_add_toggle_ref (IntPtr raw, 
ToggleNotifyHandler notify_cb, IntPtr data);
+
+               [DllImport("libgobject-2.0-0.dll")]
+               static extern void g_object_remove_toggle_ref (IntPtr raw, 
ToggleNotifyHandler notify_cb, IntPtr data);
+
+               [DllImport("libgobject-2.0-0.dll")]
+               static extern void g_object_unref (IntPtr raw);
+
+       }
+}

Modified: branches/gtk-sharp-2-468-branch/gtk-sharp/gtk/Gtk.metadata
===================================================================
--- branches/gtk-sharp-2-468-branch/gtk-sharp/gtk/Gtk.metadata  2007-10-11 
16:37:29 UTC (rev 87341)
+++ branches/gtk-sharp-2-468-branch/gtk-sharp/gtk/Gtk.metadata  2007-10-11 
16:52:26 UTC (rev 87342)
@@ -416,7 +416,7 @@
   <attr path="/api/namespace/[EMAIL PROTECTED]'GtkObject']/[EMAIL 
PROTECTED]'SetDataByIdFull']/*/[EMAIL PROTECTED]'destroy']" 
name="type">GtkDestroyNotify</attr>
   <attr path="/api/namespace/[EMAIL PROTECTED]'GtkObject']/[EMAIL 
PROTECTED]'Weakref']/*/[EMAIL PROTECTED]'notify']" 
name="type">GtkDestroyNotify</attr>
   <attr path="/api/namespace/[EMAIL PROTECTED]'GtkObject']/[EMAIL 
PROTECTED]'Weakunref']/*/[EMAIL PROTECTED]'notify']" 
name="type">GtkDestroyNotify</attr>
-  <attr path="/api/namespace/[EMAIL PROTECTED]'GtkObject']/[EMAIL 
PROTECTED]'Destroy']" name="name">Destroyed</attr>
+  <attr path="/api/namespace/[EMAIL PROTECTED]'GtkObject']/[EMAIL 
PROTECTED]'Destroy']" name="hidden">1</attr>
   <attr path="/api/namespace/[EMAIL PROTECTED]'GtkPlug']/[EMAIL 
PROTECTED]'gtk_plug_new']" name="hidden">1</attr>
   <attr path="/api/namespace/[EMAIL PROTECTED]'GtkPlug']/[EMAIL 
PROTECTED]'gtk_plug_new_for_display']" name="hidden">1</attr>
   <attr path="/api/namespace/[EMAIL PROTECTED]'GtkPrinter']/[EMAIL 
PROTECTED]'AcceptsPdf']" name="name">GetAcceptsPdf</attr>

Modified: branches/gtk-sharp-2-468-branch/gtk-sharp/gtk/Object.custom
===================================================================
--- branches/gtk-sharp-2-468-branch/gtk-sharp/gtk/Object.custom 2007-10-11 
16:37:29 UTC (rev 87341)
+++ branches/gtk-sharp-2-468-branch/gtk-sharp/gtk/Object.custom 2007-10-11 
16:52:26 UTC (rev 87342)
@@ -1,8 +1,9 @@
 // Gtk.Object.custom - Gtk Object class customizations
 //
-// Author: Mike Kestner <[EMAIL PROTECTED]>
+// Author: Mike Kestner <[EMAIL PROTECTED]>
 //
 // Copyright (c) 2002-2003 Mike Kestner
+// Copyright (c) 2007 Novell, Inc.
 //
 // This code is inserted after the automatically generated code.
 //
@@ -20,25 +21,65 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA 02111-1307, USA.
 
+               static Hashtable destroy_handlers;
+               static Hashtable DestroyHandlers {
+                       get {
+                               if (destroy_handlers == null)
+                                       destroy_handlers = new Hashtable ();
+                               return destroy_handlers;
+                       }
+               }
 
-               [DllImport("gtksharpglue-2")]
-               private static extern bool gtksharp_object_is_floating (IntPtr 
raw);
+               private static void OverrideDestroyed (GLib.GType gtype)
+               {
+                       // Do Nothing.  We don't want to hook into the native 
vtable.
+                       // We will manually invoke the VM on signal invocation. 
The signal
+                       // always raises before the default handler because 
this signal
+                       // is RUN_CLEANUP.
+               }
 
-               [DllImport("gtksharpglue-2")]
-               private static extern bool gtksharp_object_set_floating (IntPtr 
raw, bool val);
+               [GLib.DefaultSignalHandler(Type=typeof(Gtk.Object), 
ConnectionMethod="OverrideDestroyed")]
+               protected virtual void OnDestroyed ()
+               {
+                       if (DestroyHandlers [Handle] == null)
+                               return;
 
-               [DllImport("libgobject-2.0-0.dll")]
-               private static extern void g_object_ref (IntPtr raw);
+                       EventHandler handler = (EventHandler) DestroyHandlers 
[Handle];
+                       handler (this, EventArgs.Empty);
+                       DestroyHandlers [Handle] = null;
+               }
 
+               [GLib.Signal("destroy")]
+               public event EventHandler Destroyed {
+                       add {
+                               EventHandler handler = (EventHandler) 
DestroyHandlers [Handle];
+                               DestroyHandlers [Handle] = Delegate.Combine 
(handler, value);
+                       }
+                       remove {
+                               EventHandler handler = (EventHandler) 
DestroyHandlers [Handle];
+                               DestroyHandlers [Handle] = Delegate.Remove 
(handler, value);
+                       }
+               }
+
+               event EventHandler InternalDestroyed {
+                       add {
+                               GLib.Signal sig = GLib.Signal.Lookup (this, 
"destroy");
+                               sig.AddDelegate (value);
+                       }
+                       remove {
+                               GLib.Signal sig = GLib.Signal.Lookup (this, 
"destroy");
+                               sig.RemoveDelegate (value);
+                       }
+               }
+
                static void NativeDestroy (object o, EventArgs args)
                {
                        Gtk.Object obj = o as Gtk.Object;
                        if (obj == null)
                                return;
-                       obj.Destroyed -= NativeDestroyHandler;
-                       obj.Dispose ();
+                       obj.OnDestroyed ();
                }
-
+               
                static EventHandler native_destroy_handler;
                static EventHandler NativeDestroyHandler {
                        get {
@@ -51,15 +92,17 @@
                protected override void CreateNativeObject (string[] names, 
GLib.Value[] vals)
                {
                        base.CreateNativeObject (names, vals);
-                       Destroyed += NativeDestroyHandler;
                }
 
                public override void Dispose ()
                {
+                       InternalDestroyed -= NativeDestroyHandler;
                        base.Dispose ();
-                       Destroyed -= NativeDestroyHandler;
                }
 
+               [DllImport("libgobject-2.0-0.dll")]
+               private static extern void g_object_ref (IntPtr raw);
+
                protected override IntPtr Raw {
                        get {
                                return base.Raw;
@@ -71,6 +114,7 @@
 
                                g_object_ref (value);
                                Sink ();
+                               InternalDestroyed += NativeDestroyHandler;
                        }
                }
 
@@ -79,9 +123,16 @@
 
                public virtual void Destroy ()
                {
-                       gtk_object_destroy (Handle);
+                       if (Handle != IntPtr.Zero)
+                               gtk_object_destroy (Handle);
                }
 
+               [DllImport("gtksharpglue-2")]
+               private static extern bool gtksharp_object_is_floating (IntPtr 
raw);
+
+               [DllImport("gtksharpglue-2")]
+               private static extern bool gtksharp_object_set_floating (IntPtr 
raw, bool val);
+
                public bool IsFloating {
                        get {
                                return gtksharp_object_is_floating (Handle);

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to