From rklochkov at common-lisp.net Sat Dec 31 17:13:09 2011 From: rklochkov at common-lisp.net (CVS User rklochkov) Date: Sat, 31 Dec 2011 09:13:09 -0800 Subject: [gtk-cffi-cvs] CVS gtk-cffi/ext Message-ID: Update of /project/gtk-cffi/cvsroot/gtk-cffi/ext In directory tiger.common-lisp.net:/tmp/cvs-serv22811/ext Log Message: Directory /project/gtk-cffi/cvsroot/gtk-cffi/ext added to the repository From rklochkov at common-lisp.net Sat Dec 31 17:20:56 2011 From: rklochkov at common-lisp.net (CVS User rklochkov) Date: Sat, 31 Dec 2011 09:20:56 -0800 Subject: [gtk-cffi-cvs] CVS gtk-cffi/cffi Message-ID: Update of /project/gtk-cffi/cvsroot/gtk-cffi/cffi In directory tiger.common-lisp.net:/tmp/cvs-serv25018/cffi Modified Files: cffi-object.asd object.lisp Log Message: Moved addons to gtk-cffi-ext --- /project/gtk-cffi/cvsroot/gtk-cffi/cffi/cffi-object.asd 2011/08/26 17:16:13 1.2 +++ /project/gtk-cffi/cvsroot/gtk-cffi/cffi/cffi-object.asd 2011/12/31 17:20:56 1.3 @@ -14,7 +14,7 @@ :author "Roman Klochkov " :version "0.9" :license "BSD" - :depends-on (cffi iterate gtk-cffi-utils) + :depends-on (cffi iterate gtk-cffi-utils trivial-garbage) :components ((:file package) (:file object :depends-on (package)) --- /project/gtk-cffi/cvsroot/gtk-cffi/cffi/object.lisp 2011/09/10 16:26:09 1.5 +++ /project/gtk-cffi/cvsroot/gtk-cffi/cffi/object.lisp 2011/12/31 17:20:56 1.6 @@ -21,10 +21,13 @@ :initarg :volatile :initform t) (id :type symbol :accessor id :initarg :id :initform nil)) (:documentation "Lisp wrapper for any object. VOLATILE slot set when object -shouldn't be stored in *OBJECTS*")) +shouldn't be stored in *OBJECTS*. Stored pointer GC'ed, if VOLATILE.")) (defmethod (setf pointer) :after (value (object object)) (declare (type foreign-pointer value)) + (tg:cancel-finalization object) + (when (and (volatile object) (not (null-pointer-p value))) + (tg:finalize object (lambda () (foreign-free value)))) (unless (or (volatile object) (null-pointer-p value)) (setf (gethash (pointer-address value) *objects*) object) (when (id object) From rklochkov at common-lisp.net Sat Dec 31 17:20:56 2011 From: rklochkov at common-lisp.net (CVS User rklochkov) Date: Sat, 31 Dec 2011 09:20:56 -0800 Subject: [gtk-cffi-cvs] CVS gtk-cffi/examples Message-ID: Update of /project/gtk-cffi/cvsroot/gtk-cffi/examples In directory tiger.common-lisp.net:/tmp/cvs-serv25018/examples Modified Files: ex2.lisp Log Message: Moved addons to gtk-cffi-ext --- /project/gtk-cffi/cvsroot/gtk-cffi/examples/ex2.lisp 2011/09/10 16:26:10 1.4 +++ /project/gtk-cffi/cvsroot/gtk-cffi/examples/ex2.lisp 2011/12/31 17:20:56 1.5 @@ -41,7 +41,7 @@ (event :pointer) (module gtk-string)) (declare (ignore widget)) - (when (eq (gdk-cffi:parse-event event :keyval) :f12) + (when (eq (gdk-cffi:parse-event event :keyval) (gdk-cffi:key :f12)) (format t "~a~%" module) (if (string= module "main") (destroy (gethash "main" *apps*)) From rklochkov at common-lisp.net Sat Dec 31 17:20:56 2011 From: rklochkov at common-lisp.net (CVS User rklochkov) Date: Sat, 31 Dec 2011 09:20:56 -0800 Subject: [gtk-cffi-cvs] CVS gtk-cffi/ext Message-ID: Update of /project/gtk-cffi/cvsroot/gtk-cffi/ext In directory tiger.common-lisp.net:/tmp/cvs-serv25018/ext Added Files: addons.lisp Log Message: Moved addons to gtk-cffi-ext --- /project/gtk-cffi/cvsroot/gtk-cffi/ext/addons.lisp 2011/12/31 17:20:56 NONE +++ /project/gtk-cffi/cvsroot/gtk-cffi/ext/addons.lisp 2011/12/31 17:20:56 1.1 (in-package :gtk-cffi) (defmethod show ((seq sequence) &key &allow-other-keys) (show (gtk-model 'window ('scrolled-window ('tree-view :model (make-instance 'lisp-model :implementation (make-instance 'lisp-model-array :array (map 'vector (compose #'list #'princ-to-string) seq) :columns '(:string))) :columns '("Array")))))) ;; (defun status-tree () ;; (let ((tree-model (make-instance 'tree-strore))) ;; (show ;; (gtk-model ;; 'window ;; ('scrolled-window ;; ('tree-view :model tree-model)))))) From rklochkov at common-lisp.net Sat Dec 31 17:20:56 2011 From: rklochkov at common-lisp.net (CVS User rklochkov) Date: Sat, 31 Dec 2011 09:20:56 -0800 Subject: [gtk-cffi-cvs] CVS gtk-cffi/g-lib Message-ID: Update of /project/gtk-cffi/cvsroot/gtk-cffi/g-lib In directory tiger.common-lisp.net:/tmp/cvs-serv25018/g-lib Modified Files: array.lisp Log Message: Moved addons to gtk-cffi-ext --- /project/gtk-cffi/cvsroot/gtk-cffi/g-lib/array.lisp 2011/09/16 17:58:33 1.4 +++ /project/gtk-cffi/cvsroot/gtk-cffi/g-lib/array.lisp 2011/12/31 17:20:56 1.5 @@ -9,11 +9,11 @@ (defvar *array-length* (foreign-alloc :uint)) +;; TODO: add with-pointer-to-vector-data optimization (define-foreign-type cffi-array () ((element-type :initarg :type :accessor element-type)) (:actual-type :pointer)) - (define-parse-method garray (type) (make-instance 'cffi-array :type type)) From rklochkov at common-lisp.net Sat Dec 31 17:20:56 2011 From: rklochkov at common-lisp.net (CVS User rklochkov) Date: Sat, 31 Dec 2011 09:20:56 -0800 Subject: [gtk-cffi-cvs] CVS gtk-cffi/gtk Message-ID: Update of /project/gtk-cffi/cvsroot/gtk-cffi/gtk In directory tiger.common-lisp.net:/tmp/cvs-serv25018/gtk Modified Files: gtk-cffi.asd loadlib.lisp package.lisp text-buffer.lisp tree-model.lisp Removed Files: addons.lisp lisp-model.lisp Log Message: Moved addons to gtk-cffi-ext --- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/gtk-cffi.asd 2011/10/23 08:39:53 1.9 +++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/gtk-cffi.asd 2011/12/31 17:20:56 1.10 @@ -446,15 +446,6 @@ :components ((:file :image))) -(defsystem gtk-cffi-lisp-model - :description "Interface to GTK/Glib via CFFI" - :author "Roman Klochkov " - :version "0.1" - :license "GPL" - :depends-on (gtk-cffi-tree-model) - :components - ((:file lisp-model))) - (defsystem gtk-cffi-addons :description "Useful bits for GTK" :author "Roman Klochkov " @@ -494,6 +485,5 @@ gtk-cffi-notebook gtk-cffi-image gtk-cffi-text-view - gtk-cffi-addons - gtk-cffi-lisp-model)) + gtk-cffi-addons)) --- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/loadlib.lisp 2011/08/26 17:16:14 1.2 +++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/loadlib.lisp 2011/12/31 17:20:56 1.3 @@ -17,11 +17,12 @@ ;; (t value))) -(define-foreign-library :gtk - (:unix "libgtk-3.so.0") ;libgtk-x11-2.0.so") - (:windows "libgtk-win32-3-0.dll")) - -(load-foreign-library :gtk) +(eval-when (:compile-toplevel :load-toplevel :execute) + (define-foreign-library :gtk + (:unix "libgtk-3.so.0") ;libgtk-x11-2.0.so") + (:windows "libgtk-win32-3-0.dll")) + + (load-foreign-library :gtk)) --- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/package.lisp 2011/10/23 08:39:53 1.9 +++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/package.lisp 2011/12/31 17:20:56 1.10 @@ -365,7 +365,7 @@ #:text-iter-editable #:can-insert #:starts-word - #:end-word + #:ends-word #:inside-word #:starts-line #:starts-sentence @@ -602,11 +602,6 @@ #:image - #:lisp-model - #:implementation - #:lisp-model-array - #:larray - #:expander )) --- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-buffer.lisp 2011/10/23 08:39:53 1.3 +++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/text-buffer.lisp 2011/12/31 17:20:56 1.4 @@ -70,7 +70,7 @@ ((text-iter-editable . editable) :boolean (default-setting :boolean)) (can-insert :boolean (default-editability :boolean)) (starts-word :boolean) - (end-word :boolean) + (ends-word :boolean) (inside-word :boolean) (starts-line :boolean) (starts-sentence :boolean) --- /project/gtk-cffi/cvsroot/gtk-cffi/gtk/tree-model.lisp 2011/09/21 12:03:47 1.5 +++ /project/gtk-cffi/cvsroot/gtk-cffi/gtk/tree-model.lisp 2011/12/31 17:20:56 1.6 @@ -138,6 +138,7 @@ (model pobject) (iter pobject)) (defmethod iter->path ((tree-model tree-model) (tree-iter tree-iter)) + (warn "Dangerous method: don't forget to use free") (gtk-tree-model-get-path tree-model tree-iter)) (defcfun "gtk_tree_model_get_string_from_iter" :string