- cells-gtk-cvs@common-lisp.net - mailman3.common-lisp.net

[cells-gtk-cvs] CVS root/cells-gtk
by pdenno 11 Feb '06

11 Feb '06

Update of /project/cells-gtk/cvsroot/root/cells-gtk In directory common-lisp:/tmp/cvs-serv31057/root/cells-gtk Modified Files: tree-view.lisp Log Message: Replaced hello-c:ff-defun-callable with cffi:defcallback --- /project/cells-gtk/cvsroot/root/cells-gtk/tree-view.lisp 2006/01/03 19:01:59 1.12 +++ /project/cells-gtk/cvsroot/root/cells-gtk/tree-view.lisp 2006/02/11 03:38:02 1.13 @@ -82,20 +82,19 @@ finally (return node))) ;;; Used by combo-box also, when it is using a tree model. -(ff-defun-callable :cdecl :void tree-view-items-selector - ((model :pointer-void) (path :pointer-void) (iter :pointer-void) (data :pointer-void)) +(cffi:defcallback tree-view-items-selector :void + ((model :pointer) (path :pointer) (iter :pointer) (data :pointer)) (let ((tree (of-tree (gtk-object-find model)))) - (push (item-from-path - (children-fn tree) - (roots tree) - (read-from-string - (gtk-tree-model-get-cell model iter (length (column-types tree)) :string))) + (push (item-from-path (children-fn tree) + (roots tree) + (read-from-string + (gtk-tree-model-get-cell model iter (length (column-types tree)) :string))) (selected-items-cache tree))) 0) (defmethod get-selection ((self tree-view)) (let ((selection (gtk-tree-view-get-selection (id self))) - (cb (ff-register-callable 'tree-view-items-selector))) + (cb (cffi:get-callback 'tree-view-items-selector))) (setf (selected-items-cache self) nil) (gtk-tree-selection-selected-foreach selection cb c-null) (if (equal (gtk-tree-selection-get-mode selection) 3) ;;multiple @@ -112,12 +111,12 @@ (:browse 2) (:multiple 3)))))) -(ff-defun-callable :cdecl :void tree-view-select-handler - ((column-widget :pointer-void) (event :pointer-void) (data :pointer-void)) +(cffi:defcallback tree-view-select-handler :void + ((column-widget :pointer) (event :pointer) (data :pointer)) (bif (tree-view (gtk-object-find column-widget)) - (let ((cb (callback-recover tree-view :on-select))) - (funcall cb tree-view column-widget event data)) - (trc "dude, clean up old widgets after runs" column-widget)) + (let ((cb (callback-recover tree-view :on-select))) + (funcall cb tree-view column-widget event data)) + (trc "Clean up old widgets after runs" column-widget)) 0) ;;; The check that previously was performed here (for a clos object) caused the handler @@ -127,7 +126,7 @@ (let ((selected-widget (gtk-tree-view-get-selection (id self)))) (gtk-object-store selected-widget self) ;; tie column widget to clos tree-view (callback-register self :on-select new-value) - (let ((cb (ff-register-callable 'tree-view-select-handler))) + (let ((cb (cffi:get-callback 'tree-view-select-handler))) ;(trc nil "tree-view on-select pcb:" cb selected-widget "changed") (gtk-signal-connect selected-widget "changed" cb))))) @@ -209,14 +208,14 @@ (gtk-tree-store-set-kids model sub-tree iter pos column-types print-fn children-fn (cons index path))))) -(ff-defun-callable :cdecl :int tree-view-render-cell-callback - ((tree-column :pointer-void) (cell-renderer :pointer-void) - (tree-model :pointer-void) (iter :pointer-void) (data :pointer-void)) +(cffi:defcallback tree-view-render-cell-callback :int + ((tree-column :pointer) (cell-renderer :pointer) (tree-model :pointer) + (iter :pointer) (data :pointer)) (bif (self (gtk-object-find tree-column)) - (let ((cb (callback-recover self :render-cell))) - (assert cb () "No :render-cell callback for ~a" self) - (funcall cb tree-column cell-renderer tree-model iter data)) - (trc nil "dude, clean up old widgets from prior runs" tree-column)) + (let ((cb (callback-recover self :render-cell))) + (assert cb nil "no :render-cell callback for ~a" self) + (funcall cb tree-column cell-renderer tree-model iter data)) + (trc nil "Clean up old widgets from prior runs." tree-column)) 1) (def-c-output columns ((self tree-view)) @@ -229,7 +228,7 @@ (t (gtk-cell-renderer-text-new))) do (gtk-tree-view-column-pack-start (id col) renderer t) (gtk-tree-view-column-set-cell-data-func (id col) renderer - (let ((cb (ff-register-callable 'tree-view-render-cell-callback))) + (let ((cb (cffi:get-callback 'tree-view-render-cell-callback))) ;(trc nil "tree-view columns pcb:" cb (id col) :render-cell) (callback-register col :render-cell (gtk-tree-view-render-cell pos

1 0

[cells-gtk-cvs] CVS root/cells-gtk
by pdenno 11 Feb '06

11 Feb '06

Update of /project/cells-gtk/cvsroot/root/cells-gtk In directory common-lisp:/tmp/cvs-serv31035/root/cells-gtk Modified Files: textview.lisp Log Message: Replaced hello-c:ff-defun-callable with cffi:defcallback --- /project/cells-gtk/cvsroot/root/cells-gtk/textview.lisp 2006/01/03 19:01:20 1.6 +++ /project/cells-gtk/cvsroot/root/cells-gtk/textview.lisp 2006/02/11 03:37:13 1.7 @@ -69,8 +69,8 @@ when (eql type :menu-item) collect `(funcall #'make-instance 'populate-adds ,@args)))) -(ff-defun-callable :cdecl :void text-view-populate-popup-handler - ((widget :pointer-void) (signal :pointer-void) (data :pointer-void)) +(cffi:defcallback text-view-populate-popup-handler :void + ((widget :pointer) (signal :pointer) (data :pointer)) (let ((popup-menu (gtk-adds-text-view-popup-menu widget))) (bwhen (text-view (gtk-object-find widget)) (bwhen (cb (callback-recover text-view :populate-popup)) @@ -81,7 +81,7 @@ (when new-value (callback-register self :populate-popup (populate-popup-closure (reverse new-value) self)) (gtk-signal-connect (id self) "populate-popup" - (ffx:ff-register-callable 'text-view-populate-popup-handler)))) + (cffi:get-callback 'text-view-populate-popup-handler)))) (defun populate-popup-closure (p-adds text-view) (let (accum)

1 0

[cells-gtk-cvs] CVS root/cells-gtk
by pdenno 11 Feb '06

11 Feb '06

Update of /project/cells-gtk/cvsroot/root/cells-gtk In directory common-lisp:/tmp/cvs-serv31015/root/cells-gtk Modified Files: packages.lisp Log Message: Removed reference to package ffx --- /project/cells-gtk/cvsroot/root/cells-gtk/packages.lisp 2006/01/03 18:59:58 1.2 +++ /project/cells-gtk/cvsroot/root/cells-gtk/packages.lisp 2006/02/11 03:35:13 1.3 @@ -18,8 +18,7 @@ (defpackage :cells-gtk (:nicknames :cgtk) - (:use :common-lisp :utils-kt :cells :gtk-ffi - :uffi #:ffx)) + (:use :common-lisp :utils-kt :cells :gtk-ffi :uffi ))

1 0

[cells-gtk-cvs] CVS root/cells-gtk
by pdenno 11 Feb '06

11 Feb '06

Update of /project/cells-gtk/cvsroot/root/cells-gtk In directory common-lisp:/tmp/cvs-serv30914/root/cells-gtk Modified Files: drawing.lisp Log Message: Replaced hello-c stuff with cffi stuff --- /project/cells-gtk/cvsroot/root/cells-gtk/drawing.lisp 2006/01/03 19:03:33 1.3 +++ /project/cells-gtk/cvsroot/root/cells-gtk/drawing.lisp 2006/02/11 03:34:09 1.4 @@ -17,57 +17,58 @@ (in-package :gtk-ffi) -(ffx:ff-defun-callable :cdecl :int drawing-expose-event-handler - ((drawing-area :pointer-void) (signal (* gdk-event-expose)) (data :pointer-void)) +(cffi:defcallback drawing-expose-event-handler :int + ((drawing-area :pointer) (signal :pointer) (data :pointer)) (declare (ignorable data signal gkd-event-expose widget)) - (bwhen (self (cgtk::gtk-object-find drawing-area)) - (cgtk::init-graphics-context drawing-area) - ;; POD This should draw the entire backing-pixmap - (gdk-draw-drawable - cgtk::*window* cgtk::*gcontext* - (funcall (funcall (intern "DRAW-FN" :cells-gtk) self) self) + (bwhen (self (gtk-object-find drawing-area)) + (init-graphics-context drawing-area) + (gdk-draw-drawable + *window* + *gcontext* + (funcall (funcall (intern "draw-fn" :cells-gtk) self) self) 0 0 0 0 -1 -1) - 0)) + 0)) - -(ffx:ff-defun-callable :cdecl :int drawing-button-events-handler - ((drawing-area :pointer-void) (signal (* gdk-event-button)) (data :pointer-void)) +(cffi:defcallback drawing-button-events-handler :int + ((drawing-area :pointer) (signal :pointer) (data :pointer)) (declare (ignorable data)) - (bwhen (self (cgtk::gtk-object-find drawing-area)) + (bwhen (self (gtk-object-find drawing-area)) (let ((event (gdk-event-button-type signal))) - (when (and (eql (event-type event) :button_press) - (= (gdk-event-button-button signal) 1)) - (setf (cgtk::button1-down self) (cons (truncate (gdk-event-button-x signal)) - (truncate (gdk-event-button-y signal))))) - (when (and (eql (event-type event) :button_release) - (= (gdk-event-button-button signal) 1)) - (setf (cgtk::button1-down self) nil)))) + (when (and (eql (event-type event) :button_press) + (= (gdk-event-button-button signal) 1)) + (setf (button1-down self) + (cons (truncate (gdk-event-button-x signal)) + (truncate (gdk-event-button-y signal))))) + (when (and (eql (event-type event) :button_release) + (= (gdk-event-button-button signal) 1)) + (setf (button1-down self) nil)))) 0) -(ffx:ff-defun-callable :cdecl :int drawing-pointer-motion-handler - ((drawing-area :pointer-void) (signal (* gdk-event-motion)) (data :pointer-void)) + +(cffi:defcallback drawing-pointer-motion-handler :int + ((drawing-area :pointer) (signal :pointer) (data :pointer)) (declare (ignorable data signal widget)) - (bwhen (self (cgtk::gtk-object-find drawing-area)) - (bwhen (button1 (cgtk::button1-down self)) - (let ((dx (- (truncate (gdk-event-motion-x signal)) (car button1))) - (dy (- (truncate (gdk-event-motion-y signal)) (cdr button1)))) - ;; POD NYI this should drag the thing closest to pointer, and redraw around it. - (loop for drawable being the hash-value of (cgtk::gobjects self) do - (gdk-draw-drawable cgtk::*window* cgtk::*gcontext* drawable 0 0 dx dy -1 -1))))) + (bwhen (self (gtk-object-find drawing-area)) + (bwhen (button1 (button1-down self)) + (let ((dx (- (truncate (gdk-event-motion-x signal)) (car button1))) + (dy(- (truncate (gdk-event-motion-y signal)) (cdr button1)))) + (loop for drawable being the hash-value of (gobjects self) do + (gdk-draw-drawable *window* *gcontext* drawable 0 0 dx dy -1 -1))))) 0) + (defun gtk-drawing-set-handlers (widget data) (gtk-signal-connect-swap widget "button-press-event" - (ffx:ff-register-callable 'drawing-button-events-handler) + (cffi:get-callback 'drawing-button-events-handler) :data data) (gtk-signal-connect-swap widget "button-release-event" - (ffx:ff-register-callable 'drawing-button-events-handler) + (cffi:get-callback 'drawing-button-events-handler) :data data) (gtk-signal-connect-swap widget "motion-notify-event" - (ffx:ff-register-callable 'drawing-pointer-motion-handler) + (cffi:get-callback 'drawing-pointer-motion-handler) :data data) (gtk-signal-connect-swap widget "expose-event" - (ffx:ff-register-callable 'drawing-expose-event-handler) + (cffi:get-callback 'drawing-expose-event-handler) :data data)) (export '(gtk-drawing-set-handlers))

1 0

[cells-gtk-cvs] CVS update: root/gtk-ffi/ffx.lisp
by pdenno＠common-lisp.net 20 Jan '06

20 Jan '06

Update of /project/cells-gtk/cvsroot/root/gtk-ffi In directory common-lisp:/tmp/cvs-serv15716/root/gtk-ffi Added Files: ffx.lisp Log Message: This should have been added when the cffi version was created. It was not. Date: Fri Jan 20 08:32:01 2006 Author: pdenno

1 0

[cells-gtk-cvs] CVS update: public_html/index.html
by pdenno＠common-lisp.net 04 Jan '06

04 Jan '06

Update of /project/cells-gtk/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv32353/public_html Modified Files: index.html Log Message: Update for news about SBCL and ACL. Date: Wed Jan 4 17:44:42 2006 Author: pdenno Index: public_html/index.html diff -u public_html/index.html:1.16 public_html/index.html:1.17 --- public_html/index.html:1.16 Tue Jan 3 21:47:12 2006 +++ public_html/index.html Wed Jan 4 17:44:42 2006 @@ -77,8 +77,17 @@ <li> 2006-01-03 BIG NEWS! cells-gtk now runs under <a href="http://clisp.cons.org">CLISP</a> and uses <a href="http://common-lisp.net/project/cffi/">CFFI</a>, not Hello-c for its foreign function interface. The 2006-01-03 tarball reflects these changes. Especial thanks to Novikov Leonid, who did the CLISP port - to get things started. The new code has been tested with Lispworks 4.5 Pro/Linux, CLISP/Linux, and CMUCL/Linux. - If I didn't break anything, it also works CLISP/PC and Lispworks/PC. SBCL is probably an easy port.</li> + to get things started. The new code has been lightly tested with: + <ul> + <li>Lispworks 4.5 Pro/Linux </li> + <li>CLISP/Linux</li> + <li>CMUCL/Linux</li> + <li>ACL 8.0 Beta/Linux (without libcellsgtk)</li> + <li>SBCL 0.9.7.5/Linux/x86, but see the + <a href="http://common-lisp.net/pipermail/cells-gtk-devel/2006-January.txt">note</a> in + the cells-gtk-devel archive for January 2006. + </ul> + If I didn't break anything, it also works with CLISP/PC and Lispworks/PC.</li> <li> 2005-11-15 We now provide the win32 .dll and linux .so for libcellsgtk. They are: <a href="ftp://common-lisp.net/pub/project/cells-gtk/libcellsgtk.so">this for linux</a> and @@ -86,7 +95,7 @@ This is sort of experimental. If you have problems (e.g. with version mismatch) drop the mailing list a note.</li> - <li> 2005-10-08 Some additional discussion in FAQ. Some + <li> 2005-10-08 Some additional discussion in the FAQ. Some work to implement DrawingArea is underway in CVS HEAD. HEAD *should* be OK. New tarballs will be created when it is complete. </li> @@ -114,14 +123,14 @@ <li><a href="ftp://common-lisp.net/pub/project/cells-gtk/cells-gtk-2006-01-03.tgz">cells-gtk-2006-01-03.tgz</a> <ul> <li>Uses CFFI, not Hello-C (See "News" above).</li> - <li>Runs under CLISP, Lispworks, CMUCL and probably others.</li> + <li>Runs under CLISP, Lispworks, CMUCL, SBCL, ACL and maybe others.</li> <li>Checks whether pages of a Notebook are already displayed.</li> <li>Provides a Makefile for libcellsgtk for Windows.</li> <li>Provides more control over divider position in Pane widget.</li> <li>Drawing widget implementation started.</li> <li>Lots of minor stuff.</li> - <li>NOTE: This has only been tested with Linux CLISP, Lispworks and CMUCL. - If it works elsewhere (which it should...I hope) drop the mailing list a note. + <li>NOTE: This has only been tested with the lisps listed in the "News" above. + If it works elsewhere drop the mailing list a note. </ul> <li><a href="ftp://common-lisp.net/pub/project/cells-gtk/cells-gtk-2005-05-29.tgz">cells-gtk-2005-05-29.tgz</a> <ul> @@ -162,7 +171,7 @@ <address><a href="mailto:peter.denno@nist.gov">Peter Denno</a></address>   -Last modified: 2005-10-08 +Last modified: 2006-01-04  <a href="http://validator.w3.org/check?uri=referer"><img src="http://www.w3.org/Icons/valid-xhtml10"

1 0

[cells-gtk-cvs] CVS update: root/gtk-ffi/gtk-ffi.lisp
by pdenno＠common-lisp.net 04 Jan '06

04 Jan '06

Update of /project/cells-gtk/cvsroot/root/gtk-ffi In directory common-lisp.net:/tmp/cvs-serv32265/root/gtk-ffi Modified Files: gtk-ffi.lisp Log Message: Correct defpackage per note from Andras Simon. Date: Wed Jan 4 17:32:46 2006 Author: pdenno Index: root/gtk-ffi/gtk-ffi.lisp diff -u root/gtk-ffi/gtk-ffi.lisp:1.14 root/gtk-ffi/gtk-ffi.lisp:1.15 --- root/gtk-ffi/gtk-ffi.lisp:1.14 Tue Jan 3 20:07:39 2006 +++ root/gtk-ffi/gtk-ffi.lisp Wed Jan 4 17:32:44 2006 @@ -17,8 +17,7 @@ |# -(defpackage :gtk-ffi (:use :lisp :ffx - :uffi)) +(defpackage :gtk-ffi (:use :common-lisp :ffx :uffi)) (in-package :gtk-ffi)

1 0

[cells-gtk-cvs] CVS update: public_html/index.html
by pdenno＠common-lisp.net 03 Jan '06

03 Jan '06

Update of /project/cells-gtk/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv6548/public_html Modified Files: index.html Log Message: typo Date: Tue Jan 3 21:47:13 2006 Author: pdenno Index: public_html/index.html diff -u public_html/index.html:1.15 public_html/index.html:1.16 --- public_html/index.html:1.15 Tue Jan 3 21:41:47 2006 +++ public_html/index.html Tue Jan 3 21:47:12 2006 @@ -114,7 +114,7 @@ <li><a href="ftp://common-lisp.net/pub/project/cells-gtk/cells-gtk-2006-01-03.tgz">cells-gtk-2006-01-03.tgz</a> <ul> <li>Uses CFFI, not Hello-C (See "News" above).</li> - <li>Runs under CLISP.</li> + <li>Runs under CLISP, Lispworks, CMUCL and probably others.</li> <li>Checks whether pages of a Notebook are already displayed.</li> <li>Provides a Makefile for libcellsgtk for Windows.</li> <li>Provides more control over divider position in Pane widget.</li>

1 0

[cells-gtk-cvs] CVS update: public_html/index.html
by pdenno＠common-lisp.net 03 Jan '06

03 Jan '06

Update of /project/cells-gtk/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv5441/public_html Modified Files: index.html Log Message: update about cffi, not uffi Date: Tue Jan 3 21:41:48 2006 Author: pdenno Index: public_html/index.html diff -u public_html/index.html:1.14 public_html/index.html:1.15 --- public_html/index.html:1.14 Tue Jan 3 21:37:04 2006 +++ public_html/index.html Tue Jan 3 21:41:47 2006 @@ -62,13 +62,13 @@ cells-gtk was originally developed by Vasilis Margioulas for <a href="http://clisp.sourceforge.net/">CLisp</a>, -and is now available also with <a href="http://uffi.b9.com/">UFFI </a>bindings +and is now available with <a href="http://common-lisp.net/project/cffi/">CFFI</a> bindings for greater portability. Vasilis included an astonishing array of examples in his initial release, just some of which can be seen in the <a href='screenshots.html'>screenshots</a> graciously provide by Klaus Wiedner. -cell-gtk has been tested under Allegro (Windows), Lispworks (Linux), -and CMUCL(Linux). The currently separate CLisp distribution runs under Windows. +cell-gtk has been tested under Allegro (Windows), Lispworks (Linux, PC), +CLISP (Linux, PC), and CMUCL(Linux).  <h1 id='news'>News</h1> @@ -142,8 +142,9 @@ Information on checking out code from the common-lisp.net repository can be found at <a href="http://common-lisp.net/faq.shtml">http://common-lisp.net/faq.shtml</a></li> - <li>Original CLISP Code: We hope to merge the CLISP version back into - the main tree, but for the time being, the original distro from Vasilis is available + <li>Original CLISP Code: Now that CLISP is back in + the main tree, this isn't the place to start but just in case we screwed something up + and you want to have a look, its <a href="http://common-lisp.net/cgi-bin/viewcvs.cgi/root/?cvsroot=cells-gtk">here</a> via CVS or the "Download tarball" link at the bottom of that page. Follow instructions in the include INSTALL.TXT.</li>

1 0

[cells-gtk-cvs] CVS update: public_html/index.html
by pdenno＠common-lisp.net 03 Jan '06

03 Jan '06

Update of /project/cells-gtk/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv5388/public_html Modified Files: index.html Log Message: typo Date: Tue Jan 3 21:37:04 2006 Author: pdenno Index: public_html/index.html diff -u public_html/index.html:1.13 public_html/index.html:1.14 --- public_html/index.html:1.13 Tue Jan 3 21:34:45 2006 +++ public_html/index.html Tue Jan 3 21:37:04 2006 @@ -115,7 +115,7 @@ <ul> <li>Uses CFFI, not Hello-C (See "News" above).</li> <li>Runs under CLISP.</li> - <li>Checks whether page of Notebook is already displayed</li> + <li>Checks whether pages of a Notebook are already displayed.</li> <li>Provides a Makefile for libcellsgtk for Windows.</li> <li>Provides more control over divider position in Pane widget.</li> <li>Drawing widget implementation started.</li>

1 0