Pass around Lisp object instead of foreign addresses

Author: lispnik

classesdb.lisp-sexp

@@ -1,4 +1,4 @@
-;;; generated at 2019-05-18T16:24:05.000000Z for IUP 3.27 -*-lisp-*-
+;;; generated at 2019-05-23T18:15:44.000000Z for IUP 3.27 -*-lisp-*-
 
 ((:PLATFORM :LINUX :METADATA
   ((:PACKAGE "IUP" :CLASSNAMES

examples/plot.dat renamed to examples/incomplete/plot.dat

@@ -1,5 +1,6 @@
 (defpackage #:iup-gl-cffi
-  (:use #:common-lisp))
+  (:use #:common-lisp)
+  (:import-from #:tecgraf-base #:ihandle))
 
 (in-package #:iup-gl-cffi)
 
@@ -13,23 +14,23 @@
 (cffi:defcfun (%iup-gl-canvas-open "IupGLCanvasOpen") :void)
 
 (cffi:defcfun (%iup-gl-make-current "IupGLMakeCurrent") :void
-  (handle iup-cffi::ihandle))
+  (handle ihandle))
 
 (cffi:defcfun (%iup-gl-is-current "IupGLIsCurrent") :boolean
-  (handle iup-cffi::ihandle))
+  (handle ihandle))
 
 (cffi:defcfun (%iup-gl-swap-buffers "IupGLSwapBuffers") :void
-  (handle iup-cffi::ihandle))
+  (handle ihandle))
 
 (cffi:defcfun (%iup-gl-palette "IupGLPalette") :void
-  (handle iup-cffi::ihandle)
+  (handle ihandle)
   (index :int)
   (r :float)
   (g :float)
   (b :float))
 
 (cffi:defcfun (%iup-gl-use-font "IupGLUseFont") :void
-  (handle iup-cffi::ihandle)
+  (handle ihandle)
   (first :int)
   (count :int)
   (list-base :int))

examples/plottest.lisp renamed to examples/incomplete/plottest.lisp

@@ -1,5 +1,6 @@
 (defpackage #:iup-glcontrols-cffi
-  (:use #:common-lisp))
+  (:use #:common-lisp)
+  (:import-from #:tecgraf-base #:ihandle))
 
 (in-package #:iup-glcontrols-cffi)
 
@@ -13,21 +14,21 @@
 (cffi:defcfun (%iup-glcontrols-open "IupGLControlsOpen") :int)
 
 (cffi:defcfun (%iup-glcontrols-draw-image "IupGLDrawImage") :void
-  (handle iup-cffi::ihandle)
+  (handle ihandle)
   (name :string)
   (x :int)
   (y :int)
   (active-p :boolean))
 
 (cffi:defcfun (%iup-glcontrols-draw-text "IupGLDrawText") :void
-  (handle iup-cffi::ihandle)
+  (handle ihandle)
   (string :string)
   (length :int)
   (x :int)
   (y :int))
 
 (cffi:defcfun (%iup-glcontrols-draw-get-text-size "IupGLDrawGetTextSize") :void
-  (handle iup-cffi::ihandle)
+  (handle ihandle)
   (string :string)
   (length :int)
   (x (:pointer :int))

gl/gl-cffi.lisp

@@ -1,5 +1,6 @@
 (defpackage #:iup-im-cffi
-  (:use #:common-lisp))
+  (:use #:common-lisp)
+  (:import-from #:tecgraf-base #:ihandle))
 
 (in-package #:iup-im-cffi)
 
@@ -10,18 +11,18 @@
 
 (cffi:use-foreign-library iup-im)
 
-(cffi:defcfun (%iup-im-load-image "IupLoadImage") iup-cffi::ihandle
+(cffi:defcfun (%iup-im-load-image "IupLoadImage") ihandle
   (filename :string))
 
 (cffi:defcfun (%iup-im-save-image "IupSaveImage") :int
-  (handle iup-cffi::ihandle)
+  (handle ihandle)
   (filename :string)
   (format :string))
 
-(cffi:defcfun (%iup-im-load-animation "IupLoadAnimation") iup-cffi::ihandle
+(cffi:defcfun (%iup-im-load-animation "IupLoadAnimation") ihandle
   (filename :string))
 
-(cffi:defcfun (%iup-im-load-animation-frames "IupLoadAnimation") iup-cffi::ihandle
+(cffi:defcfun (%iup-im-load-animation-frames "IupLoadAnimation") ihandle
   (filename-list :string)
   (filename-count :int))
 
@@ -34,9 +35,9 @@
   (handle im-cffi::im-image))
 
 (cffi:defcfun (%iup-im-iup-image-from-im-image "IupImageFromImImage")
-    iup-cffi::ihandle
+    ihandle
   (handle im-cffi::im-image))
 
 (cffi:defcfun (%iup-im-iup-image-to-im-image "IupImageToImImage")
     im-cffi::im-image
-  (handle iup-cffi::ihandle))
+  (handle ihandle))

glcontrols/glcontrols-cffi.lisp

@@ -3,4 +3,5 @@
   :components ((:file "cd-cffi"))
   :depends-on (#:cd-cffi
 	       #:iup-cffi
+               #:tecgraf-base
 	       #:cffi))

im/im-cffi.lisp

@@ -1,5 +1,4 @@
 (defsystem #:iup-cffi
   :pathname "iup/"
   :components ((:file "iup-cffi"))
-  :depends-on (#:cffi
-               #:pffft))
+  :depends-on (#:cffi #:tecgraf-base))

iup-cd-cffi.asd

@@ -1,4 +1,4 @@
 (defsystem #:iup-classesdb-cffi
   :pathname "classesdb/"
   :components ((:file "classesdb-cffi"))
-  :depends-on (#:cffi))
+  :depends-on (#:cffi #:tecgraf-base))

iup-cffi.asd

@@ -2,4 +2,5 @@
   :pathname "controls/"
   :components ((:file "controls-cffi"))
   :depends-on (#:iup-cffi
+               #:tecgraf-base
 	       #:cffi))

iup-classesdb-cffi.asd

@@ -2,4 +2,5 @@
   :pathname "gl/"
   :components ((:file "gl-cffi"))
   :depends-on (#:iup-cffi
+               #:tecgraf-base
 	       #:cffi))

iup-controls-cffi.asd

@@ -2,4 +2,5 @@
   :pathname "glcontrols"
   :components ((:file "glcontrols-cffi"))
   :depends-on (#:iup-cffi
+               #:tecgraf-base
 	       #:cffi))

iup-gl-cffi.asd

@@ -3,4 +3,5 @@
   :components ((:file "im-cffi"))
   :depends-on (#:im-cffi
 	       #:iup-cffi
+               #:tecgraf-base
 	       #:cffi))

iup-glcontrols-cffi.asd

@@ -2,4 +2,5 @@
   :pathname "imglib"
   :components ((:file "imglib-cffi"))
   :depends-on (#:iup-cffi
+               #:tecgraf-base
 	       #:cffi))

iup-im-cffi.asd

@@ -2,4 +2,5 @@
   :pathname "mglplot"
   :components ((:file "mglplot-cffi"))
   :depends-on (#:iup-cffi
+               #:tecgraf-base
 	       #:cffi))

iup-imglib-cffi.asd

@@ -2,4 +2,5 @@
   :pathname "olecontrol"
   :components ((:file "olecontrol-cffi"))
   :depends-on (#:iup-cffi
+               #:tecgraf-base
 	       #:cffi))

iup-mglplot-cffi.asd

@@ -3,4 +3,5 @@
   :components ((:file "plot-cffi"))
   :depends-on (#:iup-cffi
 	       #:cd-cffi
+               #:tecgraf-base
 	       #:cffi))

iup-olecontrol-cffi.asd

@@ -2,4 +2,5 @@
   :pathname "scintilla"
   :components ((:file "scintilla-cffi"))
   :depends-on (#:iup-cffi
+               #:tecgraf-base
 	       #:cffi))

iup-plot-cffi.asd

@@ -2,4 +2,5 @@
   :pathname "tuio"
   :components ((:file "tuio-cffi"))
   :depends-on (#:iup-cffi
+               #:tecgraf-base
 	       #:cffi))

iup-scintilla-cffi.asd

@@ -3,4 +3,5 @@
   :components ((:file "web-cffi"))
   :depends-on (#:iup-cffi
 	       #:cffi
+               #:tecgraf-base
 	       #:serapeum))

iup-tuio-cffi.asd

@@ -9,25 +9,25 @@
   'callback=
   (lambda (callback)
     (sxhash (cl:list (callback-name callback)
-		     (callback-handle callback))))
+		     (pffft:pointer (callback-handle callback)))))
   (lambda (a b)
     (and (eq (callback-name a)
 	     (callback-name b))
-	 (cffi:pointer-eq (callback-handle a)
-			  (callback-handle b))))))
+	 (cffi:pointer-eq (pffft:pointer (callback-handle a))
+			  (pffft:pointer (callback-handle b)))))))
 
 (defvar *registered-callbacks* (genhash:make-generic-hash-table :test 'callback=))
 
 (defun register-callback (name handle action)
-  (check-type handle cffi:foreign-pointer)
+  (check-type handle tecgraf-base:ihandle)
   (let ((callback (make-callback :name name :handle handle)))
     (setf (genhash:hashref callback *registered-callbacks*)
 	  action)))
 
 (defun unregister-callback (name handle)
-  (check-type handle cffi:foreign-pointer)
+  (check-type handle tecgraf-base:ihandle)
   (genhash:hashrem (make-callback :name name :handle handle) *registered-callbacks*))
 
 (defun find-callback (name handle)
-  (check-type handle cffi:foreign-pointer)
+  (check-type handle tecgraf-base:ihandle)
   (genhash:hashref (make-callback :name name :handle handle) *registered-callbacks*))

iup-web-cffi.asd

@@ -10,7 +10,7 @@
     (#\V . :pointer)    ;*void
     (#\C . :pointer)    ;*cdCanvas
     (#\v . :pointer)    ;FIXME Asked about this on mailing list, confirmed it should be "C"
-    (#\n . :pointer)))  ;*Ihandle
+    (#\n . tecgraf-base:ihandle)))
 
 (defun class-callback-name (classname callback-name package)
   (intern (format nil "~:@(~A-~A~)" classname callback-name) package))
@@ -55,7 +55,7 @@
                          for s = (assoc-value *iup-callback-encoding* c :test #'char=)
                          for arg = (intern (format nil "ARG~A" i))
                          collect (cl:list arg s) into arg-list
-                         finally (return (list* '(arg0 :pointer) arg-list))))
+                         finally (return (list* '(arg0 tecgraf-base:ihandle) arg-list))))
          (return-and-arg-list (cl:list return-type arg-list))
          (callback-name (class-callback-name classname name package)))
     `(cffi:defcallback ,callback-name ,@return-and-arg-list

iup/callback.lisp

@@ -1,6 +1,7 @@
 (defpackage #:iup-cffi
   (:use #:common-lisp
-        #:alexandria))
+        #:alexandria)
+  (:import-from #:tecgraf-base #:ihandle))
 
 (in-package #:iup-cffi)
 
@@ -11,8 +12,6 @@
 
 (cffi:use-foreign-library iup)
 
-(pffft:define-foreign-pointer-wrapper ihandle)
-
 (defmethod print-object ((object ihandle) stream)
   (print-unreadable-object (object stream :type t)
     (let ((pointer (pffft:pointer object)))
@@ -291,7 +290,7 @@
 
 ;; int       IupClassMatch(Ihandle* ih, const char* classname);
 
-(cffi:defcfun (%iup-create "IupCreate") iup-cffi::ihandle
+(cffi:defcfun (%iup-create "IupCreate") ihandle
   (classname :string))
 
 ;; /* IupImage utility */