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)