December 2004 - cells-cvs@common-lisp.net

14 Dec '04

Update of /project/cells/cvsroot/cell-cultures/hello-c In directory common-lisp.net:/tmp/cvs-serv10374/hello-c Added Files: aggregates.lisp arrays.lisp callbacks.lisp definers.lisp functions.lisp hello-c.asd hello-c.lpr libraries.lisp objects.lisp os.lisp package.lisp primitives.lisp readmacros-mcl.lisp strings.lisp Log Message: Initialization of HELLO-C, the UFFI fork Date: Tue Dec 14 04:58:49 2004 Author: ktilton

1 0

[cells-cvs] CVS update: Directory change: cell-cultures/hello-c
by ktilton＠common-lisp.net 14 Dec '04

14 Dec '04

Update of /project/cells/cvsroot/cell-cultures/hello-c In directory common-lisp.net:/tmp/cvs-serv10342/hello-c Log Message: Directory /project/cells/cvsroot/cell-cultures/hello-c added to the repository Date: Tue Dec 14 04:57:13 2004 Author: ktilton New directory cell-cultures/hello-c added

1 0

[cells-cvs] CVS update: cell-cultures/ffi-extender/arrays.lisp cell-cultures/ffi-extender/callbacks.lisp cell-cultures/ffi-extender/definers.lisp cell-cultures/ffi-extender/ffi-extender.asd cell-cultures/ffi-extender/ffi-extender.lpr
by ktilton＠common-lisp.net 14 Dec '04

14 Dec '04

Update of /project/cells/cvsroot/cell-cultures/ffi-extender In directory common-lisp.net:/tmp/cvs-serv10251/ffi-extender Modified Files: arrays.lisp callbacks.lisp definers.lisp ffi-extender.asd ffi-extender.lpr Log Message: No idea how the OpenGL stuff changed. Mostly bringing ffi-extender up to date. Date: Tue Dec 14 04:53:33 2004 Author: ktilton Index: cell-cultures/ffi-extender/arrays.lisp diff -u cell-cultures/ffi-extender/arrays.lisp:1.4 cell-cultures/ffi-extender/arrays.lisp:1.5 --- cell-cultures/ffi-extender/arrays.lisp:1.4 Sun Dec 5 05:50:54 2004 +++ cell-cultures/ffi-extender/arrays.lisp Tue Dec 14 04:53:31 2004 @@ -190,4 +190,5 @@ with-ff-array-elements make-ff-array make-floatv ff-floatv-ensure - ffx-reset fgn-alloc fgn-free gllog glfree))) \ No newline at end of file + ffx-reset fgn-alloc fgn-free gllog glfree))) + Index: cell-cultures/ffi-extender/callbacks.lisp diff -u cell-cultures/ffi-extender/callbacks.lisp:1.3 cell-cultures/ffi-extender/callbacks.lisp:1.4 --- cell-cultures/ffi-extender/callbacks.lisp:1.3 Sun Dec 5 05:50:54 2004 +++ cell-cultures/ffi-extender/callbacks.lisp Tue Dec 14 04:53:31 2004 @@ -78,4 +78,4 @@ (export '(ff-register-callable ff-defun-callable ff-def-call - ff-pointer-address))) \ No newline at end of file + ff-pointer-address))) Index: cell-cultures/ffi-extender/definers.lisp diff -u cell-cultures/ffi-extender/definers.lisp:1.3 cell-cultures/ffi-extender/definers.lisp:1.4 --- cell-cultures/ffi-extender/definers.lisp:1.3 Mon Dec 6 21:26:08 2004 +++ cell-cultures/ffi-extender/definers.lisp Tue Dec 14 04:53:31 2004 @@ -20,8 +20,7 @@ ;;; FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS ;;; IN THE SOFTWARE. -;; $Header: /project/cells/cvsroot/cell-cultures/ffi-extender/definers.lisp,v 1.3 2004/12/06 20:26:08 ktilton Exp $ - +;; $Header: /project/cells/cvsroot/cell-cultures/ffi-extender/definers.lisp,v 1.4 2004/12/14 03:53:31 ktilton Exp $ (defpackage :ffi-extender Index: cell-cultures/ffi-extender/ffi-extender.asd diff -u cell-cultures/ffi-extender/ffi-extender.asd:1.1 cell-cultures/ffi-extender/ffi-extender.asd:1.2 --- cell-cultures/ffi-extender/ffi-extender.asd:1.1 Sat Jun 26 20:38:42 2004 +++ cell-cultures/ffi-extender/ffi-extender.asd Tue Dec 14 04:53:32 2004 @@ -16,5 +16,5 @@ :long-description "FFI conveniences wrapping UFFI or native FFI" :depends-on (:uffi) :components ((:file "definers") - (:file "arrays") - (:file "callbacks"))) + (:file "arrays" :depends-on ("definers")) + (:file "callbacks" :depends-on ("definers")))) Index: cell-cultures/ffi-extender/ffi-extender.lpr diff -u cell-cultures/ffi-extender/ffi-extender.lpr:1.2 cell-cultures/ffi-extender/ffi-extender.lpr:1.3 --- cell-cultures/ffi-extender/ffi-extender.lpr:1.2 Sun Dec 5 05:50:55 2004 +++ cell-cultures/ffi-extender/ffi-extender.lpr Tue Dec 14 04:53:32 2004 @@ -10,7 +10,7 @@ (make-instance 'module :name "callbacks.lisp") (make-instance 'module :name "arrays.lisp")) :projects (list (make-instance 'project-module :name - "c:\\000000\\uffi\\uffi")) + "c:\\00\\uffi\\uffi")) :libraries nil :distributed-files nil :project-package-name :ffi-extender

1 0

[cells-cvs] CVS update: cell-cultures/cl-opengl/cl-opengl.lisp cell-cultures/cl-opengl/cl-opengl.lpr cell-cultures/cl-opengl/gl-constants.lisp cell-cultures/cl-opengl/gl-def.lisp cell-cultures/cl-opengl/gl-functions.lisp cell-cultures/cl-opengl/glut-extras.lisp cell-cultures/cl-opengl/glut-functions.lisp cell-cultures/cl-opengl/nehe-14.lisp cell-cultures/cl-opengl/ogl-macros.lisp cell-cultures/cl-opengl/ogl-utils.lisp
by ktilton＠common-lisp.net 14 Dec '04

14 Dec '04

Update of /project/cells/cvsroot/cell-cultures/cl-opengl In directory common-lisp.net:/tmp/cvs-serv10251/cl-opengl Modified Files: cl-opengl.lisp cl-opengl.lpr gl-constants.lisp gl-def.lisp gl-functions.lisp glut-extras.lisp glut-functions.lisp nehe-14.lisp ogl-macros.lisp ogl-utils.lisp Log Message: No idea how the OpenGL stuff changed. Mostly bringing ffi-extender up to date. Date: Tue Dec 14 04:53:09 2004 Author: ktilton Index: cell-cultures/cl-opengl/cl-opengl.lisp diff -u cell-cultures/cl-opengl/cl-opengl.lisp:1.5 cell-cultures/cl-opengl/cl-opengl.lisp:1.6 --- cell-cultures/cl-opengl/cl-opengl.lisp:1.5 Wed Nov 17 13:31:45 2004 +++ cell-cultures/cl-opengl/cl-opengl.lisp Tue Dec 14 04:53:05 2004 @@ -26,7 +26,7 @@ (defpackage #:cl-opengl (:nicknames #:ogl) - (:use #:common-lisp #:uffi #:ffx) + (:use #:common-lisp #:ffx) (:export #:*ogl-listing-p* #:glut-get-window #:glut-set-window Index: cell-cultures/cl-opengl/cl-opengl.lpr diff -u cell-cultures/cl-opengl/cl-opengl.lpr:1.1 cell-cultures/cl-opengl/cl-opengl.lpr:1.2 --- cell-cultures/cl-opengl/cl-opengl.lpr:1.1 Sat Jun 26 20:38:40 2004 +++ cell-cultures/cl-opengl/cl-opengl.lpr Tue Dec 14 04:53:05 2004 @@ -1,4 +1,4 @@ -;; -*- lisp-version: "6.2 [Windows] (Jun 26, 2002 11:39)"; common-graphics: "1.389.2.105.2.14"; -*- +;; -*- lisp-version: "6.2 [Windows] (Sep 3, 2004 12:04)"; common-graphics: "1.389.2.105.2.14"; -*- (in-package :common-graphics-user) @@ -18,7 +18,7 @@ (make-instance 'module :name "ogl-utils.lisp") (make-instance 'module :name "nehe-14.lisp")) :projects (list (make-instance 'project-module :name - "..\\ffi-extender\\ffi-extender")) + "c:\\cell-cultures\\ffi-extender\\ffi-extender")) :libraries nil :distributed-files nil :project-package-name :cl-opengl Index: cell-cultures/cl-opengl/gl-constants.lisp diff -u cell-cultures/cl-opengl/gl-constants.lisp:1.2 cell-cultures/cl-opengl/gl-constants.lisp:1.3 --- cell-cultures/cl-opengl/gl-constants.lisp:1.2 Fri Oct 15 05:37:55 2004 +++ cell-cultures/cl-opengl/gl-constants.lisp Tue Dec 14 04:53:05 2004 @@ -22,6 +22,7 @@ (in-package #:cl-opengl) + #| blendingfactordest |# (dfc gl_zero 0) (dfc gl_one 1) Index: cell-cultures/cl-opengl/gl-def.lisp diff -u cell-cultures/cl-opengl/gl-def.lisp:1.2 cell-cultures/cl-opengl/gl-def.lisp:1.3 --- cell-cultures/cl-opengl/gl-def.lisp:1.2 Fri Oct 1 06:01:29 2004 +++ cell-cultures/cl-opengl/gl-def.lisp Tue Dec 14 04:53:05 2004 @@ -28,6 +28,7 @@ ;;(cells::count-it ,(intern (string-upcase name$) :keyword)) (glec ',(intern name$))))) + (defun aforef (o n) (uffi:deref-array o '(:array :int) n)) Index: cell-cultures/cl-opengl/gl-functions.lisp diff -u cell-cultures/cl-opengl/gl-functions.lisp:1.4 cell-cultures/cl-opengl/gl-functions.lisp:1.5 --- cell-cultures/cl-opengl/gl-functions.lisp:1.4 Thu Oct 28 02:09:33 2004 +++ cell-cultures/cl-opengl/gl-functions.lisp Tue Dec 14 04:53:05 2004 @@ -25,7 +25,6 @@ (defparameter *ogl-listing-p* nil) (defun-ogl :void "open-gl" "glFlush" ()) - (defun-ogl :void "open-gl" "glMaterialfv" (glenum face glenum pname glfloat *params)) Index: cell-cultures/cl-opengl/glut-extras.lisp diff -u cell-cultures/cl-opengl/glut-extras.lisp:1.3 cell-cultures/cl-opengl/glut-extras.lisp:1.4 --- cell-cultures/cl-opengl/glut-extras.lisp:1.3 Fri Oct 15 05:37:55 2004 +++ cell-cultures/cl-opengl/glut-extras.lisp Tue Dec 14 04:53:05 2004 @@ -43,7 +43,7 @@ (cl-opengl-init) (unless *glut-dll* (print (list "loading GLUT" *glut-dynamic-lib* (probe-file *glut-dynamic-lib*))) - (assert (setq *glut-dll* (uffi:load-foreign-library *glut-dynamic-lib* + (assert (setq *glut-dll* (ffx:load-foreign-library *glut-dynamic-lib* :force-load #+lispworks nil #-lispworks t :module "glut")) () "Unable to load GLUT from: ~a" *glut-dynamic-lib* )) @@ -57,7 +57,7 @@ (setf (eltf argc 0) 0) (unwind-protect (progn - (glut-init argc (uffi:make-null-pointer '(:array :cstring))) + (glut-init argc (ffx:make-null-pointer '(:array :cstring))) (print "glut initialised") ) (fgn-free argc)))) @@ -73,13 +73,13 @@ (or (not (zerop (glgeterror))) (zerop w)))) -(let ((mm (uffi:allocate-foreign-object :int 1))) +(let ((mm (ffx:allocate-foreign-object :int 1))) (defun get-matrix-mode () (glgetintegerv gl_matrix_mode mm) (uffi:deref-array mm '(:array :int) 0))) -(let ((mm (uffi:allocate-foreign-object :int 1)) - (sd (uffi:allocate-foreign-object :int 1))) +(let ((mm (ffx:allocate-foreign-object :int 1)) + (sd (ffx:allocate-foreign-object :int 1))) (defun get-stack-depth () (glgetintegerv gl_matrix_mode mm) (let ((mmi (uffi:deref-array mm '(:array :int) 0))) @@ -93,7 +93,7 @@ (uffi:deref-array sd '(:array :int) 0)))) (defun cello-matrix-mode (&optional (tag :anon)) - (let ((mm (uffi:allocate-foreign-object :int 1)) + (let ((mm (ffx:allocate-foreign-object :int 1)) ) (glgetintegerv gl_matrix_mode mm) (let ((mmi (uffi:deref-array mm '(:array :int) 0))) @@ -104,7 +104,7 @@ ((eql mmi gl_texture) :texture) (t (break "gl-stack-depth> unexpected matrix mode ~a ~a" tag mmi))) - (uffi::free-foreign-object mm))))) + (ffx:free-foreign-object mm))))) (defun glut-stroke-string (font string) "Font must already have been converted to a pointer, string must be Lisp string" Index: cell-cultures/cl-opengl/glut-functions.lisp diff -u cell-cultures/cl-opengl/glut-functions.lisp:1.2 cell-cultures/cl-opengl/glut-functions.lisp:1.3 --- cell-cultures/cl-opengl/glut-functions.lisp:1.2 Wed Nov 17 13:31:45 2004 +++ cell-cultures/cl-opengl/glut-functions.lisp Tue Dec 14 04:53:05 2004 @@ -70,10 +70,13 @@ (ff-defun-callable :cdecl :void mgwclose () (print "closing callback entered")) +(FF:DEFUN-FOREIGN-CALLABLE MGWCLOSE (:VOID) (DECLARE (:CONVENTION :C)) + (PRINT "closing callback entered")) + (defpackage #:cl-opengl (:nicknames #:ogl) (:use) - (:export mgwclose #:freeg #:glut-bitmap-string #:glut-stroke-string)) + (:export #:mgwclose #:freeg #:glut-bitmap-string #:glut-stroke-string)) (defun freeg () t) Index: cell-cultures/cl-opengl/nehe-14.lisp diff -u cell-cultures/cl-opengl/nehe-14.lisp:1.2 cell-cultures/cl-opengl/nehe-14.lisp:1.3 --- cell-cultures/cl-opengl/nehe-14.lisp:1.2 Fri Oct 15 05:37:55 2004 +++ cell-cultures/cl-opengl/nehe-14.lisp Tue Dec 14 04:53:05 2004 @@ -114,13 +114,13 @@ (glut-init-window-size 640 480) ;; Window Size If We Start In Windowed Mode (let ((key "NeHe's OpenGL Framework")) - (uffi:with-cstring (key-native key) + (ffx:with-cstring (key-native key) (glut-create-window key-native))) ;(init) ; // Our Initialization ;; Set up the callbacks in OpenGL/GLUT (glut-display-func (ff-register-callable dispfunc)) - (glut-wm-close-func (ff-register-callable 'mgwclose)) + (glut-wm-close-func (ff-register-callable mgwclose)) (glut-keyboard-func (ff-register-callable 'mgwkey)) (gl-matrix-mode gl_projection) Index: cell-cultures/cl-opengl/ogl-macros.lisp diff -u cell-cultures/cl-opengl/ogl-macros.lisp:1.3 cell-cultures/cl-opengl/ogl-macros.lisp:1.4 --- cell-cultures/cl-opengl/ogl-macros.lisp:1.3 Fri Oct 15 05:37:55 2004 +++ cell-cultures/cl-opengl/ogl-macros.lisp Tue Dec 14 04:53:05 2004 @@ -102,11 +102,11 @@ (declare (ignorable load-oglfont-p)) (unless *opengl-dll* (print "loading open GL/GLU") - (uffi:load-foreign-library + (ffx:load-foreign-library *gl-dynamic-lib* :module "open-gl") ;; -lispworks#-lispworks - (setf *opengl-dll* (uffi:load-foreign-library *glu-dynamic-lib* + (setf *opengl-dll* (ffx:load-foreign-library *glu-dynamic-lib* :module "gl-util")))) (defun glec (&optional (id :anon)) Index: cell-cultures/cl-opengl/ogl-utils.lisp diff -u cell-cultures/cl-opengl/ogl-utils.lisp:1.5 cell-cultures/cl-opengl/ogl-utils.lisp:1.6 --- cell-cultures/cl-opengl/ogl-utils.lisp:1.5 Thu Oct 28 02:09:33 2004 +++ cell-cultures/cl-opengl/ogl-utils.lisp Tue Dec 14 04:53:05 2004 @@ -139,7 +139,7 @@ ;;(cells::count-it :normalize-3f) (values (+ (/ x m)) (+ (/ y m)) (+ (/ z m))))))) -(uffi:def-foreign-type bool* (* glboolean)) +(ffx:def-foreign-type bool* (* glboolean)) #-lispworks (declaim (type bool* *ogl-boolean*)) @@ -151,7 +151,7 @@ (gl-get-booleanv gl-code *ogl-boolean*) (not (zerop (uffi:deref-array *ogl-boolean* '(:array glboolean) 0)))) -(uffi:def-foreign-type glint* (* glint)) +(ffx:def-foreign-type glint* (* glint)) #-lispworks (declaim (type glint* *ogl-int*))

1 0

[cells-cvs] CVS update: cell-cultures/cells/cells.lisp
by ktilton＠common-lisp.net 14 Dec '04

14 Dec '04

Update of /project/cells/cvsroot/cell-cultures/cells In directory common-lisp.net:/tmp/cvs-serv10251/cells Modified Files: cells.lisp Log Message: No idea how the OpenGL stuff changed. Mostly bringing ffi-extender up to date. Date: Tue Dec 14 04:53:04 2004 Author: ktilton Index: cell-cultures/cells/cells.lisp diff -u cell-cultures/cells/cells.lisp:1.6 cell-cultures/cells/cells.lisp:1.7 --- cell-cultures/cells/cells.lisp:1.6 Fri Dec 10 00:01:23 2004 +++ cell-cultures/cells/cells.lisp Tue Dec 14 04:53:03 2004 @@ -104,7 +104,6 @@ (declare (ignorable slot-name self new old old-boundp))) - ; -------- cell conditions (not much used) --------------------------------------------- (define-condition xcell () ;; new 2k0227

1 0

[cells-cvs] CVS update: cell-cultures/cells/cells.lisp cell-cultures/cells/propagate.lisp
by ktilton＠common-lisp.net 09 Dec '04

09 Dec '04

Update of /project/cells/cvsroot/cell-cultures/cells In directory common-lisp.net:/tmp/cvs-serv24507/cells Modified Files: cells.lisp propagate.lisp Log Message: Backing out possibly good change to c-output-slot mechanism intended to improve programmability under Corman and CLisp, which do not handle progn method combination normally used by c-output-slot-name, just to get Vasilis's original Clisp cells-gtk working. This fix can go back in if cells-gtk gets properly ported to UFFI. Date: Fri Dec 10 00:01:30 2004 Author: ktilton Index: cell-cultures/cells/cells.lisp diff -u cell-cultures/cells/cells.lisp:1.5 cell-cultures/cells/cells.lisp:1.6 --- cell-cultures/cells/cells.lisp:1.5 Thu Oct 28 02:09:13 2004 +++ cell-cultures/cells/cells.lisp Fri Dec 10 00:01:23 2004 @@ -94,18 +94,12 @@ (define-condition unbound-cell (unbound-slot) ()) -#-(or cormanlisp clisp) (defgeneric c-output-slot-name (slotname self new old old-boundp) + #-(or cormanlisp clisp) (:method-combination progn)) -#+(and (not cells-testing) (or cormanlisp clisp)) -(defmethod c-output-slot-name (slot-name self new old old-boundp) - (declare (ignorable slot-name self new old old-boundp))) - #-cells-testing -(defmethod c-output-slot-name - #-(or cormanlisp clisp) progn - #+(or cormanlisp clisp) :before +(defmethod c-output-slot-name #-(or cormanlisp clisp) progn (slot-name self new old old-boundp) (declare (ignorable slot-name self new old old-boundp))) Index: cell-cultures/cells/propagate.lisp diff -u cell-cultures/cells/propagate.lisp:1.5 cell-cultures/cells/propagate.lisp:1.6 --- cell-cultures/cells/propagate.lisp:1.5 Sun Dec 5 05:50:32 2004 +++ cell-cultures/cells/propagate.lisp Fri Dec 10 00:01:23 2004 @@ -161,7 +161,7 @@ (format t "~&output ~d (~a ~a) old: ~a" ,temp1 ',slotname ,loc-self ,oldvarg)) (format t "~&output ~d (~a ~a) new: ~a" ,temp1 ',slotname ,loc-self ,new-varg)))) `(defmethod c-output-slot-name - #-(or clisp cormanlisp) progn #+(or clisp cormanlisp) :around + #-(or clisp cormanlisp) progn ;;broke cells-gtk #+(or clisp cormanlisp) :around ((slotname (eql ',slotname)) ,self-arg ,new-varg ,oldvarg ,oldvargboundp) (declare (ignorable ,@(flet ((arg-name (arg-spec) @@ -171,7 +171,8 @@ (list (arg-name self-arg)(arg-name new-varg) (arg-name oldvarg)(arg-name oldvargboundp))))) ,@output-body - #+(or clisp cormanlisp) (call-next-method))))) + ;;broke cells-gtk #+(or clisp cormanlisp) (call-next-method) + )))) (defmacro bump-output-count (slotname) ;; pure test func `(if (get ',slotname :outputs)

1 0

[cells-cvs] CVS update: cell-cultures/cells-gtk-root/test-images/small.png cell-cultures/cells-gtk-root/test-images/splash.png cell-cultures/cells-gtk-root/test-images/tst.gif
by ktilton＠common-lisp.net 06 Dec '04

06 Dec '04

Update of /project/cells/cvsroot/cell-cultures/cells-gtk-root/test-images In directory common-lisp.net:/tmp/cvs-serv26909/cells-gtk-root/test-images Removed Files: small.png splash.png tst.gif Log Message: Move cells-gtk from Cells project to Cells-gtk project on common-lisp.net Date: Mon Dec 6 21:29:20 2004 Author: ktilton

1 0

[cells-cvs] CVS update: cell-cultures/cells-gtk-root/gtk-ffi/gtk-ffi.asd cell-cultures/cells-gtk-root/gtk-ffi/gtk-ffi.lisp
by ktilton＠common-lisp.net 06 Dec '04

06 Dec '04

Update of /project/cells/cvsroot/cell-cultures/cells-gtk-root/gtk-ffi In directory common-lisp.net:/tmp/cvs-serv26909/cells-gtk-root/gtk-ffi Removed Files: gtk-ffi.asd gtk-ffi.lisp Log Message: Move cells-gtk from Cells project to Cells-gtk project on common-lisp.net Date: Mon Dec 6 21:29:11 2004 Author: ktilton

1 0

06 Dec '04

Update of /project/cells/cvsroot/cell-cultures/cells-gtk-root/cells-gtk/test-gtk In directory common-lisp.net:/tmp/cvs-serv26909/cells-gtk-root/cells-gtk/test-gtk Removed Files: test-addon.lisp test-buttons.lisp test-dialogs.lisp test-display.lisp test-entry.lisp test-gtk.asd test-gtk.lisp test-layout.lisp test-menus.lisp test-textview.lisp test-tree-view.lisp Log Message: Move cells-gtk from Cells project to Cells-gtk project on common-lisp.net Date: Mon Dec 6 21:28:34 2004 Author: ktilton

1 0

06 Dec '04

Update of /project/cells/cvsroot/cell-cultures/cells-gtk-root/cells-gtk In directory common-lisp.net:/tmp/cvs-serv26909/cells-gtk-root/cells-gtk Removed Files: actions.lisp addon.lisp buttons.lisp callback.lisp cells-gtk.asd cells-gtk.lisp dialogs.lisp display.lisp entry.lisp gtk-app.lisp layout.lisp menus.lisp textview.lisp tree-view.lisp widgets.lisp Log Message: Move cells-gtk from Cells project to Cells-gtk project on common-lisp.net Date: Mon Dec 6 21:28:21 2004 Author: ktilton

1 0