X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/fa30048e45d3d71f09ac0b963f7cc7d1c7769475..b8a9e4d372bce9188a094d07cc738554239d8470:/glib/gparam.lisp

diff --git a/glib/gparam.lisp b/glib/gparam.lisp
index 05ccca1..ea3fa44 100644
--- a/glib/gparam.lisp
+++ b/glib/gparam.lisp
@@ -20,7 +20,7 @@
 ;; TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
 ;; SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-;; $Id: gparam.lisp,v 1.21 2006-04-25 22:12:48 espen Exp $
+;; $Id: gparam.lisp,v 1.26 2007-08-20 10:50:25 espen Exp $
 
 (in-package "GLIB")
 
@@ -32,7 +32,8 @@ (eval-when (:compile-toplevel :load-toplevel :execute)
   (defbinding (size-of-gvalue "size_of_gvalue") () unsigned-int))
 
 (defconstant +gvalue-size+ (size-of-gvalue))
-(defconstant +gvalue-value-offset+ (size-of 'type-number))
+(defconstant +gvalue-value-offset+ 
+  (max (size-of 'type-number) (type-alignment '(unsigned-byte 64))))
 
 (defbinding (%gvalue-init "g_value_init") () nil
   (value gvalue)
@@ -41,10 +42,10 @@ (defbinding (%gvalue-init "g_value_init") () nil
 (defbinding (gvalue-unset "g_value_unset") () nil
   (value gvalue))
 
-(defun gvalue-init (gvalue type &optional (value nil value-p))
+(defun gvalue-init (gvalue type &optional (value nil value-p) temp-p)
   (%gvalue-init gvalue (find-type-number type))
   (when value-p
-    (funcall (writer-function type) value gvalue +gvalue-value-offset+)))
+    (funcall (writer-function type :temp temp-p) value gvalue +gvalue-value-offset+)))
 
 (defun gvalue-new (&optional type (value nil value-p))
   (let ((gvalue (allocate-memory +gvalue-size+)))
@@ -60,7 +61,20 @@ (defun gvalue-free (gvalue &optional (unset-p t))
     (deallocate-memory gvalue)))
 
 (defun gvalue-type (gvalue)
-  (type-from-number (ref-type-number gvalue)))
+  ;; We need to search for the for the most specific known type
+  ;; because internal types, unknown to Lisp, may be passed in GValues
+  (labels ((find-most-specific-known-type (type)
+	     (or 
+	      (type-from-number type)
+	      (let ((parent (type-parent type)))
+		(unless (zerop parent)
+		  (find-most-specific-known-type parent))))))
+    (let ((type-number (ref-type-number gvalue)))
+      (unless (zerop type-number)
+	(or     
+	 (find-most-specific-known-type type-number)
+	 ;; This will signal an error if the type hierarchy is unknown
+	 (type-from-number type-number t))))))
 
 (defun gvalue-get (gvalue)
   (funcall (reader-function (gvalue-type gvalue))
@@ -85,7 +99,7 @@ (defbinding (gvalue-p "g_type_check_value") () boolean
 (defmacro with-gvalue ((gvalue &optional type (value nil value-p)) &body body)
   `(with-memory (,gvalue +gvalue-size+)
      ,(cond
-       ((and type value-p) `(gvalue-init ,gvalue ,type ,value))
+       ((and type value-p) `(gvalue-init ,gvalue ,type ,value t))
        (type `(gvalue-init ,gvalue ,type)))
      ,@body
      ,(unless value-p `(gvalue-take ,gvalue))))