cells-gtk-cvs

cells-gtk-cvs@common-lisp.net

371 discussions

[cells-gtk-cvs] CVS public_html
by pdenno 10 Feb '06

10 Feb '06

Update of /project/cells-gtk/cvsroot/public_html In directory common-lisp:/tmp/cvs-serv1991/public_html Modified Files: faq.html Log Message: Updated comments about Hello-C and CLISP. --- /project/cells-gtk/cvsroot/public_html/faq.html 2005/10/08 15:03:29 1.11 +++ /project/cells-gtk/cvsroot/public_html/faq.html 2006/02/11 04:02:35 1.12 @@ -30,8 +30,6 @@ <ul> <li><a href="#q1">What is Cells-GTK?</a></li> <li><a href="#q2">What is Cells?</a></li> - <li><a href="#q3">Why is the Clisp distribution separate?</a></li> - <li><a href="#q4">If Cells-GTK uses UFFI, what is this "hello-C" thing about?</a></li> <li><a href="#q5">Did anyone really ask these questions?</a></li> <li><a href="#q6">What GTK Widgets are implemented in cells-gtk?</a></li> <li><a href="#q7">Do I have to use cells?</a></li> @@ -55,9 +53,8 @@ Q: What is Cells-GTK? A: Cells-GTK is a lisp binding of GTK written by Vasilis Margioulas. It uses the Cells system, a sort of constraint propagation system written by kenny tilton. -(see "What is Cells?"). As of this writing Cells-GTK runs under Allegro, Lispworks -and CMUCL. A separate distribution (not quite up to date with the former) runs -on CLisp. +(see "What is Cells?"). As of this writing Cells-GTK runs under Allegro, Lispworks, CMUCL, SBCL +and CLISP. Q: What is Cells? A: From the Cells website: "Cells is a mature, stable extension to CLOS that allows you @@ -116,15 +113,6 @@ -Q: Why is the Clisp distribution separate? -A: Because as of this writing, UFFI, which Cells-GTK uses, doesn't support CLISP. - -Q: If Cells-GTK uses UFFI, what is this "hello-C" thing about? -A: Hello-C is kenny tilton's branch of UFFI to address the fact that -UFFI doesn't support CLisp. Hello-c does a few extra things as well. Whether we -stick with this approach, whether we can add UFFI support for CLisp, etc....time -will tell. - Q: Did anyone really ask these questions? A: Naw, I (Peter Denno) am just talking to myself. @@ -369,7 +357,7 @@ <address><a href="mailto:peter.denno@nist.gov">Peter Denno</a></address>   -Last modified: 2005-10-08 +Last modified: 2006-02-10  </div> </body>

1 0

[cells-gtk-cvs] CVS public_html
by pdenno 10 Feb '06

10 Feb '06

Update of /project/cells-gtk/cvsroot/public_html In directory common-lisp:/tmp/cvs-serv32692/public_html Modified Files: index.html Log Message: Added news of update to use CFFI 0.9, removal of all Hello-C code. --- /project/cells-gtk/cvsroot/public_html/index.html 2006/01/04 16:44:42 1.17 +++ /project/cells-gtk/cvsroot/public_html/index.html 2006/02/11 03:52:17 1.18 @@ -74,6 +74,7 @@ <h1 id='news'>News</h1> <ul> + <li> 2006-02-10 Source on CVS is updated to use CFFI 0.9 and all Hello-C code has been eliminated.</li> <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

1 0

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

10 Feb '06

Update of /project/cells-gtk/cvsroot/root/gtk-ffi In directory common-lisp:/tmp/cvs-serv32582/root/gtk-ffi Modified Files: gtk-utilities.lisp Log Message: Replaced hello-c:ff-defun-callable with cffi:defcallback. Replaced some fgn-alloc fgn-free stuff with equivalent cffi. --- /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-utilities.lisp 2006/01/03 19:10:45 1.16 +++ /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-utilities.lisp 2006/02/11 03:48:09 1.17 @@ -82,46 +82,36 @@ ,@body) (gdk-threads-leave))) -(ffx:ff-defun-callable :cdecl :int button-press-event-handler - ((widget :pointer-void) (signal (* gdk-event-button)) (data :pointer-void)) +(cffi:defcallback button-press-event-handler :int + ((widget :pointer) (signal :pointer) (data :pointer)) (let ((event (gdk-event-button-type signal))) - (when (or (eql (event-type event) :button_press) + (when (or (eql (event-type event) :button_press) (eql (event-type event) :button_release)) (when (= (gdk-event-button-button signal) 3) - (gtk-menu-popup widget nil nil nil nil 3 - (gdk-event-button-time signal))))) + (gtk-menu-popup widget nil nil nil nil 3 + (gdk-event-button-time signal))))) 0) (defun gtk-widget-set-popup (widget menu) (gtk-signal-connect-swap widget "button-press-event" - (ffx:ff-register-callable 'button-press-event-handler) + (cffi:get-callback 'button-press-event-handler) :data menu) (gtk-signal-connect-swap widget "button-release-event" - (ffx:ff-register-callable 'button-press-event-handler) + (cffi:get-callback 'button-press-event-handler) :data menu)) (defun gtk-list-store-new (col-types) - (let ((c-types (ffx:fgn-alloc :int (length col-types)))) + (let ((c-types (cffi:foreign-alloc :int :count (length col-types)))) ;(ffx:fgn-alloc :int (length col-types)))) (loop for type in col-types for n upfrom 0 - do (setf (ffx:elti c-types n) (as-gtk-type type))) + do (setf (cffi:mem-aref c-types :int n) (coerce (as-gtk-type type) 'integer))) (prog1 (gtk-list-store-newv (length col-types) c-types) - (ffx:fgn-free c-types)))) + (cffi:foreign-free c-types)))) (defun gvi (&optional (key :anon)) - key -;;; (ukt:trc nil "gvi> " keY) -;;; (let ((tv (ffx:fgn-alloc :int 32))) -;;; (dotimes (n 32) (setf (ffx:elti tv n) 0)) -;;; (loop for type in '(:string :icon :int :string) -;;; do (print (list tv type (as-gtk-type type) -;;; (g_value_init tv (as-gtk-type type)))) -;;; (g_value_unset tv)) -;;; (ffx:fgn-free tv)) - ) - + key) (defun gtk-list-store-set (lstore iter types-lst data-lst) (with-g-value (value) @@ -156,10 +146,10 @@ (gvi :post-set)))) (defun gtk-tree-store-new (col-types) - (let ((gtk-types (ffx:fgn-alloc :int (length col-types)))) + (let ((gtk-types (cffi:foreign-alloc :int :count (length col-types)))) ;(ffx:fgn-alloc :int (length col-types)) (loop for type in col-types for tn upfrom 0 - do (setf (ffx:elti gtk-types tn) (as-gtk-type type))) + do (setf (cffi:mem-aref gtk-types :int tn) (coerce (as-gtk-type type) 'integer))) (gtk-tree-store-newv (length col-types) gtk-types))) (defun gtk-tree-store-set (tstore iter types-lst data-lst) @@ -234,7 +224,7 @@ (DECLARE (ignorable tree-column data)) (ukt:trc nil "gtv-render-cell (callback)> entry" tree-column cell-renderer model iter data) - (let ((return-buffer (ffx:fgn-alloc :int 16))) + (let ((return-buffer (cffi:foreign-alloc :int :count 16))) (gtk-tree-model-get model iter col return-buffer -1) (let* ((returned-value (deref-pointer-runtime-typed return-buffer @@ -267,9 +257,8 @@ (when cell-attrib-f (loop for property in (parse-cell-attrib (funcall cell-attrib-f item-value)) do (apply #'gtk-object-set-property cell-renderer property))) - (when ret$ - (uffi:free-foreign-object ret$)) - (ffx:fgn-free return-buffer))) + (when ret$ (cffi:foreign-free ret$)) + (cffi:foreign-free return-buffer))) 1)) (defun gtk-file-chooser-get-filenames-strs (file-chooser)

1 0

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

10 Feb '06

Update of /project/cells-gtk/cvsroot/root/gtk-ffi In directory common-lisp:/tmp/cvs-serv32561/root/gtk-ffi Modified Files: gtk-other.lisp Log Message: Removed duplicate gtk-text-buffer-get-char-count --- /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-other.lisp 2006/01/03 19:09:41 1.11 +++ /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-other.lisp 2006/02/11 03:46:42 1.12 @@ -18,7 +18,6 @@ (in-package :gtk-ffi) - (def-gtk-lib-functions :gtk ;; main-loop (gtk-init ((argc (c-ptr-null int)) @@ -636,8 +635,6 @@ (tag c-pointer) (start c-pointer) (end c-pointer))) - (gtk-text-buffer-get-char-count ((buffer c-pointer)) - int) (gtk-text-buffer-create-mark ((buffer c-pointer) (mark-name c-string) (where c-pointer)

1 0

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

10 Feb '06

Update of /project/cells-gtk/cvsroot/root/gtk-ffi In directory common-lisp:/tmp/cvs-serv32542/root/gtk-ffi Modified Files: gtk-ffi.lisp Log Message: muffle-warning on style-warning, cffi stuff --- /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-ffi.lisp 2006/01/04 16:32:44 1.15 +++ /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-ffi.lisp 2006/02/11 03:45:55 1.16 @@ -17,7 +17,7 @@ |# -(defpackage :gtk-ffi (:use :common-lisp :ffx :uffi)) +(defpackage :gtk-ffi (:use :common-lisp :uffi)) (in-package :gtk-ffi) @@ -56,10 +56,11 @@ #+libcellsgtk (:cgtk "libcellsgtk.dll"))) (defun load-gtk-libs () (macrolet ((loadit (libname module) - `(uffi:load-foreign-library - (concatenate 'string cl-user::*gtk-lib-path* ,libname) - :force-load #+lispworks t #-lispworks nil - :module ,(string module)))) + `(handler-bind ((style-warning #'muffle-warning)) + (uffi:load-foreign-library + (concatenate 'string cl-user::*gtk-lib-path* ,libname) + :force-load #+lispworks t #-lispworks nil + :module ,(string module))))) #+(or win32 mswindows) (progn (loadit "libgobject-2.0-0.dll" :gobject) @@ -136,13 +137,13 @@ finally (return (list (mapcar 'list gsyms arg$s) pass-args))))) `(progn - (uffi:def-function (,gtk-name$ ,gtk-name) - ,(mapcar (lambda (name-type) - (destructuring-bind (name type) name-type - (list name (ffi-to-uffi-type type)))) - arguments) - :module ,(string library) - :returning ,(ffi-to-uffi-type return-type)) + (uffi:def-function (,gtk-name$ ,gtk-name) + ,(mapcar (lambda (name-type) + (destructuring-bind (name type) name-type + (list name (ffi-to-uffi-type type)))) + arguments) + :module ,(string library) + :returning ,(ffi-to-uffi-type return-type)) (defun ,name ,(mapcar 'car arguments) (when *gtk-debug* ,(unless (or (string= (symbol-name name) "GTK-EVENTS-PENDING")

1 0

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

10 Feb '06

Update of /project/cells-gtk/cvsroot/root/gtk-ffi In directory common-lisp:/tmp/cvs-serv31260/root/gtk-ffi Modified Files: gtk-ffi.asd Log Message: removed reference to ffx.lisp --- /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-ffi.asd 2006/01/03 19:06:22 1.10 +++ /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-ffi.asd 2006/02/11 03:44:32 1.11 @@ -12,8 +12,8 @@ ;;; Specify for Lispworks (definitely), other maybe. #+macosx(setf *gtk-lib-path* "/sw/lib/") #+(or win32 mswindows)(setf *gtk-lib-path* "E:/GTK/bin/") -;#-(or macosx win32 mswindows)(setf *gtk-lib-path* "/usr/lib/") -#-(or macosx win32 mswindows)(setf *gtk-lib-path* "/opt/gnome/lib/") ; For my SuSE machine +#-(or macosx win32 mswindows)(setf *gtk-lib-path* "/usr/lib/") +;#-(or macosx win32 mswindows)(setf *gtk-lib-path* "/opt/gnome/lib/") ; For my SuSE machine ;;; Step 2 -- If you built or downloaded the libcellsgtk library, uncomment the next line. (pushnew :libcellsgtk *features*) @@ -22,8 +22,7 @@ :name "gtk-ffi" :depends-on (:cells :cffi :cffi-uffi-compat) :components - ((:file "ffx") ; Novikov Leonid's compatibility stuff from hello-c - (:file "gtk-ffi" :depends-on ("ffx")) + ((:file "gtk-ffi") (:file "gtk-core" :depends-on ("gtk-ffi")) (:file "gtk-other" :depends-on ("gtk-ffi")) (:file "gtk-button" :depends-on ("gtk-ffi"))

1 0

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

10 Feb '06

Update of /project/cells-gtk/cvsroot/root/gtk-ffi In directory common-lisp:/tmp/cvs-serv31246/root/gtk-ffi Removed Files: ffx.lisp Log Message: No longer used.

1 0

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

10 Feb '06

Update of /project/cells-gtk/cvsroot/root/gtk-ffi In directory common-lisp:/tmp/cvs-serv31208/root/gtk-ffi Modified Files: gtk-definitions.lisp Log Message: Replaced some fgn-alloc fgn-free stuff with equivalent cffi. --- /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-definitions.lisp 2004/12/05 06:31:14 1.2 +++ /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-definitions.lisp 2006/02/11 03:41:05 1.3 @@ -64,14 +64,15 @@ (def-struct g-value (g-type (:array :int 16))) +;;; POD variable capture! (defmacro with-g-value ((var) &body body) - `(let ((,var (ffx:fgn-alloc 'g-value 1 :with-g-value ',var))) + `(let ((,var (cffi:foreign-alloc 'g-value))) (unwind-protect (progn (dotimes (n 16) (setf (int-slot-indexed ,var 'g-value 'g-type n) 0)) ,@body) - (ffx:fgn-free ,var)))) + (cffi:foreign-free ,var)))) (eval-when (compile load eval) (export 'with-g-value))

1 0

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

10 Feb '06

Update of /project/cells-gtk/cvsroot/root/gtk-ffi In directory common-lisp:/tmp/cvs-serv31188/root/gtk-ffi Modified Files: gtk-core.lisp Log Message: Replaced some fgn-alloc fgn-free stuff with equivalent cffi. --- /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-core.lisp 2006/01/03 19:05:17 1.5 +++ /project/cells-gtk/cvsroot/root/gtk-ffi/gtk-core.lisp 2006/02/11 03:40:26 1.6 @@ -49,7 +49,7 @@ (gdk-flush ())) (def-union g-value-data - (v-int :int) + (v-int :int) (v-uint :unsigned-int) (v-long :long) (v-ulong :unsigned-long) @@ -69,14 +69,14 @@ (defun call-with-g-value (fn) (declare (optimize (speed 3) (safety 0) (space 0))) - (let ((gva (ffx:fgn-alloc 'g-value 1 :with-g-value))) + (let ((gva (cffi:foreign-alloc 'g-value))) (unwind-protect (dotimes (n 16) - (let ((gv (ffx:ff-elt gva 'g-value 0))) - (let ((ns (get-slot-pointer gv 'g-value 'g-type))) - (setf (deref-array ns '(:array :int) n) 0)))) + (let* ((gv (cffi:mem-aref gva 'g-value 0)) + (ns (get-slot-pointer gv 'g-value 'g-type))) + (setf (cffi:mem-aref ns ':int n) 0)))) (funcall fn gva) - (ffx:fgn-free gva)))) + (cffi:foreign-free gva))) (eval-when (compile load eval) (export 'with-g-value))

1 0

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

10 Feb '06

Update of /project/cells-gtk/cvsroot/root/cells-gtk In directory common-lisp:/tmp/cvs-serv31088/root/cells-gtk Modified Files: widgets.lisp Log Message: Replaced hello-c:ff-defun-callable with cffi:defcallback. Replaced some fgn-alloc fgn-free stuff with equivalent cffi. --- /project/cells-gtk/cvsroot/root/cells-gtk/widgets.lisp 2006/01/03 19:03:02 1.15 +++ /project/cells-gtk/cvsroot/root/cells-gtk/widgets.lisp 2006/02/11 03:39:10 1.16 @@ -110,15 +110,15 @@ (intern (format nil "GTK-~a~{-~a~}" class slot-access) :gtk-ffi)))) ;;; --- widget -------------------- -;;; Define handlers that recover the the callback defined on the widget +;;; Define handlers that recover the callback defined on the widget + (defmacro def-gtk-event-handler (event) - `(ff-defun-callable :cdecl :int ,(intern (string-upcase (format nil "~a-handler" event))) - ((widget :pointer-void) (event :pointer-void) (data :pointer-void)) - ;(print (list :entered-gtk-event-handler-cb ,(symbol-name event) widget)) + `(cffi:defcallback ,(intern (format nil "~a-HANDLER" event)) :int + ((widget :pointer) (event :pointer) (data :pointer)) (bif (self (gtk-object-find widget)) - (let ((cb (callback-recover self ,(intern (symbol-name event) :keyword)))) - (funcall cb self widget event data)) - (trc nil "unknown widget. from prior run. clean up on errors" widget)))) + (let ((cb (callback-recover self ,(intern (string event) :keyword)))) + (funcall cb self widget event data)) + (trc nil "Unknown widget from prior run. Clean up on errors" widget)))) (def-gtk-event-handler clicked) (def-gtk-event-handler changed) @@ -131,15 +131,15 @@ (def-gtk-event-handler modified-changed) (defparameter *widget-callbacks* - (list (cons 'clicked (ff-register-callable 'clicked-handler)) - (cons 'changed (ff-register-callable 'changed-handler)) - (cons 'activate (ff-register-callable 'activate-handler)) - (cons 'value-changed (ff-register-callable 'value-changed-handler)) - (cons 'day-selected (ff-register-callable 'day-selected-handler)) - (cons 'selection-changed (ff-register-callable 'selection-changed-handler)) - (cons 'toggled (ff-register-callable 'toggled-handler)) - (cons 'delete-event (ff-register-callable 'delete-event-handler)) - (cons 'modified-changed (ff-register-callable 'modified-changed-handler)))) + (list (cons 'clicked (cffi:get-callback 'clicked-handler)) + (cons 'changed (cffi:get-callback 'changed-handler)) + (cons 'activate (cffi:get-callback 'activate-handler)) + (cons 'value-changed (cffi:get-callback 'value-changed-handler)) + (cons 'day-selected (cffi:get-callback 'day-selected-handler)) + (cons 'selection-changed (cffi:get-callback 'selection-changed-handler)) + (cons 'toggled (cffi:get-callback 'toggled-handler)) + (cons 'delete-event (cffi:get-callback 'delete-event-handler)) + (cons 'modified-changed (cffi:get-callback 'modified-changed-handler)))) (eval-when (:compile-toplevel :load-toplevel :execute) @@ -226,14 +226,11 @@ ,@body 1)))) -(ff-defun-callable :cdecl :int timeout-handler-callback - ((data (* :int))) - ;;(print (list :timeout-handler-callback data)) - (let* ((id (elti data 0)) - (r2 (gtk-global-callback-funcall id))) - (trc nil "timeout func really returning" r2) - (if r2 1 0))) - +(cffi:defcallback timeout-handler-callback :int ((data :pointer)) + (let* ((id (cffi:mem-aref data :int 0)) + (r2 (gtk-global-callback-funcall id))) + (trc nil "timeout func really returning" r2) + (if r2 1 0))) (defun timeout-add (milliseconds function) (let ((id (gtk-global-callback-register @@ -244,9 +241,9 @@ (trc nil "timeout func returning" r) r)))) (c-id (fgn-alloc :int 1))) - (setf (elti c-id 0) id) - (trc nil "timeout-add > passing cb data, *data" c-id (elti c-id 0)) - (g-timeout-add milliseconds (ff-register-callable 'timeout-handler-callback) c-id))) + (setf (cffi:mem-aref c-id :int 0) (coerce id 'integer)) + (trc nil "timeout-add > passing cb data, *data" c-id (cffi:mem-aref c-id :int 0)) + (g-timeout-add milliseconds (cffi:get-callback 'timeout-handler-callback) c-id))) (def-object widget () ((tooltip :accessor tooltip :initarg :tooltip :initform (c-in nil))

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
38
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

cells-gtk-cvs