Changes necessary to allow saving of core images with clg.

[clg] / glib / gobject.lisp

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index a722174e7f2fdb639eb7dfd1c700b08f3a1d3bf3..5b5bf4e4d7748ce762ed22ed03753641c2ffa247 100644 (file)
--- a/glib/gobject.lisp
+++ b/glib/gobject.lisp
@@ -1,5 +1,5 @@
 ;; Common Lisp bindings for GTK+ v2.0
 ;; Common Lisp bindings for GTK+ v2.0

-;; Copyright (C) 2000-2001 Espen S. Johnsen <esj@stud.cs.uit.no>
+;; Copyright (C) 2000-2005 Espen S. Johnsen <espen@users.sf.net>

 ;;
 ;; This library is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public
 ;;
 ;; This library is free software; you can redistribute it and/or
 ;; modify it under the terms of the GNU Lesser General Public


@@ -15,7 +15,7 @@
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 ;; License along with this library; if not, write to the Free Software
 ;; Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 

-;; $Id: gobject.lisp,v 1.30 2005-02-01 15:24:52 espen Exp $
+;; $Id: gobject.lisp,v 1.34 2005-03-06 17:26:23 espen Exp $

 
 (in-package "GLIB")
 
 
 (in-package "GLIB")
 


@@ -26,8 +26,7 @@ (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass gobject-class (ginstance-class)
     ())
 
   (defclass gobject-class (ginstance-class)
     ())
 

-  (defmethod validate-superclass ((class gobject-class)
-                               (super pcl::standard-class))
+  (defmethod validate-superclass ((class gobject-class) (super standard-class))

 ;  (subtypep (class-name super) 'gobject)
     t))
 
 ;  (subtypep (class-name super) 'gobject)
     t))
 


@@ -103,17 +102,16 @@ (defmethod compute-effective-slot-definition-initargs ((class gobject-class) dir
 
 
 (defmethod initialize-internal-slot-functions ((slotd effective-property-slot-definition))
 
 
 (defmethod initialize-internal-slot-functions ((slotd effective-property-slot-definition))

-  (let* ((type (slot-definition-type slotd))
-        (pname (slot-definition-pname slotd))
-        (type-number (find-type-number type)))
+  (let ((type (slot-definition-type slotd))
+       (pname (slot-definition-pname slotd)))

     (when (and (not (slot-boundp slotd 'getter)) (slot-readable-p slotd))
       (setf 
        (slot-value slotd 'getter)
        (let ((reader nil))
         #'(lambda (object)
             (unless reader
     (when (and (not (slot-boundp slotd 'getter)) (slot-readable-p slotd))
       (setf 
        (slot-value slotd 'getter)
        (let ((reader nil))
         #'(lambda (object)
             (unless reader

-              (setq reader (reader-function type))) ;(type-from-number type-number))))
-            (let ((gvalue (gvalue-new type-number)))
+              (setq reader (reader-function type)))
+            (let ((gvalue (gvalue-new type)))

               (%object-get-property object pname gvalue)
               (unwind-protect
                 (funcall reader  gvalue +gvalue-value-offset+)
               (%object-get-property object pname gvalue)
               (unwind-protect
                 (funcall reader  gvalue +gvalue-value-offset+)


@@ -125,8 +123,8 @@ (defmethod initialize-internal-slot-functions ((slotd effective-property-slot-de
        (let ((writer nil))
         #'(lambda (value object)
             (unless writer
        (let ((writer nil))
         #'(lambda (value object)
             (unless writer

-              (setq writer (writer-function type))) ;(type-from-number type-number))))
-            (let ((gvalue (gvalue-new type-number)))
+              (setq writer (writer-function type)))
+            (let ((gvalue (gvalue-new type)))

               (funcall writer value gvalue +gvalue-value-offset+)
               (%object-set-property object pname gvalue)
               (gvalue-free gvalue t)
               (funcall writer value gvalue +gvalue-value-offset+)
               (%object-set-property object pname gvalue)
               (gvalue-free gvalue t)


@@ -160,7 +158,7 @@ (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass gobject (ginstance)
     ()
     (:metaclass gobject-class)
   (defclass gobject (ginstance)
     ()
     (:metaclass gobject-class)

-    (:alien-name "GObject")))
+    (:gtype "GObject")))

 
 
 (defun initial-add (object function initargs key pkey)
 
 
 (defun initial-add (object function initargs key pkey)


@@ -277,9 +275,14 @@ (defbinding %object-set-qdata-full () nil
   (data unsigned-long)
   (destroy-marshal pointer))
 
   (data unsigned-long)
   (destroy-marshal pointer))
 

+(defcallback user-data-destroy-func (nil (id unsigned-int))
+  (destroy-user-data id))
+
+(export 'user-data-destroy-func)
+

 (defun (setf user-data) (data object key)
   (%object-set-qdata-full object (quark-intern key)
 (defun (setf user-data) (data object key)
   (%object-set-qdata-full object (quark-intern key)

-   (register-user-data data) (callback %destroy-user-data))
+   (register-user-data data) (callback user-data-destroy-func))

   data)
 
 ;; deprecated
   data)
 
 ;; deprecated


@@ -334,9 +337,10 @@ (defun query-object-class-properties (type &optional inherited-p)
     (unwind-protect
         (multiple-value-bind (array length)
             (%object-class-list-properties class)
     (unwind-protect
         (multiple-value-bind (array length)
             (%object-class-list-properties class)

-          (unwind-protect
-               (%map-params array length type-number inherited-p)
-            (deallocate-memory array)))
+          (unless (null-pointer-p array)
+            (unwind-protect
+                (%map-params array length type-number inherited-p)
+              (deallocate-memory array))))

 ;      (type-class-unref type-number)
       )))
 
 ;      (type-class-unref type-number)
       )))
 


@@ -385,12 +389,15 @@ (defun slot-definition-from-property (class property &optional slot-name args)
            '(:construct t))
        
        ;; initargs
            '(:construct t))
        
        ;; initargs

-       ,@(when (or (member :construct flags)
-                   (member :construct-only flags)
-                   (member :writable flags))
-           (list :initarg (intern (string slot-name) "KEYWORD")))
-       ,@(cond
-          ((find :initarg args) (list :initarg (getf args :initarg))))
+       ,@(if (find :initarg args)
+             (let ((initarg (getf args :initarg)))
+               (etypecase initarg
+                 (null ())
+                 (symbol `(:initarg ,initarg))))
+           (when (or (member :construct flags)
+                     (member :construct-only flags)
+                     (member :writable flags))
+             (list :initarg (intern (string slot-name) "KEYWORD"))))

        
        :type ,slot-type
        :documentation ,documentation))))
        
        :type ,slot-type
        :documentation ,documentation))))


@@ -423,10 +430,15 @@ (defun expand-gobject-type (type forward-p options &optional (metaclass 'gobject
        ,(unless forward-p
          (slot-definitions class (query-object-class-properties type) slots))
       (:metaclass ,metaclass)
        ,(unless forward-p
          (slot-definitions class (query-object-class-properties type) slots))
       (:metaclass ,metaclass)

-      (:alien-name ,(find-type-name type)))))
+      (:gtype ,(find-type-init-function type)))))

 
 (defun gobject-dependencies (type)
 
 (defun gobject-dependencies (type)

-  (delete-duplicates (mapcar #'param-value-type (query-object-class-properties type))))
+  (delete-duplicates 
+   (cons
+    (supertype type)
+    (append 
+     (type-interfaces type)
+     (mapcar #'param-value-type (query-object-class-properties type))))))

 
 
 (register-derivable-type 'gobject "GObject" 'expand-gobject-type 'gobject-dependencies)
 
 
 (register-derivable-type 'gobject "GObject" 'expand-gobject-type 'gobject-dependencies)