Initial checkin

[clg] / glib / gobject.lisp

diff --git a/glib/gobject.lisp b/glib/gobject.lisp
index be77962556d33081d828eb285650dcf9b2eef0c7..79ce7dc781f7c54e50d5fe21577d7751710ff25d 100644 (file)
--- 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
 
 ;; 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.15 2004-10-31 00:56:29 espen Exp $

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


@@ -25,23 +25,69 @@   (defclass gobject (ginstance)
     ()
     (:metaclass ginstance-class)
     (:alien-name "GObject")
     ()
     (:metaclass ginstance-class)
     (:alien-name "GObject")

-    (:ref "g_object_ref")
-    (:unref "g_object_unref")))
+    (:copy %object-ref)
+    (:free %object-unref)))
+

 
 (defmethod initialize-instance ((object gobject) &rest initargs)
 
 (defmethod initialize-instance ((object gobject) &rest initargs)

-  (declare (ignore initargs))
-  (setf 
-   (slot-value object 'location)
-   (%gobject-new (type-number-of object)))
-  (call-next-method))
+  (let ((slotds (class-slots (class-of object)))
+       (names (make-array 0 :adjustable t :fill-pointer t))
+       (values (make-array 0 :adjustable t :fill-pointer t)))
+
+    (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))
+     do (let ((type (find-type-number (slot-definition-type slotd))))
+         (vector-push-extend (slot-definition-pname slotd) names)
+         (vector-push-extend (gvalue-new type value) values)
+         (remf initargs key)))
+
+    (setf  
+     (slot-value object 'location) 
+     (if (zerop (length names))
+        (%gobject-new (type-number-of object))
+       (%gobject-newvv (type-number-of object) (length names) names values)))
+    
+;    (map 'nil #'gvalue-free values)
+    )
+  
+  (apply #'call-next-method object initargs))
+
+

 
 (defbinding (%gobject-new "g_object_new") () pointer
   (type type-number)
   (nil null))
 
 
 (defbinding (%gobject-new "g_object_new") () pointer
   (type type-number)
   (nil null))
 

+(defbinding (%gobject-newvv "g_object_newvv") () pointer
+  (type type-number)
+  (n-parameters unsigned-int)
+  (names (vector string))
+  (values (vector gvalue)))
+
+
+(defbinding %object-ref (type location) pointer
+  (location pointer))
+
+ (defbinding %object-unref (type location) nil
+   (location pointer))
+
+(defun object-ref (object)
+  (%object-ref nil (proxy-location object)))

 
 

+(defun object-unref (object)
+  (%object-unref nil (proxy-location object)))

 
 

-;;;; Parameter stuff
+
+
+;;;; Property stuff

 
 (defbinding %object-set-property () nil
   (object gobject)
 
 (defbinding %object-set-property () nil
   (object gobject)


@@ -91,13 +137,21 @@ (defun object-data (object key &key (test #'eq))
 ;;;; Metaclass used for subclasses of gobject
 
 (eval-when (:compile-toplevel :load-toplevel :execute)
 ;;;; Metaclass used for subclasses of gobject
 
 (eval-when (:compile-toplevel :load-toplevel :execute)

-  (defclass gobject-class (ginstance-class))
+  (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-class-install-param () nil
 
 
 ; (defbinding object-class-install-param () nil


@@ -109,82 +163,115 @@   (defclass effective-gobject-slot-definition
 ;   (class pointer)
 ;   (name string))
 
 ;   (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)
   (case (getf initargs :allocation)

-    (:param (find-class 'direct-gobject-slot-definition))
+    (:property (find-class 'direct-property-slot-definition))

     (t (call-next-method))))
 
     (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)
   (case (getf initargs :allocation)

-    (:param (find-class 'effective-gobject-slot-definition))
+    (:property (find-class 'effective-property-slot-definition))

     (t (call-next-method))))
 
     (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)
+          #'(lambda (object)
+              (with-gc-disabled
+                  (let ((gvalue (gvalue-new type-number)))
+                    (%object-get-property object pname gvalue)
+                    (unwind-protect
+                         (funcall
+                          (intern-reader-function (type-from-number type-number)) gvalue +gvalue-value-offset+) ; temporary workaround for wrong topological sorting of types
+                      (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)
+          #'(lambda (value object)
+              (with-gc-disabled
+                  (let ((gvalue (gvalue-new type-number)))
+                    (funcall
+                     (intern-writer-function (type-from-number type-number)) ; temporary
+                     value gvalue +gvalue-value-offset+)
+                    (%object-set-property object pname gvalue)
+                    (funcall
+                     (intern-destroy-function (type-from-number type-number)) ; temporary
+                     gvalue +gvalue-value-offset+)
+                    (gvalue-free gvalue nil)
+                    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)
        #'(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))
 
 (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))
 
   (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-array 'list #'identity params 'param length)
+    (let ((properties ()))
+      (map-c-array '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)
 
 
 (defun default-slot-name (name)


@@ -194,40 +281,72 @@ (defun default-slot-accessor (class-name slot-name type)
   (intern
    (format
     nil "~A-~A~A" class-name slot-name
   (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)