[wip] issue #84

src/function.lisp

@@ -988,7 +988,7 @@
 					    :type-desc (desc-of-type (gir-type-of ret-data)))
 	      out-args-desc)
 	(iter (for arg-data :in args-data)
-	      (with-slots (name type direction for-array-length-p)
+	      (with-slots (name type direction for-array-length-p) ; ???
 		  arg-data
 		(unless for-array-length-p
 		  (let ((arg-desc (make-instance 'variable-desc :name name

src/object.lisp

@@ -21,8 +21,11 @@
    (function-cache :reader function-cache-of)
    (method-cache :reader method-cache-of)))
 
+(defun object-class-name (obj-cls)
+  (info-get-name (info-of obj-cls)))
+
 (defmethod print-object ((obj-cls object-class) s)
-  (format s "#O<~a>" (info-get-name (info-of obj-cls))))
+  (format s "#O<~a>" (object-class-name obj-cls)))
 
 (defmethod shared-initialize :after ((object-class object-class) slot-names
 				     &key info)

src/package.lisp

@@ -166,6 +166,7 @@
    #:arguments-desc-of
    #:returns-desc-of
    #:object-class
+   #:object-class-name
    #:gir-class-of
    #:parent-of
    #:list-fields-desc

src/signal.lisp

@@ -50,11 +50,14 @@
   (declare (ignore data))
   (destroy-trampoline closure))
 
-(defun make-closure (func)
+(defun make-closure (func signal-desc)
   (let* ((g-closure-size (cffi:foreign-type-size '(:struct g-closure)))
          (closure-ptr (g-closure-new-simple
                        g-closure-size (cffi:null-pointer)))) ;; sizeof(GClosure) = 16
-    (make-trampoline func closure-ptr)
+    (flet ((cb (&rest args)
+	     (format t "DESC ~A" signal-desc)
+	     (apply func args)))
+      (make-trampoline #'cb closure-ptr))
     (g-closure-set-marshal closure-ptr (cffi:callback marshal))
     (g-closure-add-finalize-notifier closure-ptr
                                      (cffi:null-pointer)
@@ -75,7 +78,11 @@
   (let* ((object-ptr (if (typep g-object 'object-instance)
                          (this-of g-object)
                          g-object))
+	 (gir-class (when (typep g-object 'object-instance)
+                      (gir-class-of g-object)))
          (str-signal (string-downcase signal))
+	 (signal-desc (when gir-class
+			(get-signal-desc gir-class signal)))
          (c-handler (cond 
                       ((and (symbolp c-handler) (fboundp c-handler))
                        (symbol-function c-handler))
@@ -86,7 +93,7 @@
            (typecase c-handler
              (function (g-signal-connect-closure 
 			object-ptr str-signal
-			(make-closure c-handler)
+                       (make-closure c-handler signal-desc)
 			after))
              (t (g-signal-connect-data object-ptr
                                        str-signal 

test/gir-test.lisp

@@ -136,7 +136,7 @@
 (test (object-constructor :depends-on (and function enum))
       "Test the object constructor"
       (is (eql 'gir::object-instance
-	       (let ((flags (nget *gio* "ApplicationFlags" :flags_none)))
+	       (let ((flags (nget *gio* "ApplicationFlags" :handles-open)))
 		 (setf *app* (invoke (*gio* "Application" 'new)
 				     *app-id1* flags))
 		 (type-of *app*)))))
@@ -181,6 +181,20 @@
 			 time-val))
 		      'gir::struct-instance)))
 
+(test (object-signal :depends-on object-constructor)
+      "Test signal parameters mapping"
+      (is (equal '()
+		 (let* ((icon1 (gir:invoke (*gio* "ThemedIcon" 'new) "open"))
+			(icon2 (gir:invoke (*gio* "ThemedIcon" 'new) "document-new"))
+			(store (gir:invoke (*gio* "ListStore" 'new)
+					   (gir:invoke (icon1 'get-type))))
+			(calls nil))
+		   (gir:connect store 'items-changed (lambda (&rest args)
+						       (push args calls)))
+		   (gir:invoke (store 'append) icon1)
+		   (gir:invoke (store 'append) icon2)
+		   calls))))
+
 (in-suite gir)
 
 (test (array :depends-on object-method)