April 2005 - cells-cvs@common-lisp.net - mailman3.common-lisp.net

[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 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/ffi-extender In directory common-lisp.net:/tmp/cvs-serv12564/ffi-extender Removed Files: arrays.lisp callbacks.lisp definers.lisp ffi-extender.asd ffi-extender.lpr Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:31 2005 Author: ktilton

1 0

[cells-cvs] CVS update: cell-cultures/utils-kt/utils-kt.lpr
by ktilton＠common-lisp.net 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/utils-kt In directory common-lisp.net:/tmp/cvs-serv12564/utils-kt Modified Files: utils-kt.lpr Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:30 2005 Author: ktilton Index: cell-cultures/utils-kt/utils-kt.lpr diff -u cell-cultures/utils-kt/utils-kt.lpr:1.2 cell-cultures/utils-kt/utils-kt.lpr:1.3 --- cell-cultures/utils-kt/utils-kt.lpr:1.2 Tue Jun 29 10:58:49 2004 +++ cell-cultures/utils-kt/utils-kt.lpr Fri Apr 8 11:11:21 2005 @@ -1,9 +1,15 @@ -;; -*- lisp-version: "6.2 [Windows] (May 12, 2004 22:13)"; common-graphics: "1.389.2.105.2.14"; -*- +;; -*- lisp-version: "7.0 [Windows] (Dec 28, 2004 17:34)"; cg: "1.54.2.17"; -*- -(in-package :common-graphics-user) +(in-package :cg-user) + +(defpackage :COMMON-LISP + (:export #:list + #:make-instance + #:t + #:nil + #:quote)) (define-project :name :utils-kt - :application-type (intern "Standard EXE" (find-package :keyword)) :modules (list (make-instance 'module :name "defpackage.lisp") (make-instance 'module :name "debug.lisp") (make-instance 'module :name "detritus.lisp") @@ -12,28 +18,20 @@ :projects nil :libraries nil :distributed-files nil + :internally-loaded-files nil :project-package-name :common-lisp :main-form nil :compilation-unit t :verbose nil - :runtime-modules '(:cg :drag-and-drop :lisp-widget - :multi-picture-button :common-control - :edit-in-place :outline :grid :group-box - :header-control :progress-indicator-control - :common-status-bar :tab-control :trackbar-control - :up-down-control :dde :mci :carets :hotspots - :menu-selection :choose-list :directory-list - :color-dialog :find-dialog :font-dialog - :string-dialog :yes-no-list-dialog - :list-view-control :rich-edit :drawable :ole :www - :aclwin302) + :runtime-modules nil :splash-file-module (make-instance 'build-module :name "") :icon-file-module (make-instance 'build-module :name "") - :include-flags '(:compiler :top-level :local-name-info) + :include-flags '(:local-name-info) :build-flags '(:allow-debug :purify) :autoload-warning t :full-recompile-for-runtime-conditionalizations nil :default-command-line-arguments "+cx +t \"Initializing\"" + :additional-build-lisp-image-arguments '(:read-init-files nil) :old-space-size 256000 :new-space-size 6144 :runtime-build-option :standard

1 0

[cells-cvs] CVS update: cell-cultures/cl-opengl/cl-opengl.lisp cell-cultures/cl-opengl/cl-opengl.lpr 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 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/cl-opengl In directory common-lisp.net:/tmp/cvs-serv12564/cl-opengl Modified Files: cl-opengl.lisp cl-opengl.lpr glut-extras.lisp glut-functions.lisp nehe-14.lisp ogl-macros.lisp ogl-utils.lisp Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:19 2005 Author: ktilton Index: cell-cultures/cl-opengl/cl-opengl.lisp diff -u cell-cultures/cl-opengl/cl-opengl.lisp:1.6 cell-cultures/cl-opengl/cl-opengl.lisp:1.7 --- cell-cultures/cl-opengl/cl-opengl.lisp:1.6 Tue Dec 14 04:53:05 2004 +++ cell-cultures/cl-opengl/cl-opengl.lisp Fri Apr 8 11:11:19 2005 @@ -65,14 +65,6 @@ (in-package :cl-opengl) -(defparameter *gl-dynamic-lib* :unconfigured) -(defparameter *glu-dynamic-lib* :unconfigured) -(defparameter *glut-dynamic-lib* :unconfigured) - -(eval-when (compile load) - (load (merge-pathnames "cl-opengl-config" - cl-user::*cell-cultures-config*))) - (defparameter *opengl-dll* nil) (defun gl-boolean-test (value) Index: cell-cultures/cl-opengl/cl-opengl.lpr diff -u cell-cultures/cl-opengl/cl-opengl.lpr:1.2 cell-cultures/cl-opengl/cl-opengl.lpr:1.3 --- cell-cultures/cl-opengl/cl-opengl.lpr:1.2 Tue Dec 14 04:53:05 2004 +++ cell-cultures/cl-opengl/cl-opengl.lpr Fri Apr 8 11:11:19 2005 @@ -1,12 +1,12 @@ -;; -*- lisp-version: "6.2 [Windows] (Sep 3, 2004 12:04)"; common-graphics: "1.389.2.105.2.14"; -*- +;; -*- lisp-version: "7.0 [Windows] (Apr 6, 2005 17:03)"; cg: "1.54.2.17"; -*- -(in-package :common-graphics-user) +(in-package :cg-user) -(defpackage :cl-opengl (:export)) +(defpackage :CL-OPENGL) (define-project :name :cl-opengl - :application-type (intern "Standard EXE" (find-package :keyword)) - :modules (list (make-instance 'module :name "cl-opengl.lisp") + :modules (list (make-instance 'module :name "cl-opengl-config.lisp") + (make-instance 'module :name "cl-opengl.lisp") (make-instance 'module :name "gl-def.lisp") (make-instance 'module :name "gl-constants.lisp") (make-instance 'module :name "gl-functions.lisp") @@ -18,24 +18,15 @@ (make-instance 'module :name "ogl-utils.lisp") (make-instance 'module :name "nehe-14.lisp")) :projects (list (make-instance 'project-module :name - "c:\\cell-cultures\\ffi-extender\\ffi-extender")) + "c:\\cell-cultures\\hello-c\\hello-c")) :libraries nil :distributed-files nil + :internally-loaded-files nil :project-package-name :cl-opengl :main-form nil :compilation-unit t :verbose nil - :runtime-modules '(:cg :drag-and-drop :lisp-widget - :multi-picture-button :common-control - :edit-in-place :outline :grid :group-box - :header-control :progress-indicator-control - :common-status-bar :tab-control :trackbar-control - :up-down-control :dde :mci :carets :hotspots - :menu-selection :choose-list :directory-list - :color-dialog :find-dialog :font-dialog - :string-dialog :yes-no-list-dialog - :list-view-control :rich-edit :drawable :ole :www - :aclwin302) + :runtime-modules nil :splash-file-module (make-instance 'build-module :name "") :icon-file-module (make-instance 'build-module :name "") :include-flags '(:compiler :top-level :local-name-info) @@ -43,6 +34,7 @@ :autoload-warning t :full-recompile-for-runtime-conditionalizations nil :default-command-line-arguments "+cx +t \"Initializing\"" + :additional-build-lisp-image-arguments '(:read-init-files nil) :old-space-size 256000 :new-space-size 6144 :runtime-build-option :standard Index: cell-cultures/cl-opengl/glut-extras.lisp diff -u cell-cultures/cl-opengl/glut-extras.lisp:1.4 cell-cultures/cl-opengl/glut-extras.lisp:1.5 --- cell-cultures/cl-opengl/glut-extras.lisp:1.4 Tue Dec 14 04:53:05 2004 +++ cell-cultures/cl-opengl/glut-extras.lisp Fri Apr 8 11:11:19 2005 @@ -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* (ffx:load-foreign-library *glut-dynamic-lib* + (assert (setq *glut-dll* (uffi: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 (ffx:make-null-pointer '(:array :cstring))) + (glut-init argc (uffi:make-null-pointer '(:array :cstring))) (print "glut initialised") ) (fgn-free argc)))) @@ -73,13 +73,13 @@ (or (not (zerop (glgeterror))) (zerop w)))) -(let ((mm (ffx:allocate-foreign-object :int 1))) +(let ((mm (uffi:allocate-foreign-object :int 1))) (defun get-matrix-mode () (glgetintegerv gl_matrix_mode mm) (uffi:deref-array mm '(:array :int) 0))) -(let ((mm (ffx:allocate-foreign-object :int 1)) - (sd (ffx:allocate-foreign-object :int 1))) +(let ((mm (uffi:allocate-foreign-object :int 1)) + (sd (uffi: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 (ffx:allocate-foreign-object :int 1)) + (let ((mm (uffi: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))) - (ffx:free-foreign-object mm))))) + (uffi: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.3 cell-cultures/cl-opengl/glut-functions.lisp:1.4 --- cell-cultures/cl-opengl/glut-functions.lisp:1.3 Tue Dec 14 04:53:05 2004 +++ cell-cultures/cl-opengl/glut-functions.lisp Fri Apr 8 11:11:19 2005 @@ -70,9 +70,6 @@ (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) Index: cell-cultures/cl-opengl/nehe-14.lisp diff -u cell-cultures/cl-opengl/nehe-14.lisp:1.3 cell-cultures/cl-opengl/nehe-14.lisp:1.4 --- cell-cultures/cl-opengl/nehe-14.lisp:1.3 Tue Dec 14 04:53:05 2004 +++ cell-cultures/cl-opengl/nehe-14.lisp Fri Apr 8 11:11:19 2005 @@ -96,7 +96,7 @@ (let ((msg (format nil "Hello, ~a ~a" (round (glut-stroke-height (ffi-glut-id id))) stroke-font))) - (with-cstring (cc msg) + (uffi:with-cstring (cc msg) (glut-stroke-string (ffi-glut-id id) msg) (gl-translatef (- (glut-stroke-length (ffi-glut-id id) cc)) 0 0)))))) @@ -114,13 +114,13 @@ (glut-init-window-size 640 480) ;; Window Size If We Start In Windowed Mode (let ((key "NeHe's OpenGL Framework")) - (ffx:with-cstring (key-native key) + (uffi: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) @@ -145,7 +145,7 @@ #+test (lesson-14) -(ff-defun-callable :cdecl :void mgwkey (k x y) +(ff-defun-callable :cdecl :void mgwkey ((k :int) (x :int) (y :int)) (print 'bingo) (mgwkeyi k x y)) Index: cell-cultures/cl-opengl/ogl-macros.lisp diff -u cell-cultures/cl-opengl/ogl-macros.lisp:1.4 cell-cultures/cl-opengl/ogl-macros.lisp:1.5 --- cell-cultures/cl-opengl/ogl-macros.lisp:1.4 Tue Dec 14 04:53:05 2004 +++ cell-cultures/cl-opengl/ogl-macros.lisp Fri Apr 8 11:11:19 2005 @@ -102,11 +102,11 @@ (declare (ignorable load-oglfont-p)) (unless *opengl-dll* (print "loading open GL/GLU") - (ffx:load-foreign-library + (uffi:load-foreign-library *gl-dynamic-lib* :module "open-gl") ;; -lispworks#-lispworks - (setf *opengl-dll* (ffx:load-foreign-library *glu-dynamic-lib* + (setf *opengl-dll* (uffi: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.6 cell-cultures/cl-opengl/ogl-utils.lisp:1.7 --- cell-cultures/cl-opengl/ogl-utils.lisp:1.6 Tue Dec 14 04:53:05 2004 +++ cell-cultures/cl-opengl/ogl-utils.lisp Fri Apr 8 11:11:19 2005 @@ -139,7 +139,7 @@ ;;(cells::count-it :normalize-3f) (values (+ (/ x m)) (+ (/ y m)) (+ (/ z m))))))) -(ffx:def-foreign-type bool* (* glboolean)) +(uffi: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)))) -(ffx:def-foreign-type glint* (* glint)) +(uffi:def-foreign-type glint* (* glint)) #-lispworks (declaim (type glint* *ogl-int*))

1 0

[cells-cvs] CVS update: cell-cultures/cl-openal/cl-openal.lpr
by ktilton＠common-lisp.net 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/cl-openal In directory common-lisp.net:/tmp/cvs-serv12564/cl-openal Modified Files: cl-openal.lpr Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:19 2005 Author: ktilton Index: cell-cultures/cl-openal/cl-openal.lpr diff -u cell-cultures/cl-openal/cl-openal.lpr:1.1 cell-cultures/cl-openal/cl-openal.lpr:1.2 --- cell-cultures/cl-openal/cl-openal.lpr:1.1 Sat Jun 26 20:38:40 2004 +++ cell-cultures/cl-openal/cl-openal.lpr Fri Apr 8 11:11:18 2005 @@ -1,11 +1,10 @@ -;; -*- lisp-version: "6.2 [Windows] (May 12, 2004 22:13)"; common-graphics: "1.389.2.105.2.14"; -*- +;; -*- lisp-version: "7.0 [Windows] (Dec 28, 2004 17:34)"; cg: "1.54.2.17"; -*- -(in-package :common-graphics-user) +(in-package :cg-user) -(defpackage :cl-openal (:export)) +(defpackage :CL-OPENAL) (define-project :name :cl-openal - :application-type (intern "Standard EXE" (find-package :keyword)) :modules (list (make-instance 'module :name "cl-openal.lisp") (make-instance 'module :name "altypes.lisp") (make-instance 'module :name "al.lisp") @@ -17,31 +16,23 @@ (make-instance 'module :name "wav-handling.lisp") (make-instance 'module :name "cl-openal-demo.lisp")) :projects (list (make-instance 'project-module :name - "..\\ffi-extender\\ffi-extender")) + "..\\hello-c\\hello-c")) :libraries nil :distributed-files nil + :internally-loaded-files nil :project-package-name :cl-openal :main-form nil :compilation-unit t :verbose nil - :runtime-modules '(:cg :drag-and-drop :lisp-widget - :multi-picture-button :common-control - :edit-in-place :outline :grid :group-box - :header-control :progress-indicator-control - :common-status-bar :tab-control :trackbar-control - :up-down-control :dde :mci :carets :hotspots - :menu-selection :choose-list :directory-list - :color-dialog :find-dialog :font-dialog - :string-dialog :yes-no-list-dialog - :list-view-control :rich-edit :drawable :ole :www - :aclwin302) + :runtime-modules nil :splash-file-module (make-instance 'build-module :name "") :icon-file-module (make-instance 'build-module :name "") - :include-flags '(:compiler :top-level :local-name-info) + :include-flags '(:local-name-info) :build-flags '(:allow-debug :purify) :autoload-warning t :full-recompile-for-runtime-conditionalizations nil :default-command-line-arguments "+cx +t \"Initializing\"" + :additional-build-lisp-image-arguments '(:read-init-files nil) :old-space-size 256000 :new-space-size 6144 :runtime-build-option :standard

1 0

[cells-cvs] CVS update: cell-cultures/cl-magick/cl-magick.lisp cell-cultures/cl-magick/cl-magick.lpr cell-cultures/cl-magick/mgk-test.lisp cell-cultures/cl-magick/wand-image.lisp
by ktilton＠common-lisp.net 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/cl-magick In directory common-lisp.net:/tmp/cvs-serv12564/cl-magick Modified Files: cl-magick.lisp cl-magick.lpr mgk-test.lisp wand-image.lisp Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:17 2005 Author: ktilton Index: cell-cultures/cl-magick/cl-magick.lisp diff -u cell-cultures/cl-magick/cl-magick.lisp:1.3 cell-cultures/cl-magick/cl-magick.lisp:1.4 --- cell-cultures/cl-magick/cl-magick.lisp:1.3 Thu Oct 28 02:09:21 2004 +++ cell-cultures/cl-magick/cl-magick.lisp Fri Apr 8 11:11:17 2005 @@ -25,7 +25,7 @@ (:use #:common-lisp #-cormanlisp #:clos - #:ffx + #:hello-c #+cl-opengl #:cl-opengl ;; wands as opengl textures ) @@ -43,19 +43,12 @@ (in-package :cl-magick) -(defparameter *magick-dynamic-lib* :unconfigured) - -(eval-when (:compile-toplevel :load-toplevel) - (load (merge-pathnames "cl-magick-config" - cl-user::*cell-cultures-config*))) - (defun magick-wand-template () (path-to-wand - (merge-pathnames - (make-pathname - :directory '(:relative "templates") - :name "metal" :type "gif") - cl-user::*cell-cultures-graphics-directory*))) + (make-pathname + :directory '(:absolute "cell-cultures" "cell-cultures-user" + "graphics" "templates") + :name "metal" :type "gif"))) (defparameter *imagick-dll-loaded* nil) (defparameter *wands-loaded* nil) Index: cell-cultures/cl-magick/cl-magick.lpr diff -u cell-cultures/cl-magick/cl-magick.lpr:1.2 cell-cultures/cl-magick/cl-magick.lpr:1.3 --- cell-cultures/cl-magick/cl-magick.lpr:1.2 Fri Oct 1 06:01:19 2004 +++ cell-cultures/cl-magick/cl-magick.lpr Fri Apr 8 11:11:17 2005 @@ -1,12 +1,11 @@ -;; -*- lisp-version: "6.2 [Windows] (Sep 3, 2004 12:04)"; common-graphics: "1.389.2.105.2.14"; -*- +;; -*- lisp-version: "7.0 [Windows] (Apr 6, 2005 17:03)"; cg: "1.54.2.17"; -*- -(in-package :common-graphics-user) +(in-package :cg-user) -(defpackage :cl-magick (:export)) +(defpackage :CL-MAGICK) (define-project :name :cl-magick - :application-type (intern "Standard EXE" (find-package :keyword)) - :modules (list (make-instance 'module :name "build.lisp") + :modules (list (make-instance 'module :name "cl-magick-config.lisp") (make-instance 'module :name "cl-magick.lisp") (make-instance 'module :name "magick-wand.lisp") (make-instance 'module :name "drawing-wand.lisp") @@ -19,28 +18,20 @@ :projects nil :libraries nil :distributed-files nil + :internally-loaded-files nil :project-package-name :cl-magick :main-form nil :compilation-unit t :verbose nil - :runtime-modules '(:cg :drag-and-drop :lisp-widget - :multi-picture-button :common-control - :edit-in-place :outline :grid :group-box - :header-control :progress-indicator-control - :common-status-bar :tab-control :trackbar-control - :up-down-control :dde :mci :carets :hotspots - :menu-selection :choose-list :directory-list - :color-dialog :find-dialog :font-dialog - :string-dialog :yes-no-list-dialog - :list-view-control :rich-edit :drawable :ole :www - :aclwin302) + :runtime-modules nil :splash-file-module (make-instance 'build-module :name "") :icon-file-module (make-instance 'build-module :name "") - :include-flags '(:compiler :top-level :local-name-info) + :include-flags '(:local-name-info) :build-flags '(:allow-debug :purify) :autoload-warning t :full-recompile-for-runtime-conditionalizations nil :default-command-line-arguments "+cx +t \"Initializing\"" + :additional-build-lisp-image-arguments '(:read-init-files nil) :old-space-size 256000 :new-space-size 6144 :runtime-build-option :standard Index: cell-cultures/cl-magick/mgk-test.lisp diff -u cell-cultures/cl-magick/mgk-test.lisp:1.5 cell-cultures/cl-magick/mgk-test.lisp:1.6 --- cell-cultures/cl-magick/mgk-test.lisp:1.5 Wed Nov 17 13:31:42 2004 +++ cell-cultures/cl-magick/mgk-test.lisp Fri Apr 8 11:11:17 2005 @@ -256,18 +256,17 @@ (gl-tex-coord2f 1 1) (v3f -1 1 1) (gl-tex-coord2f 0 1) (v3f -1 1 -1) )) - (wand-render *grace* 0 0 1 -1)) + ;;(wand-render *grace* 0 0 1 -1) + ) (glut-swap-buffers) (glut-post-redisplay) ) (defun test-image (filename filetype) - (merge-pathnames - (make-pathname - :directory '(:relative "shapers") + (make-pathname + :directory '(:absolute "cell-cultures" "cell-cultures-user" "graphics" "shapers") :name (string filename) - :type (string filetype)) - cl-user::*cell-cultures-graphics-directory*)) + :type (string filetype))) (defun r6init() (gl-enable gl_texture_2d) @@ -286,7 +285,7 @@ #+test (lesson-6) -(ff-defun-callable :cdecl :void r6-reshape (x y) +(ff-defun-callable :cdecl :void r6-reshape ((x :int)(y :int)) (r6reshape x y)) (defun r6reshape (width height) @@ -324,7 +323,7 @@ #+test (cl-magick-test) -(ff-defun-callable :cdecl :void mgwkey (k x y) +(ff-defun-callable :cdecl :void mgwkey ((k :int)(x :int)(y :int)) (mgwkeyi k x y)) (defun mgwkeyi (k x y) Index: cell-cultures/cl-magick/wand-image.lisp diff -u cell-cultures/cl-magick/wand-image.lisp:1.2 cell-cultures/cl-magick/wand-image.lisp:1.3 --- cell-cultures/cl-magick/wand-image.lisp:1.2 Fri Oct 1 06:01:19 2004 +++ cell-cultures/cl-magick/wand-image.lisp Fri Apr 8 11:11:17 2005 @@ -45,7 +45,7 @@ ))) (:input (assert (probe-file (file-path$ self)) () - "Image file ~a not found iinitializing wand" (file-path$ self)) + "Image file ~a not found initializing wand" (file-path$ self)) (assert (not (mgk-wand self))) ;; make sure not leaking (setf (mgk-wand self) (path-to-wand (file-path$ self))) ;(mgk-wand-dump (mgk-wand self) (file-path$ self))

1 0

[cells-cvs] CVS update: cell-cultures/cl-ftgl/cl-ftgl.lisp cell-cultures/cl-ftgl/cl-ftgl.lpr
by ktilton＠common-lisp.net 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/cl-ftgl In directory common-lisp.net:/tmp/cvs-serv12564/cl-ftgl Modified Files: cl-ftgl.lisp cl-ftgl.lpr Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:17 2005 Author: ktilton Index: cell-cultures/cl-ftgl/cl-ftgl.lisp diff -u cell-cultures/cl-ftgl/cl-ftgl.lisp:1.7 cell-cultures/cl-ftgl/cl-ftgl.lisp:1.8 --- cell-cultures/cl-ftgl/cl-ftgl.lisp:1.7 Sun Dec 5 05:50:41 2004 +++ cell-cultures/cl-ftgl/cl-ftgl.lisp Fri Apr 8 11:11:16 2005 @@ -20,7 +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/cl-ftgl/cl-ftgl.lisp,v 1.7 2004/12/05 04:50:41 ktilton Exp $ +;;; $Header: /project/cells/cvsroot/cell-cultures/cl-ftgl/cl-ftgl.lisp,v 1.8 2005/04/08 09:11:16 ktilton Exp $ (defpackage #:cl-ftgl (:nicknames #:ftgl) @@ -56,15 +56,6 @@ #:*gui-style-button-face*)) (in-package :cl-ftgl) - -(defparameter *ftgl-dynamic-lib-path* :unconfigured) -(defparameter *font-directory-path* :unconfigured) -(defparameter *gui-style-default-face* :unconfigured) -(defparameter *gui-style-button-face* :unconfigured) - -(eval-when (compile load eval) - (load (merge-pathnames "cl-ftgl-config" - cl-user::*cell-cultures-config*))) ;; ---------------------------------------------------------------------------- ;; EXTERNAL DEPENDENCIES Index: cell-cultures/cl-ftgl/cl-ftgl.lpr diff -u cell-cultures/cl-ftgl/cl-ftgl.lpr:1.1 cell-cultures/cl-ftgl/cl-ftgl.lpr:1.2 --- cell-cultures/cl-ftgl/cl-ftgl.lpr:1.1 Sat Jun 26 20:38:39 2004 +++ cell-cultures/cl-ftgl/cl-ftgl.lpr Fri Apr 8 11:11:16 2005 @@ -1,37 +1,29 @@ -;; -*- lisp-version: "6.2 [Windows] (Jun 26, 2002 11:39)"; common-graphics: "1.389.2.105.2.14"; -*- +;; -*- lisp-version: "7.0 [Windows] (Apr 6, 2005 17:03)"; cg: "1.54.2.17"; -*- -(in-package :common-graphics-user) +(in-package :cg-user) -(defpackage :cl-ftgl (:export)) +(defpackage :CL-FTGL) (define-project :name :cl-ftgl - :application-type (intern "Standard EXE" (find-package :keyword)) - :modules (list (make-instance 'module :name "cl-ftgl.lisp")) + :modules (list (make-instance 'module :name "cl-ftgl-config.lisp") + (make-instance 'module :name "cl-ftgl.lisp")) :projects nil :libraries nil :distributed-files nil + :internally-loaded-files nil :project-package-name :cl-ftgl :main-form nil :compilation-unit t :verbose nil - :runtime-modules '(:cg :drag-and-drop :lisp-widget - :multi-picture-button :common-control - :edit-in-place :outline :grid :group-box - :header-control :progress-indicator-control - :common-status-bar :tab-control :trackbar-control - :up-down-control :dde :mci :carets :hotspots - :menu-selection :choose-list :directory-list - :color-dialog :find-dialog :font-dialog - :string-dialog :yes-no-list-dialog - :list-view-control :rich-edit :drawable :ole :www - :aclwin302) + :runtime-modules nil :splash-file-module (make-instance 'build-module :name "") :icon-file-module (make-instance 'build-module :name "") - :include-flags '(:compiler :top-level :local-name-info) + :include-flags '(:local-name-info) :build-flags '(:allow-debug :purify) :autoload-warning t :full-recompile-for-runtime-conditionalizations nil :default-command-line-arguments "+cx +t \"Initializing\"" + :additional-build-lisp-image-arguments '(:read-init-files nil) :old-space-size 256000 :new-space-size 6144 :runtime-build-option :standard

1 0

[cells-cvs] CVS update: cell-cultures/cells/cells.lpr cell-cultures/cells/defpackage.lisp cell-cultures/cells/integrity.lisp cell-cultures/cells/md-slot-value.lisp cell-cultures/cells/test.lisp
by ktilton＠common-lisp.net 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/cells In directory common-lisp.net:/tmp/cvs-serv12564/cells Modified Files: cells.lpr defpackage.lisp integrity.lisp md-slot-value.lisp test.lisp Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:13 2005 Author: ktilton Index: cell-cultures/cells/cells.lpr diff -u cell-cultures/cells/cells.lpr:1.2 cell-cultures/cells/cells.lpr:1.3 --- cell-cultures/cells/cells.lpr:1.2 Sun Jun 27 01:36:49 2004 +++ cell-cultures/cells/cells.lpr Fri Apr 8 11:11:12 2005 @@ -1,11 +1,10 @@ -;; -*- lisp-version: "6.2 [Windows] (May 12, 2004 22:13)"; common-graphics: "1.389.2.105.2.14"; -*- +;; -*- lisp-version: "7.0 [Windows] (Dec 28, 2004 17:34)"; cg: "1.54.2.17"; -*- -(in-package :common-graphics-user) +(in-package :cg-user) -(defpackage :cells (:export)) +(defpackage :CELLS) (define-project :name :cells - :application-type (intern "Standard EXE" (find-package :keyword)) :modules (list (make-instance 'module :name "defpackage.lisp") (make-instance 'module :name "cells.lisp") (make-instance 'module :name "cell-types.lisp") @@ -30,28 +29,20 @@ "../utils-kt/utils-kt")) :libraries nil :distributed-files nil + :internally-loaded-files nil :project-package-name :cells :main-form nil :compilation-unit t :verbose nil - :runtime-modules '(:cg :drag-and-drop :lisp-widget - :multi-picture-button :common-control - :edit-in-place :outline :grid :group-box - :header-control :progress-indicator-control - :common-status-bar :tab-control :trackbar-control - :up-down-control :dde :mci :carets :hotspots - :menu-selection :choose-list :directory-list - :color-dialog :find-dialog :font-dialog - :string-dialog :yes-no-list-dialog - :list-view-control :rich-edit :drawable :ole :www - :aclwin302) + :runtime-modules nil :splash-file-module (make-instance 'build-module :name "") :icon-file-module (make-instance 'build-module :name "") - :include-flags '(:compiler :top-level :local-name-info) + :include-flags '(:local-name-info) :build-flags '(:allow-debug :purify) :autoload-warning t :full-recompile-for-runtime-conditionalizations nil :default-command-line-arguments "+cx +t \"Initializing\"" + :additional-build-lisp-image-arguments '(:read-init-files nil) :old-space-size 256000 :new-space-size 6144 :runtime-build-option :standard Index: cell-cultures/cells/defpackage.lisp diff -u cell-cultures/cells/defpackage.lisp:1.7 cell-cultures/cells/defpackage.lisp:1.8 --- cell-cultures/cells/defpackage.lisp:1.7 Wed Nov 17 13:31:31 2004 +++ cell-cultures/cells/defpackage.lisp Fri Apr 8 11:11:12 2005 @@ -59,3 +59,4 @@ #+allegro (:shadowing-import-from #:excl #:fasl-write #:fasl-read #:gc) ) + Index: cell-cultures/cells/integrity.lisp diff -u cell-cultures/cells/integrity.lisp:1.5 cell-cultures/cells/integrity.lisp:1.6 --- cell-cultures/cells/integrity.lisp:1.5 Mon Dec 6 21:26:06 2004 +++ cell-cultures/cells/integrity.lisp Fri Apr 8 11:11:12 2005 @@ -61,7 +61,7 @@ (defun ufb-add (opcode continuation) (fifo-add (ufb-queue opcode) continuation)) -(defconstant-once *ufb-opcodes* '(:user-notify :output :setf :makunbound :finalize)) +(defconstant *ufb-opcodes* '(:user-notify :output :setf :makunbound :finalize)) (define-condition c-opcode-deferred (c-enabling) ((defer-info :initarg :defer-info :reader defer-info)) @@ -76,6 +76,8 @@ (declare (ignorable debug-key)) (assert (or (null opcode) (member opcode *ufb-opcodes*))) (trc nil "call-with-integrity entry *unfinished-business*" *unfinished-business*) + (when *stop* + (return-from call-with-integrity)) (if *unfinished-business* (if defer-info (progn @@ -111,6 +113,7 @@ (tagbody notify-users ;--- notify users ------------------------------ + (when *stop* (return-from finish-business)) (let ((user-q-item (fifo-pop (ufb-queue :user-notify)))) (when user-q-item (destructuring-bind (defer-info . task) user-q-item @@ -122,6 +125,7 @@ (setf some-output nil) next-output + (when *stop* (return-from finish-business)) ;--- do c-output-slot-name ----------------------- (setf task (cdr (fifo-pop (ufb-queue :output)))) Index: cell-cultures/cells/md-slot-value.lisp diff -u cell-cultures/cells/md-slot-value.lisp:1.5 cell-cultures/cells/md-slot-value.lisp:1.6 --- cell-cultures/cells/md-slot-value.lisp:1.5 Sun Dec 5 05:50:32 2004 +++ cell-cultures/cells/md-slot-value.lisp Fri Apr 8 11:11:12 2005 @@ -60,7 +60,7 @@ (some (lambda (used) (c-value-ensure-current used) (when (and (c-changed used) (> (c-pulse used)(c-pulse c))) - (trc nil "used changed" used :asker c + #+chya (trc nil "used changed" used :asker c :inpulse ip :pulse *data-pulse-id*) t)) (c-useds c)))) @@ -68,33 +68,32 @@ (defun c-calculate-and-set (c) (flet ((body () (when (c-stopped) - (princ #\.) - (return-from c-calculate-and-set)) + (princ #\.) + (return-from c-calculate-and-set)) - (when (find c *c-calculators*) ;; circularity - (trc "c-calculate-and-set breaking on circularity" c) - (c-break ;; break is problem when testing cells on some CLs - "cell ~a midst askers: ~a" c *c-calculators*)) + (when (find c *c-calculators*) ;; circularity + (trc "c-calculate-and-set breaking on circularity" c) + (c-break ;; break is problem when testing cells on some CLs + "cell ~a midst askers: ~a" c *c-calculators*)) - (count-it :c-calculate-and-set) - ;;; (count-it :c-calculate-and-set (type-of (c-model c))) ;; (c-slot-name c)) + (count-it :c-calculate-and-set) + ;;; (count-it :c-calculate-and-set (type-of (c-model c))) ;; (c-slot-name c)) - (cd-usage-clear-all c) + (cd-usage-clear-all c) - (let ((raw-value - (progn - (let ((*c-calculators* (cons c *c-calculators*))) - (trc nil "c-calculate-and-set> new *c-calculators*:" - *c-calculators*) - (c-assert (c-model c)) - (funcall (cr-rule c) c))))) - (progn ;; unless (cmdead c) ;; eg, rule includes (nsib), then parent decides (c-model c) is no more - (when (and *c-debug* (typep raw-value 'cell)) - (c-break "new value for cell ~s is itself a cell: ~s. probably nested (c? ... (c? ))" - c raw-value)) + (let ((raw-value + (progn + (let ((*c-calculators* (cons c *c-calculators*))) + (trc nil "c-calculate-and-set> new *c-calculators*:" + *c-calculators*) + (c-assert (c-model c)) + (funcall (cr-rule c) c))))) + (when (and *c-debug* (typep raw-value 'cell)) + (c-break "new value for cell ~s is itself a cell: ~s. probably nested (c? ... (c? ))" + c raw-value)) - (c-unlink-unused c) - (md-slot-value-assume c raw-value))))) + (c-unlink-unused c) + (md-slot-value-assume c raw-value)))) (if nil ;; *dbg* (ukt::wtrc (0 100 "calcnset" c) (body))(body)))) @@ -165,12 +164,10 @@ (defmethod md-slot-value-assume (c raw-value) (assert c) - (trc nil "md-slot-value-assume entry:" c raw-value) (bif (c-pos (position c *causation*)) (bif (cyclic-pos (position-if 'c-cyclicp *causation* :end c-pos)) - (progn ;; let ((cc (nth cyclic-pos *causation*))) + (progn (c-pulse-update c :cyclicity-0) - (trc nil "!!!!!!!! cyclicity handled" c cc) (return-from md-slot-value-assume raw-value)) (c-break "md-slot-value-assume looping ~a ~a" c *causation*))) Index: cell-cultures/cells/test.lisp diff -u cell-cultures/cells/test.lisp:1.1 cell-cultures/cells/test.lisp:1.2 --- cell-cultures/cells/test.lisp:1.1 Sat Jun 26 20:38:36 2004 +++ cell-cultures/cells/test.lisp Fri Apr 8 11:11:12 2005 @@ -36,6 +36,9 @@ (defparameter *cell-tests* nil) +#+go +(test-cells) + (defun test-cells () (loop for test in (reverse *cell-tests*) do (cell-test-init test)

1 0

[cells-cvs] CVS update: cell-cultures/cells/cells-test/cells-test.lpr cell-cultures/cells/cells-test/test.lisp
by ktilton＠common-lisp.net 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/cells/cells-test In directory common-lisp.net:/tmp/cvs-serv12564/cells/cells-test Modified Files: cells-test.lpr test.lisp Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:11 2005 Author: ktilton Index: cell-cultures/cells/cells-test/cells-test.lpr diff -u cell-cultures/cells/cells-test/cells-test.lpr:1.1 cell-cultures/cells/cells-test/cells-test.lpr:1.2 --- cell-cultures/cells/cells-test/cells-test.lpr:1.1 Sun Jul 4 20:59:42 2004 +++ cell-cultures/cells/cells-test/cells-test.lpr Fri Apr 8 11:11:08 2005 @@ -1,11 +1,10 @@ -;; -*- lisp-version: "6.2 [Windows] (May 12, 2004 22:13)"; common-graphics: "1.389.2.105.2.14"; -*- +;; -*- lisp-version: "7.0 [Windows] (Apr 6, 2005 17:03)"; cg: "1.54.2.17"; -*- -(in-package :common-graphics-user) +(in-package :cg-user) -(defpackage :cells (:export)) +(defpackage :CELLS) (define-project :name :cells-test - :application-type (intern "Standard EXE" (find-package :keyword)) :modules (list (make-instance 'module :name "test.lisp") (make-instance 'module :name "hello-world.lisp") (make-instance 'module :name @@ -22,28 +21,20 @@ :projects (list (make-instance 'project-module :name "..\\cells")) :libraries nil :distributed-files nil + :internally-loaded-files nil :project-package-name :cells :main-form nil :compilation-unit t :verbose nil - :runtime-modules '(:cg :drag-and-drop :lisp-widget - :multi-picture-button :common-control - :edit-in-place :outline :grid :group-box - :header-control :progress-indicator-control - :common-status-bar :tab-control :trackbar-control - :up-down-control :dde :mci :carets :hotspots - :menu-selection :choose-list :directory-list - :color-dialog :find-dialog :font-dialog - :string-dialog :yes-no-list-dialog - :list-view-control :rich-edit :drawable :ole :www - :aclwin302) + :runtime-modules nil :splash-file-module (make-instance 'build-module :name "") :icon-file-module (make-instance 'build-module :name "") - :include-flags '(:compiler :top-level :local-name-info) + :include-flags '(:local-name-info) :build-flags '(:allow-debug :purify) :autoload-warning t :full-recompile-for-runtime-conditionalizations nil :default-command-line-arguments "+cx +t \"Initializing\"" + :additional-build-lisp-image-arguments '(:read-init-files nil) :old-space-size 256000 :new-space-size 6144 :runtime-build-option :standard Index: cell-cultures/cells/cells-test/test.lisp diff -u cell-cultures/cells/cells-test/test.lisp:1.3 cell-cultures/cells/cells-test/test.lisp:1.4 --- cell-cultures/cells/cells-test/test.lisp:1.3 Thu Oct 28 02:09:11 2004 +++ cell-cultures/cells/cells-test/test.lisp Fri Apr 8 11:11:08 2005 @@ -80,16 +80,16 @@ (cell-reset) ;(hello-world) ;; non-assertive (cv-test-engine) -;;; (cv-test-person) -;;; ;; should fail: (df-test nil) -;;; (df-test t) -;;; (cv-test-family) -;;; (cv-family-values) -;;; (cv-kid-slotting) -;;; (boiler-1) -;;; (boiler-2) -;;; (boiler-3) ;; non-assertive -;;; (boiler-4) ;; non-assertive + ;;; (cv-test-person) + ;;; ;; should fail: (df-test nil) + ;;; (df-test t) + ;;; (cv-test-family) + ;;; (cv-family-values) + ;;; (cv-kid-slotting) + ;;; (boiler-1) + ;;; (boiler-2) + ;;; (boiler-3) ;; non-assertive + ;;; (boiler-4) ;; non-assertive )) (defun dft ()

1 0

[cells-cvs] CVS update: cell-cultures/cellodemo/cellodemo.lpr
by ktilton＠common-lisp.net 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/cellodemo In directory common-lisp.net:/tmp/cvs-serv12564/cellodemo Modified Files: cellodemo.lpr Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:08 2005 Author: ktilton Index: cell-cultures/cellodemo/cellodemo.lpr diff -u cell-cultures/cellodemo/cellodemo.lpr:1.4 cell-cultures/cellodemo/cellodemo.lpr:1.5 --- cell-cultures/cellodemo/cellodemo.lpr:1.4 Tue Oct 19 05:47:33 2004 +++ cell-cultures/cellodemo/cellodemo.lpr Fri Apr 8 11:11:08 2005 @@ -1,11 +1,10 @@ -;; -*- lisp-version: "6.2 [Windows] (Sep 3, 2004 12:04)"; common-graphics: "1.389.2.105.2.14"; -*- +;; -*- lisp-version: "7.0 [Windows] (Dec 28, 2004 17:34)"; cg: "1.54.2.17"; -*- -(in-package :common-graphics-user) +(in-package :cg-user) -(defpackage :cello (:export)) +(defpackage :CELLO) (define-project :name :cello-demo - :application-type (intern "Standard EXE" (find-package :keyword)) :modules (list (make-instance 'module :name "cellodemo.lisp") (make-instance 'module :name "demo-window.lisp") (make-instance 'module :name "tutor-geometry.lisp") @@ -17,21 +16,60 @@ "..\\cello\\cello")) :libraries nil :distributed-files nil + :internally-loaded-files nil :project-package-name :cello :main-form nil :compilation-unit t :verbose nil - :runtime-modules '(:cg :drag-and-drop :lisp-widget - :multi-picture-button :common-control - :edit-in-place :outline :grid :group-box - :header-control :progress-indicator-control - :common-status-bar :tab-control :trackbar-control - :up-down-control :dde :mci :carets :hotspots - :menu-selection :choose-list :directory-list - :color-dialog :find-dialog :font-dialog - :string-dialog :yes-no-list-dialog - :list-view-control :rich-edit :drawable :ole :www - :aclwin302) + :runtime-modules '(:cg-dde-utils :cg.base :cg.bitmap-pane + :cg.bitmap-pane.clipboard :cg.bitmap-stream + :cg.button :cg.caret :cg.check-box :cg.choice-list + :cg.choose-printer :cg.clipboard + :cg.clipboard-stack :cg.clipboard.pixmap + :cg.color-dialog :cg.combo-box :cg.common-control + :cg.comtab :cg.cursor-pixmap :cg.curve + :cg.dialog-item :cg.directory-dialog + :cg.directory-dialog-os :cg.drag-and-drop + :cg.drag-and-drop-image :cg.drawable + :cg.drawable.clipboard :cg.dropping-outline + :cg.edit-in-place :cg.editable-text + :cg.file-dialog :cg.fill-texture + :cg.find-string-dialog :cg.font-dialog + :cg.gesture-emulation :cg.get-pixmap + :cg.get-position :cg.graphics-context + :cg.grid-widget :cg.grid-widget.drag-and-drop + :cg.group-box :cg.header-control :cg.hotspot + :cg.icon :cg.icon-pixmap :cg.item-list + :cg.keyboard-shortcuts :cg.lettered-menu + :cg.lisp-edit-pane :cg.lisp-text :cg.lisp-widget + :cg.list-view :cg.mci :cg.menu :cg.menu.tooltip + :cg.message-dialog :cg.multi-line-editable-text + :cg.multi-line-lisp-text :cg.multi-picture-button + :cg.multi-picture-button.drag-and-drop + :cg.multi-picture-button.tooltip :cg.os-widget + :cg.os-window :cg.outline + :cg.outline.drag-and-drop + :cg.outline.edit-in-place :cg.palette + :cg.paren-matching :cg.picture-widget + :cg.picture-widget.palette :cg.pixmap + :cg.pixmap-widget :cg.pixmap.file-io + :cg.pixmap.printing :cg.pixmap.rotate :cg.printing + :cg.progress-indicator :cg.project-window + :cg.property :cg.radio-button :cg.rich-edit + :cg.rich-edit-pane :cg.rich-edit-pane.clipboard + :cg.rich-edit-pane.printing :cg.sample-file-menu + :cg.scaling-stream :cg.scroll-bar + :cg.scroll-bar-mixin :cg.selected-object + :cg.shortcut-menu :cg.static-text :cg.status-bar + :cg.string-dialog :cg.tab-control + :cg.template-string :cg.text-edit-pane + :cg.text-edit-pane.file-io :cg.text-edit-pane.mark + :cg.text-or-combo :cg.text-widget :cg.timer + :cg.toggling-widget :cg.toolbar :cg.tooltip + :cg.trackbar :cg.tray :cg.up-down-control + :cg.utility-dialog :cg.web-browser + :cg.web-browser.dde :cg.wrap-string + :cg.yes-no-list :cg.yes-no-string :dde) :splash-file-module (make-instance 'build-module :name "") :icon-file-module (make-instance 'build-module :name "") :include-flags '(:compiler :top-level :local-name-info) @@ -39,6 +77,7 @@ :autoload-warning t :full-recompile-for-runtime-conditionalizations nil :default-command-line-arguments "+cx +t \"Initializing\"" + :additional-build-lisp-image-arguments '(:read-init-files nil) :old-space-size 256000 :new-space-size 6144 :runtime-build-option :standard

1 0

[cells-cvs] CVS update: cell-cultures/cello/ix-styled.lisp cell-cultures/cello/window-callbacks.lisp cell-cultures/cello/window.lisp cell-cultures/cello/wm-mouse.lisp
by ktilton＠common-lisp.net 08 Apr '05

08 Apr '05

Update of /project/cells/cvsroot/cell-cultures/cello In directory common-lisp.net:/tmp/cvs-serv12564/cello Modified Files: ix-styled.lisp window-callbacks.lisp window.lisp wm-mouse.lisp Log Message: Cello cleanup, but mostly "removing" ffi-extender, which really lives on as the "hello-c" package Date: Fri Apr 8 11:11:07 2005 Author: ktilton Index: cell-cultures/cello/ix-styled.lisp diff -u cell-cultures/cello/ix-styled.lisp:1.4 cell-cultures/cello/ix-styled.lisp:1.5 --- cell-cultures/cello/ix-styled.lisp:1.4 Thu Oct 28 02:08:56 2004 +++ cell-cultures/cello/ix-styled.lisp Fri Apr 8 11:11:07 2005 @@ -118,7 +118,8 @@ (unless (ftgl::ftgl-disp-ready-p font) (setf (ftgl::ftgl-disp-ready-p font) t) (fgc-set-face-size (ftgl-ensure-ifont font) - (ftgl::ftgl-size font) (ftgl::ftgl-target-res font)))))) + (ftgl::ftgl-size font) (ftgl::ftgl-target-res font))) + (ix-string-width self (^display-text$))))) (defmethod make-style-font ((style gui-style-glut-stroke)) (make-font-glut-stroke Index: cell-cultures/cello/window-callbacks.lisp diff -u cell-cultures/cello/window-callbacks.lisp:1.4 cell-cultures/cello/window-callbacks.lisp:1.5 --- cell-cultures/cello/window-callbacks.lisp:1.4 Fri Oct 15 05:37:21 2004 +++ cell-cultures/cello/window-callbacks.lisp Fri Apr 8 11:11:07 2005 @@ -24,7 +24,9 @@ (defmacro def-window-callback (fn-name args &body body) `(ff-defun-callable :cdecl :void ,fn-name ,args - (window-callback ',fn-name (lambda ,args ,@body) ,@args))) + (window-callback ',fn-name + (lambda ,(mapcar 'car args) ,@body) + ,@(mapcar 'car args)))) (defun window-callback (fn-name callback &rest args) (declare (ignorable fn-name)) @@ -51,7 +53,7 @@ (w-post-redisplay *w*))) (apply callback args)))))) -(def-window-callback mgwkey (k x y) +(def-window-callback mgwkey ((k :int)(x :int)(y :int)) (trc "mgwkey" k x y (glutgetwindow)) (bwhen (w *w*) (trc nil "mgwkey" k x y w) @@ -62,7 +64,7 @@ (code-char (logand k #xff)) (mk-os-event mods (mkv2 x y)))))) -(def-window-callback mgw-special (k x y) +(def-window-callback mgw-special ((k :int)(x :int)(y :int)) (trc nil "mgwspecial" k x y (glutgetwindow)) (bwhen (w *w*) (trc nil "mgwspecial" k x y w) @@ -118,7 +120,7 @@ (setf (kids *sys*) (remove *w* (kids *sys*))) (trc nil "closed ~a" *w*))) -(def-window-callback mg-glut-reshape (x y) +(def-window-callback mg-glut-reshape ((x :int)(y :int)) (unless (or (null *w*)(zerop x) (zerop y)(self-sizing *w*)) (trc nil "mg-glut-reshape entry" (mg-window-current t) x y) (mg-window-reshape *w* x y))) Index: cell-cultures/cello/window.lisp diff -u cell-cultures/cello/window.lisp:1.5 cell-cultures/cello/window.lisp:1.6 --- cell-cultures/cello/window.lisp:1.5 Thu Oct 28 02:08:56 2004 +++ cell-cultures/cello/window.lisp Fri Apr 8 11:11:07 2005 @@ -79,7 +79,6 @@ :initform 0 :accessor gl-name-highest)) (:default-initargs - :px 0 :py 0 :kids (c? (the-kids (^content)) #+not (the-kids (mk-part :wstuff (ix-kid-sized) :px 0 :py (c? (bif (n (nsib)) Index: cell-cultures/cello/wm-mouse.lisp diff -u cell-cultures/cello/wm-mouse.lisp:1.1 cell-cultures/cello/wm-mouse.lisp:1.2 --- cell-cultures/cello/wm-mouse.lisp:1.1 Sat Jun 26 20:38:33 2004 +++ cell-cultures/cello/wm-mouse.lisp Fri Apr 8 11:11:07 2005 @@ -98,7 +98,7 @@ (defparameter *mouse-where* nil) -(def-window-callback mg-motion-callback (x y) +(def-window-callback mg-motion-callback ((x :int)(y :int)) (let ((w (mg-window-current t)) (where (mkv2 (scr2log x) (scr2log (- y))))) @@ -117,7 +117,7 @@ ))))) -(def-window-callback mg-passive-motion-callback (x y) +(def-window-callback mg-passive-motion-callback ((x :int)(y :int)) (let ((w (mg-window-current t))) (let ((where (mkv2 (scr2log x) (scr2log (- y))))) @@ -134,7 +134,7 @@ (setf (mouse-pos w) where))))))) -(def-window-callback mg-mouse-callback (button up-or-down x y) +(def-window-callback mg-mouse-callback ((button :int)(up-or-down :int)(x :int)(y :int)) (trc nil "mouse callback entry" button up-or-down x y) (let ((w (mg-window-current t)) (mp (mkv2 (scr2log x)

1 0