remove dep on pfff etc.

Author: lispnik

.appveyor.yml

@@ -12,7 +12,6 @@ install:
   - cmd: C:\Cache\sbcl\sbcl --non-interactive --load C:\cache\quicklisp.lisp --eval "(quicklisp-quickstart:install)" --eval "(ql-util:without-prompting (ql:add-to-init-file))"
   - ps: cp -Recurse . C:\users\appveyor\quicklisp\local-projects\iup
   - cmd: git clone --depth=1 "https://github.com/lispnik/tecgraf-libs.git" "C:\Users\appveyor\quicklisp\local-projects\tecgraf-libs"
-  - cmd: git clone --depth=1 "https://github.com/lispnik/pffft.git" "C:\Users\Appveyor\quicklisp\local-projects\pffft"
   - cmd: git clone --depth=1 "https://github.com/lispnik/tecgraf-base.git" "C:\Users\appveyor\quicklisp\local-projects\tecgraf-base"
   - cmd: git clone --depth=1 "https://github.com/lispnik/im.git" "C:\Users\Appveyor\quicklisp\local-projects\im"
   - cmd: git clone --depth=1 "https://github.com/lispnik/cd.git" "C:\Users\Appveyor\quicklisp\local-projects\cd"
@@ -42,5 +41,4 @@ test: off
 #   - cmd: %SBCL_HOME%\sbcl --noinform --non-interactive --load %CACHE\quicklisp.lisp --eval "(quicklisp-quickstart:install)"
 #   - cmd: git clone --depth=1 "https://github.com/lispnik/im.git" "c:\quicklisp\local-projects\im"
 #   - cmd: git clone --depth=1 "https://github.com/lispnik/cd.git" "c:\quicklisp\local-projects\cd"
-#   - cmd: git clone --depth=1 "https://github.com/lispnik/pfft.git" "c:\quicklisp\local-projects\pffft"
 #   - cmd: git clone --depth=1 "https://github.com/lispnik/tecgraf-libs.git" "c:\quicklisp\local-projects\tecgraf-libs"

README.org

@@ -71,8 +71,6 @@ Download/clone the following systems:
 
 - lispnik/`tecgraf-base`
 
-- lispnik/`pffft`
-
 Those are required by Iup. 
 
 Then load iup.asd in the usual way (e.g. `(ql:quickload "iup")`

gl/gl-cffi.lisp

@@ -1,6 +1,6 @@
 (defpackage #:iup-gl-cffi
   (:use #:common-lisp)
-  (:import-from #:tecgraf-base #:ihandle))
+  (:import-from #:iup-cffi #:ihandle))
 
 (in-package #:iup-gl-cffi)
 

glcontrols/glcontrols-cffi.lisp

@@ -1,6 +1,6 @@
 (defpackage #:iup-glcontrols-cffi
-  (:use #:common-lisp)
-  (:import-from #:tecgraf-base #:ihandle))
+  (:use #:common-lisp
+	#:iup-cffi))
 
 (in-package #:iup-glcontrols-cffi)
 

im/im-cffi.lisp

@@ -1,6 +1,6 @@
 (defpackage #:iup-im-cffi
   (:use #:common-lisp)
-  (:import-from #:tecgraf-base #:ihandle))
+  (:import-from #:iup-cffi #:ihandle))
 
 (in-package #:iup-im-cffi)
 

iup.asd

@@ -29,5 +29,4 @@
                #:trivial-arguments
                #:split-sequence
                #:parse-number
-               #:pffft
                #:tecgraf-base))

iup/callback.lisp

@@ -3,21 +3,18 @@
 (defun %make-key (name handle)
   (format nil "~A-~X"
           name
-          (cffi:pointer-address (pffft:pointer handle))))
+          handle))
 
 (defvar *registered-callbacks* (make-hash-table :test 'equal))
 
 (defun register-callback (name handle action)
-  (check-type handle tecgraf-base:ihandle)
   (setf (gethash (%make-key name handle) *registered-callbacks*)
         action))
 
 (defun unregister-callback (name handle)
-  (check-type handle tecgraf-base:ihandle)
   (remhash (%make-key name handle) *registered-callbacks*))
 
 (defun find-callback (name handle)
-  (check-type handle tecgraf-base:ihandle)
   (gethash (%make-key name handle) *registered-callbacks*))
 
 (defun unregister-all-callbacks ()

iup/classes.lisp

@@ -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 . tecgraf-base:ihandle)))
+    (#\n . iup-cffi:ihandle)))
 
 (defun class-callback-name (classname callback-name package)
   (declare (ignore package))
@@ -56,7 +56,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 tecgraf-base:ihandle) arg-list))))
+                         finally (return (list* '(arg0 iup-cffi: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/iup-cffi.lisp

@@ -1,7 +1,7 @@
 (defpackage #:iup-cffi
   (:use #:common-lisp
         #:alexandria)
-  (:import-from #:tecgraf-base #:ihandle))
+  (:export #:ihandle))
 
 (in-package #:iup-cffi)
 
@@ -12,14 +12,7 @@
 
 (cffi:use-foreign-library iup)
 
-(defmethod print-object ((object ihandle) stream)
-  (print-unreadable-object (object stream :type t)
-    (let ((pointer (pffft:pointer object)))
-      (if (cffi:null-pointer-p pointer)
-          (write-string "NULL" stream)
-          (format stream "~S ~X"
-                  (iup-cffi::%iup-get-class-name object)
-                  (cffi:pointer-address pointer))))))
+(cffi:defctype ihandle :pointer)
 
 (defun attr-name-from-c (value)
   (if (cffi:null-pointer-p value) nil value))

plot/plot-cffi.lisp

@@ -1,6 +1,6 @@
 (defpackage #:iup-plot-cffi
   (:use #:common-lisp)
-  (:import-from #:tecgraf-base #:ihandle))
+  (:import-from #:iup-cffi #:ihandle))
 
 (in-package #:iup-plot-cffi)
 

scintilla/scintilla-cffi.lisp

@@ -1,6 +1,6 @@
 (defpackage #:iup-scintilla-cffi
   (:use #:common-lisp)
-  (:import-from #:tecgraf-base #:ihandle))
+  (:import-from #:iup-cffi #:ihandle))
 
 (in-package #:iup-scintilla-cffi)