X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/clg/blobdiff_plain/73572c12ccd49c661d06287903bfa725f5fd93a5..73383a9efec7360f61b9ef544fdba3db61b2dd10:/glib/gobject.lisp

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index 811c837..f354992 100644
--- a/glib/gobject.lisp
+++ b/glib/gobject.lisp
@@ -1,5 +1,5 @@
 ;; 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
@@ -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
 
-;; $Id: gobject.lisp,v 1.31 2005-02-03 23:09:04 espen Exp $
+;; $Id: gobject.lisp,v 1.35 2005-03-11 10:56:58 espen Exp $
 
 (in-package "GLIB")
 
@@ -102,15 +102,16 @@ (defmethod compute-effective-slot-definition-initargs ((class gobject-class) dir
 
 
 (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 (reader-function type)))
+       (let ((reader nil))
 	 #'(lambda (object)
-	     (let ((gvalue (gvalue-new type-number)))
+	     (unless reader
+	       (setq reader (reader-function type)))
+	     (let ((gvalue (gvalue-new type)))
 	       (%object-get-property object pname gvalue)
 	       (unwind-protect
 		 (funcall reader  gvalue +gvalue-value-offset+)
@@ -119,9 +120,11 @@ (defmethod initialize-internal-slot-functions ((slotd effective-property-slot-de
     (when (and (not (slot-boundp slotd 'setter)) (slot-writable-p slotd))
       (setf 
        (slot-value slotd 'setter)
-       (let ((writer (writer-function type)))
+       (let ((writer nil))
 	 #'(lambda (value object)
-	     (let ((gvalue (gvalue-new type-number)))
+	     (unless writer
+	       (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)
@@ -155,7 +158,7 @@ (eval-when (:compile-toplevel :load-toplevel :execute)
   (defclass gobject (ginstance)
     ()
     (:metaclass gobject-class)
-    (:alien-name "GObject")))
+    (:gtype "GObject")))
 
 
 (defun initial-add (object function initargs key pkey)
@@ -329,14 +332,15 @@ (defun %map-params (params length type inherited-p)
       (nreverse properties))))
 
 (defun query-object-class-properties (type &optional inherited-p)
-  (let* ((type-number (find-type-number type))
+  (let* ((type-number (find-type-number type t))
 	 (class (type-class-ref type-number)))
     (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)
       )))
 
@@ -360,8 +364,9 @@ (defun slot-definition-from-property (class property &optional slot-name args)
       `(,slot-name
 	:allocation :property :pname ,name
 
-	,@(cond
-	   ((find :unbound args) (list :unbound (getf args :unbound))))
+	,@(when (find :unbound args) (list :unbound (getf args :unbound)))
+	,@(when (find :getter args) (list :getter (getf args :getter)))
+	,@(when (find :setter args) (list :setter (getf args :setter)))
 	
 	;; accessors
 	,@(cond
@@ -385,12 +390,15 @@ (defun slot-definition-from-property (class property &optional slot-name args)
 	    '(: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))))
@@ -420,13 +428,18 @@ (defun expand-gobject-type (type forward-p options &optional (metaclass 'gobject
 	(class  (type-from-number type))
 	(slots (getf options :slots)))    
     `(defclass ,class ,supers
-       ,(unless forward-p
-	  (slot-definitions class (query-object-class-properties type) slots))
-      (:metaclass ,metaclass)
-      (:alien-name ,(find-type-name type)))))
+	 ,(unless forward-p
+	    (slot-definitions class (query-object-class-properties type) slots))
+	 (:metaclass ,metaclass)
+	 (:gtype ,(register-type-as 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)