X-Git-Url: https://git.distorted.org.uk/~mdw/clg/blobdiff_plain/d4b21b082be225e0c0edaa822bd8b1e267e2f87a..d168bafdb3b5b6614755bb431778e895122f2be5:/glib/gobject.lisp

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index be77962..620b7ba 100644
--- a/glib/gobject.lisp
+++ b/glib/gobject.lisp
@@ -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.7 2001-05-11 16:08:08 espen Exp $
+;; $Id: gobject.lisp,v 1.17 2004-11-06 21:39:58 espen Exp $
 
 (in-package "GLIB")
 
@@ -24,24 +24,94 @@
   (defclass gobject (ginstance)
     ()
     (:metaclass ginstance-class)
-    (:alien-name "GObject")
-    (:ref "g_object_ref")
-    (:unref "g_object_unref")))
+    (:alien-name "GObject")))
+
+(defmethod print-object ((instance gobject) stream)
+  (print-unreadable-object (instance stream :type t :identity nil)
+    (if (slot-boundp instance 'location)
+	(format stream "at 0x~X" (sap-int (proxy-location instance)))
+      (write-string "(destroyed)" stream))))
+
 
 (defmethod initialize-instance ((object gobject) &rest initargs)
+  ;; Extract initargs which we should pass directly to the GObeject
+  ;; constructor
+  (let* ((slotds (class-slots (class-of object)))
+	 (args (loop 
+		as tmp = initargs then (cddr tmp) while tmp
+		as key = (first tmp)
+		as value = (second tmp)
+		as slotd = (find-if
+			    #'(lambda (slotd)
+				(member key (slot-definition-initargs slotd)))
+			    slotds)
+		when (and (typep slotd 'effective-property-slot-definition)
+			  (slot-value slotd 'construct))
+		collect (progn 
+			  (remf initargs key)
+			  (list 
+			   (slot-definition-pname slotd)
+			   (slot-definition-type slotd)
+			   value)))))
+    (if args
+	(let* ((string-size (size-of 'string))
+	       (string-writer (writer-function 'string))
+	       (string-destroy (destroy-function 'string))
+	       (params (allocate-memory 
+			(* (length args) (+ string-size +gvalue-size+)))))
+	  (loop
+	   for (pname type value) in args
+	   as tmp = params then (sap+ tmp (+ string-size +gvalue-size+))
+	   do (funcall string-writer pname tmp)
+	      (gvalue-init (sap+ tmp string-size) type value))
+	  (unwind-protect
+	       (setf  
+		(slot-value object 'location) 
+		(%gobject-newv (type-number-of object) (length args) params))
+	    (loop
+	     repeat (length args)
+	     as tmp = params then (sap+ tmp (+ string-size +gvalue-size+))
+	     do (funcall string-destroy tmp)
+	        (gvalue-unset (sap+ tmp string-size)))
+	    (deallocate-memory params)))
+      (setf  
+       (slot-value object 'location) 
+       (%gobject-new (type-number-of object)))))
+  
+  (%object-weak-ref object)
+  (apply #'call-next-method object initargs))
+
+
+(defmethod initialize-instance :around ((object gobject) &rest initargs)
   (declare (ignore initargs))
-  (setf 
-   (slot-value object 'location)
-   (%gobject-new (type-number-of object)))
-  (call-next-method))
+  (call-next-method)
+  (%object-weak-ref object))
+
+
+(def-callback weak-notify (c-call:void (data c-call:int) (location system-area-pointer))
+  (let ((object (find-cached-instance location)))
+    (when object
+;;       (warn "~A being finalized by the GObject system while still in existence in lisp" object)
+      (slot-makunbound object 'location)
+      (remove-cached-instance location))))
+
+(defbinding %object-weak-ref (object) nil
+  (object gobject)
+  ((callback weak-notify) pointer)
+  (0 unsigned-int))
 
 (defbinding (%gobject-new "g_object_new") () pointer
   (type type-number)
   (nil null))
 
+(defbinding (%gobject-newv "g_object_newv") () pointer
+  (type type-number)
+  (n-parameters unsigned-int)
+  (params pointer))
+
 
 
-;;;; Parameter stuff
+;;;; Property stuff
 
 (defbinding %object-set-property () nil
   (object gobject)
@@ -75,7 +145,7 @@
 (defun (setf object-data) (data object key &key (test #'eq))
   (%object-set-qdata-full
    object (quark-from-object key :test test)
-   (register-user-data data) *destroy-notify*)
+   (register-user-data data) (callback %destroy-user-data))
   data)
 
 (defbinding %object-get-qdata () unsigned-long
@@ -90,14 +160,35 @@
 
 ;;;; Metaclass used for subclasses of gobject
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
-  (defclass gobject-class (ginstance-class))
+;(eval-when (:compile-toplevel :load-toplevel :execute)
+  (defclass gobject-class (ginstance-class)
+    ())
+
+  (defclass direct-property-slot-definition (direct-virtual-slot-definition)
+    ((pname :reader slot-definition-pname :initarg :pname)
+     (readable :initform t :reader slot-readable-p :initarg :readable)
+     (writable :initform t :reader slot-writable-p :initarg :writable)
+     (construct :initform nil :initarg :construct)))
 
-  (defclass direct-gobject-slot-definition (direct-virtual-slot-definition)
-    ((param :reader slot-definition-param)))
+  (defclass effective-property-slot-definition (effective-virtual-slot-definition)
+    ((pname :reader slot-definition-pname :initarg :pname)
+     (readable :reader slot-readable-p :initarg :readable)
+     (writable :reader slot-writable-p :initarg :writable)
+     (construct :initarg :construct)));)
 
-  (defclass effective-gobject-slot-definition
-    (effective-virtual-slot-definition)))
+(defbinding %object-ref () pointer
+  (location pointer))
+
+(defbinding %object-unref () nil
+  (location pointer))
+
+(defmethod reference-foreign ((class gobject-class) location)
+  (declare (ignore class))
+  (%object-ref location))
+
+(defmethod unreference-foreign ((class gobject-class) location)
+  (declare (ignore class))
+  (%object-unref location))
 
 
 ; (defbinding object-class-install-param () nil
@@ -109,82 +200,111 @@
 ;   (class pointer)
 ;   (name string))
 
+(defun signal-name-to-string (name)
+  (substitute #\_ #\- (string-downcase (string name))))
 
-(defmethod initialize-instance :after ((slotd direct-gobject-slot-definition)
-				       &rest initargs &key param)
-  (declare (ignore initargs))
-  (when param
-    (setf
-     (slot-value slotd 'param)
-     (signal-name-to-string (slot-definition-name slotd)))))
 
-(defmethod direct-slot-definition-class ((class gobject-class) initargs)
+(defmethod direct-slot-definition-class ((class gobject-class) &rest initargs)
   (case (getf initargs :allocation)
-    (:param (find-class 'direct-gobject-slot-definition))
+    (:property (find-class 'direct-property-slot-definition))
     (t (call-next-method))))
 
-(defmethod effective-slot-definition-class ((class gobject-class) initargs)
+(defmethod effective-slot-definition-class ((class gobject-class) &rest initargs)
   (case (getf initargs :allocation)
-    (:param (find-class 'effective-gobject-slot-definition))
+    (:property (find-class 'effective-property-slot-definition))
     (t (call-next-method))))
 
-(defmethod compute-virtual-slot-accessors
-    ((class gobject-class) (slotd effective-gobject-slot-definition)
-     direct-slotds)
-  (with-slots (type) slotd
-    (let ((param-name (slot-definition-param (first direct-slotds)))
-	  (type-number (find-type-number type))
-	  (getter (intern-reader-function type))
-	  (setter (intern-writer-function type))
-	  (destroy (intern-destroy-function type)))
-      (list
+(defmethod compute-effective-slot-definition-initargs ((class gobject-class) direct-slotds)
+  (if (eq (most-specific-slot-value direct-slotds 'allocation) :property)
+      (nconc 
+       (list :pname (signal-name-to-string 
+		     (most-specific-slot-value direct-slotds 'pname))
+	     :readable (most-specific-slot-value direct-slotds 'readable)
+	     :writable (most-specific-slot-value direct-slotds 'writable)
+	     :construct (most-specific-slot-value direct-slotds 'construct))
+       (call-next-method))
+    (call-next-method)))
+
+
+(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)))
+    (unless (slot-boundp slotd 'reader-function)
+      (setf 
+       (slot-value slotd 'reader-function)
+       (if (slot-readable-p slotd)
+	   (let () ;(reader (reader-function (type-from-number type-number))))
+	     #'(lambda (object)
+		 (let ((gvalue (gvalue-new type-number)))
+		   (%object-get-property object pname gvalue)
+		   (unwind-protect
+			(funcall #|reader|# (reader-function (type-from-number type-number))  gvalue +gvalue-value-offset+)
+		     (gvalue-free gvalue t)))))
+	   #'(lambda (value object)
+	       (error "Slot is not readable: ~A" (slot-definition-name slotd))))))
+    
+    (unless (slot-boundp slotd 'writer-function)
+      (setf 
+       (slot-value slotd 'writer-function)
+       (if (slot-writable-p slotd)
+	   (let ();; (writer (writer-function (type-from-number type-number)))
+;; 		 (destroy (destroy-function (type-from-number type-number))))
+	     #'(lambda (value object)
+		 (let ((gvalue (gvalue-new type-number)))
+		   (funcall #|writer|# (writer-function (type-from-number type-number)) value gvalue +gvalue-value-offset+)
+		   (%object-set-property object pname gvalue)
+;		   (funcall #|destroy|#(destroy-function (type-from-number type-number)) gvalue +gvalue-value-offset+)
+		   (gvalue-free gvalue t)
+		   value)))
+ 	   #'(lambda (value object)
+ 	       (error "Slot is not writable: ~A" (slot-definition-name slotd))))))
+    
+    (unless (slot-boundp slotd 'boundp-function)
+      (setf 
+       (slot-value slotd 'boundp-function)
        #'(lambda (object)
-	   (with-gc-disabled
-	     (let ((gvalue (gvalue-new type-number)))
-	       (%object-get-property object param-name gvalue)
-	       (prog1
-		   (funcall getter gvalue +gvalue-value-offset+)
-		 (gvalue-free gvalue t)))))
-       #'(lambda (value object)
-	   (with-gc-disabled
-  	     (let ((gvalue (gvalue-new type-number)))
-	       (funcall setter value gvalue +gvalue-value-offset+)
-	       (%object-set-property object param-name gvalue)
-	       (funcall destroy gvalue +gvalue-value-offset+)
-	       (gvalue-free gvalue nil)
-	       value)))))))
+	   (declare (ignore object))
+	   t))))
+  (call-next-method))
+
 
 (defmethod validate-superclass ((class gobject-class)
 				(super pcl::standard-class))
-  (subtypep (class-name super) 'gobject))
+;  (subtypep (class-name super) 'gobject)
+  t)
 
 
 
 ;;;;
 
-(defbinding %object-class-properties () pointer
+(defbinding %object-class-list-properties () pointer
   (class pointer)
   (n-properties unsigned-int :out))
 
-(defun query-object-class-properties (type)
-  (let ((class (type-class-ref type)))
-    (multiple-value-bind (array length)
-	(%object-class-properties class)
-      (map-c-array 'list #'identity array 'param length))))
-
-(defun query-object-class-dependencies (class)
-  (delete-duplicates
-   (reduce
-    #'nconc
-    (mapcar
-     #'(lambda (param)
-	 ;; A gobject does not depend on it's supertypes due to forward
-	 ;; referenced superclasses
-	 (delete-if
-	  #'(lambda (type)
-	      (type-is-p class type))
-	  (type-hierarchy (param-type param))))
-     (query-object-class-properties class)))))
+
+(defun %map-params (params length type inherited-p)
+  (if inherited-p
+      (map-c-vector 'list #'identity params 'param length)
+    (let ((properties ()))
+      (map-c-vector 'list 
+       #'(lambda (param)
+	   (when (eql (param-owner-type param) type)
+	     (push param properties)))
+       params 'param length)
+      (nreverse properties))))
+
+(defun query-object-class-properties (type &optional inherited-p)
+  (let* ((type-number (find-type-number type))
+	 (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)))
+;      (type-class-unref type-number)
+      )))
 
 
 (defun default-slot-name (name)
@@ -194,40 +314,72 @@
   (intern
    (format
     nil "~A-~A~A" class-name slot-name
-    (if (eq 'boolean type) "-p" ""))))
-
-(defun expand-gobject-type (type-number &optional slots)
-  (let* ((super (supertype type-number))
-	 (class  (type-from-number type-number))
-	 (expanded-slots
-	  (mapcar
-	   #'(lambda (param)
-	       (with-slots (name flags type documentation) param
-	         (let* ((slot-name (default-slot-name name))
-			(slot-type (type-from-number type))
-			(accessor
-			 (default-slot-accessor class slot-name slot-type)))
-		   `(,slot-name
-		     :allocation :param
-		     :param ,name
-		     ,@(when (member :writable flags)
-			 (list :writer `(setf ,accessor)))
-		     ,@(when (member :readable flags)
-			 (list :reader accessor))
-		     ,@(when (member :construct flags)
-			 (list :initarg (intern (string slot-name) "KEYWORD")))
-		     :type ,slot-type
-		     ,@(when documentation
-			 (list :documentation documentation))))))
-	   (query-object-class-properties type-number))))
-
-    `(defclass ,class (,super)
-       ,expanded-slots
-       (:metaclass gobject-class)
-       (:alien-name ,(find-type-name type-number)))))
-    
-(register-derivable-type
- 'gobject "GObject"
- :query 'query-object-class-dependencies
- :expand 'expand-gobject-type)
-
+    (if (eq type 'boolean) "-P" ""))))
+
+
+(defun slot-definition-from-property (class property)
+  (with-slots (name flags value-type documentation) property
+    (let* ((slot-name (default-slot-name name))
+	   (slot-type (or (type-from-number value-type) value-type))
+	   (accessor (default-slot-accessor class slot-name slot-type)))
+      
+      `(,slot-name
+	:allocation :property :pname ,name
+	
+	;; accessors
+	,@(cond
+	   ((and
+	     (member :writable flags) (member :readable flags)
+	     (not (member :construct-only flags)))
+	    (list :accessor accessor))
+	   ((and (member :writable flags) (not (member :construct-only flags)))
+	    (list :writer `(setf ,accessor)))
+	   ((member :readable flags)
+	    (list :reader accessor)))
+
+	;; readable/writable/construct
+	,@(when (or (not (member :writable flags))
+		    (member :construct-only flags))
+	    '(:writable nil))
+	,@(when (not (member :readable flags))
+	    '(:readable nil))
+	,@(when (or (member :construct flags) 
+		    (member :construct-only flags))
+	    '(:construct t))
+	
+	;; initargs
+	,@(when (or (member :construct flags)
+		    (member :construct-only flags)
+		    (member :writable flags))
+	    (list :initarg (intern (string slot-name) "KEYWORD")))
+	
+	:type ,slot-type
+	:documentation ,documentation))))
+
+
+(defun slot-definitions (class properties slots)
+  (loop 
+   with manual-slots = slots
+   for property in properties
+   unless (find-if 
+	   #'(lambda (slot)
+	       (destructuring-bind (name &rest args) slot
+		 (or 
+		  (equal (param-name property) (getf args :pname))
+		  (eq (default-slot-name (param-name property)) name))))
+	   manual-slots)
+   do (push (slot-definition-from-property class property) slots))
+  (delete-if #'(lambda (slot) (getf (rest slot) :ignore)) slots))
+
+
+(defun expand-gobject-type (type &optional options (metaclass 'gobject-class))
+  (let ((supers (cons (supertype type) (implements type)))
+	(class  (type-from-number type))
+	(slots (getf options :slots)))    
+    `(defclass ,class ,supers
+      ,(slot-definitions class (query-object-class-properties type) slots)
+      (:metaclass ,metaclass)
+      (:alien-name ,(find-type-name type)))))
+
+
+(register-derivable-type 'gobject "GObject" 'expand-gobject-type)