March 2005 - cells-gtk-cvs@common-lisp.net

[cells-gtk-cvs] CVS update: public_html/faq.html
by pdenno＠common-lisp.net 06 Mar '05

06 Mar '05

Update of /project/cells-gtk/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv13278/public_html Modified Files: faq.html Log Message: typo Date: Mon Mar 7 00:38:29 2005 Author: pdenno Index: public_html/faq.html diff -u public_html/faq.html:1.6 public_html/faq.html:1.7 --- public_html/faq.html:1.6 Sun Mar 6 17:48:27 2005 +++ public_html/faq.html Mon Mar 7 00:38:22 2005 @@ -41,7 +41,7 @@ <li><a href="#q10">How do I do xyz?</a></li> <li><a href="#q11">Q: What does this error mean? : "cellular slot FOO of #<BAR 21B555A4> cannot be setf unless initialized as inputp.</a></li> - <li><a href="#q12">Q: Changing a cell value causes dependencies to fire, but what is considered a change?"</li> + <li><a href="#q12">Q: Changing a cell value causes dependencies to fire, but what is considered a change?</li> </ul> <p/> @@ -195,7 +195,7 @@ Read the <a href="cgtk-primer.html">cells-gtk primer</a> for more information. <p/> -<strong id="q12">Q: Changing a cell value causes dependencies to fire, but what is considered a change?"</strong><p/> +<strong id="q12">Q: Changing a cell value causes dependencies to fire, but what is considered a change?</strong><p/> <strong>A:</strong> As you are suggesting, setting a slot to an "equivalent" object should not cause its dependencies to fire again (in order to save substantial useless recalculations). So how is "equivalence" defined? EQL is used unless overridden by providing a function of two arguments @@ -205,7 +205,7 @@ <address><a href="mailto:peter.denno@nist.gov">Peter Denno</a></address>   -Last modified: Sat Mar 5 13:11:28 EST 2005 +Last modified: Sun Mar 6 18:32:15 EST 2005  </div> </body>

1 0

[cells-gtk-cvs] CVS update: public_html/cgtk-primer.html
by pdenno＠common-lisp.net 06 Mar '05

06 Mar '05

Update of /project/cells-gtk/cvsroot/public_html In directory common-lisp.net:/tmp/cvs-serv13248/public_html Modified Files: cgtk-primer.html Log Message: typo Date: Mon Mar 7 00:37:36 2005 Author: pdenno Index: public_html/cgtk-primer.html diff -u public_html/cgtk-primer.html:1.2 public_html/cgtk-primer.html:1.3 --- public_html/cgtk-primer.html:1.2 Sun Mar 6 17:47:50 2005 +++ public_html/cgtk-primer.html Mon Mar 7 00:37:35 2005 @@ -147,7 +147,7 @@ propagation to formula-valued cell dependencies has to happen before any output SETF (and why Cells has a mechanism to defer SETFs of inputs). -<h1>Family: Referencing slots throughout the defmodel heirarchy.</h1> +<h1>Family: Referencing slots throughout the defmodel hierarchy.</h1> The <strong>defmodel</strong> macro defines a part-subpart relationship among components of the interface. The relationship is made by the @@ -160,7 +160,7 @@ <address><a href="mailto:peter.denno@nist.gov">Peter Denno</a></address>   -Last modified: Fri Mar 4 20:21:21 EST 2005 +Last modified: Sun Mar 6 18:36:16 EST 2005  </div> </body>

1 0

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

06 Mar '05

Update of /project/cells-gtk/cvsroot/root/gtk-ffi In directory common-lisp.net:/tmp/cvs-serv23232/root/gtk-ffi Modified Files: gtk-other.lisp Log Message: Many new ff declarations for text-buffer and text-view. Date: Sun Mar 6 18:05:46 2005 Author: pdenno Index: root/gtk-ffi/gtk-other.lisp diff -u root/gtk-ffi/gtk-other.lisp:1.4 root/gtk-ffi/gtk-other.lisp:1.5 --- root/gtk-ffi/gtk-other.lisp:1.4 Sat Feb 26 23:42:29 2005 +++ root/gtk-ffi/gtk-other.lisp Sun Mar 6 18:05:44 2005 @@ -564,9 +564,68 @@ ;;text-buffer (gtk-text-buffer-new ((table c-pointer)) c-pointer) + (gtk-text-buffer-get-text ((buffer c-pointer) + (start c-pointer) + (end c-pointer) + (include-hidden-chars boolean)) + c-string) + (gtk-text-buffer-insert ((buffer c-pointer) + (iter c-pointer) + (text c-string) + (len int))) + (gtk-text-buffer-delete ((buffer c-pointer) + (start c-pointer) + (end c-pointer))) (gtk-text-buffer-set-text ((buffer c-pointer) (text c-string) (len int))) + (gtk-text-buffer-get-char-count ((buffer c-pointer)) + int) + (gtk-text-buffer-insert-at-cursor ((buffer c-pointer) + (text c-pointer) + (len int))) + (gtk-text-buffer-create-tag ((buffer c-pointer) + (tag-name c-string) + (first-property-name c-string) + (second-property-name c-string) ; POD how can I do more? + (eof c-pointer)) + c-pointer) + (gtk-text-buffer-remove-all-tags ((buffer c-pointer) + (start c-pointer) + (end c-pointer))) + (gtk-text-buffer-get-iter-at-offset ((buffer c-pointer) + (iter c-pointer) + (char-offset int))) + (gtk-text-buffer-apply-tag ((buffer c-pointer) + (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) + (left-gravity boolean)) + c-pointer) + (gtk-text-buffer-get-iter-at-mark ((buffer c-pointer) + (iter c-pointer) + (mark c-pointer))) + (gtk-text-buffer-get-insert ((buffer c-pointer)) + c-pointer) + (gtk-text-buffer-delete-mark ((buffer c-pointer) + (mark c-pointer))) + (gtk-text-buffer-get-mark ((buffer c-pointer) + (name c-string)) + c-pointer) + (gtk-text-buffer-get-modified ((buffer c-pointer)) + boolean) + (gtk-text-buffer-set-modified ((buffer c-pointer) + (setting boolean))) + + ;;text-iter + (gtk-text-iter-free ((iter c-pointer))) + (gtk-text-iter-get-offset ((iter c-pointer)) + int) ;;text-tag-table (gtk-text-tag-table-new () @@ -630,8 +689,11 @@ c-pointer) (gtk-adds-text-view-popup-menu ((treeview c-pointer)) - c-pointer)) + c-pointer) + (gtk-adds-text-iter-new () + c-pointer)) +#-libcellsgtk (defmacro you-need-libcellsgtk (&body names) `(progn ,@(loop for name in names @@ -640,9 +702,11 @@ (error "You need libcellsgtk.so to use function ~A." ',name))))) #-libcellsgtk -(you-need-libcellsgtk - gtk-adds-dialog-box - gtk-adds-text-view-popup-menu) +(eval-when (:compile-toplevel :load-toplevel :execute) + (you-need-libcellsgtk + gtk-adds-dialog-box + gtk-adds-text-view-popup-menu + gtk-adds-text-iter-new))

1 0

[cells-gtk-cvs] CVS update: root/gtk-ffi/gtk-adds.c
by pdenno＠common-lisp.net 06 Mar '05

06 Mar '05

Update of /project/cells-gtk/cvsroot/root/gtk-ffi In directory common-lisp.net:/tmp/cvs-serv23123/root/gtk-ffi Modified Files: gtk-adds.c Log Message: routine to get text iters Date: Sun Mar 6 18:04:04 2005 Author: pdenno Index: root/gtk-ffi/gtk-adds.c diff -u root/gtk-ffi/gtk-adds.c:1.1 root/gtk-ffi/gtk-adds.c:1.2 --- root/gtk-ffi/gtk-adds.c:1.1 Sat Feb 26 23:18:24 2005 +++ root/gtk-ffi/gtk-adds.c Sun Mar 6 18:04:02 2005 @@ -21,3 +21,12 @@ return GTK_TEXT_VIEW(text_view)->popup_menu; } +/* C programmers allocate iters on the stack. We use this. + Free it with gtk-text-iter-free */ +GtkTextIter * +gtk_adds_text_iter_new () +{ + GtkTextIter example; + return gtk_text_iter_copy(&example); +} +

1 0

[cells-gtk-cvs] CVS update: root/cells-gtk/test-gtk/test-textview.lisp
by pdenno＠common-lisp.net 06 Mar '05

06 Mar '05

Update of /project/cells-gtk/cvsroot/root/cells-gtk/test-gtk In directory common-lisp.net:/tmp/cvs-serv22930/root/cells-gtk/test-gtk Modified Files: test-textview.lisp Log Message: Demonstrate text-buffer tags and markup (requires libcellsgtk.so) Date: Sun Mar 6 18:02:44 2005 Author: pdenno Index: root/cells-gtk/test-gtk/test-textview.lisp diff -u root/cells-gtk/test-gtk/test-textview.lisp:1.2 root/cells-gtk/test-gtk/test-textview.lisp:1.3 --- root/cells-gtk/test-gtk/test-textview.lisp:1.2 Sat Feb 26 23:20:19 2005 +++ root/cells-gtk/test-gtk/test-textview.lisp Sun Mar 6 18:02:44 2005 @@ -1,23 +1,82 @@ (in-package :test-gtk) +;;; The details of the tag-table and markup slots are, for the time being, +;;; not defined by cells-gtk. The demo give an idea how they might be used. + (defmodel test-textview (vbox) ((buffer :accessor buffer :initarg :buffer :initform (mk-text-buffer - :text (format nil "~{~a~%~}" (loop for i below 100 collect (format nil "Text view Line ~a" i)))))) + :text (format nil "~{~a~%~}" + (loop for i below 100 collect (format nil "Text view Line ~a" i))) + :on-modified-changed + (callback (w e d) + (show-message "Text buffer modified")) + :tag-table (c? (xtv-create-tag-table self))))) (:default-initargs :kids (list (mk-scrolled-window :kids (list (mk-text-view :buffer (c? (buffer (upper self test-textview))) - #+libcellsgtk :populate-popup - #+libcellsgtk - (c? - (def-populate-adds - (:menu-item :label "My menu item" - :owner self - :on-activate - (callback (w e d) - (show-message (format nil "My menu item says = ~A" - (owner self))))))))))))) + #+libcellsgtk :populate-popup + #+libcellsgtk + (c? + (def-populate-adds + (:menu-item :label "Mark something yellow" + :owner self + :on-activate + (callback (w e d) + (let ((buf (buffer (owner self)))) + (setf (markup buf) ; implementation idea... ;^) + (list + (make-instance 'color-tag :start 10 :end 20 + :name :yellow-background))) + (apply-markup (first (markup buf)) buf)))))))))))) + +(defmethod xtv-create-tag-table ((self text-buffer)) + (let ((ht (make-hash-table))) + (flet ((create-tag (name) + (setf (gethash name ht) + (gtk-text-buffer-create-tag + (cgtk::id self) + (string-downcase (symbol-name (gensym))) + (string-downcase (subseq (string name) (1+ (position #\- (string name))))) + (string-downcase (subseq (string name) 0 (position #\- (string name)))) + c-null)))) + (loop for name in '(:red-foreground :red-background :yellow-foreground :yellow-background) + do (create-tag name))) + ht)) + +;;; In a real application you might use an xml parser on marked up text +;;; by creating 'mark objects' like these. In the demo we just do it in a +;;; menu item cb. + +;;; We won't even use this one here, but marks are useful ;^) +(defclass mark () + ((type :initarg :type) + (pos :initarg :pos) + (len :initarg :len) + (c-ptr :accessor c-ptr :initform nil))) + +(defclass color-tag () + ((name :initarg :name) + (start :initarg :start) + (end :initarg :end))) + +(defmethod apply-markup ((tag color-tag) buffer) + (with-slots (start end name) tag + (assert (gethash name (tag-table buffer))) + (let ((buf (cgtk::id buffer))) + (with-text-iters (start-iter end-iter) + (gtk-text-buffer-get-iter-at-offset buf start-iter start) + (gtk-text-buffer-get-iter-at-offset buf end-iter end) + (gtk-text-buffer-apply-tag buf (gethash name (tag-table buffer)) start-iter end-iter))))) + +(defmethod apply-markup ((mark mark) buffer) + (with-slots (pos c-ptr) mark + (let ((buf (cgtk::id buffer))) + (with-text-iters (iter) + (gtk-text-buffer-get-iter-at-offset buf iter pos) + (setf c-ptr (gtk-text-buffer-create-mark buf (symbol-name (gensym)) iter t)))))) +

1 0

[cells-gtk-cvs] CVS update: root/cells-gtk/widgets.lisp
by pdenno＠common-lisp.net 06 Mar '05

06 Mar '05

Update of /project/cells-gtk/cvsroot/root/cells-gtk In directory common-lisp.net:/tmp/cvs-serv22653/root/cells-gtk Modified Files: widgets.lisp Log Message: Andras Simon's patch to remove #- on a ff definition. Also handle signal modified-changed. text-buffer can now specify :on-modified-changed callback. Date: Sun Mar 6 18:01:09 2005 Author: pdenno Index: root/cells-gtk/widgets.lisp diff -u root/cells-gtk/widgets.lisp:1.11 root/cells-gtk/widgets.lisp:1.12 --- root/cells-gtk/widgets.lisp:1.11 Sat Feb 26 23:31:41 2005 +++ root/cells-gtk/widgets.lisp Sun Mar 6 18:01:09 2005 @@ -128,6 +128,7 @@ (def-gtk-event-handler selection-changed) (def-gtk-event-handler toggled) (def-gtk-event-handler delete-event) +(def-gtk-event-handler modified-changed) (defparameter *widget-callbacks* (list (cons 'clicked (ff-register-callable 'clicked-handler)) @@ -137,7 +138,8 @@ (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 'delete-event (ff-register-callable 'delete-event-handler)) + (cons 'modified-changed (ff-register-callable 'modified-changed-handler)))) (eval-when (:compile-toplevel :load-toplevel :execute) @@ -232,7 +234,6 @@ ,@body 1)))) -#-cmu (ff-defun-callable :cdecl :int timeout-handler-callback ((data (* :int))) ;;(print (list :timeout-handler-callback data))

1 0

[cells-gtk-cvs] CVS update: root/cells-gtk/textview.lisp
by pdenno＠common-lisp.net 06 Mar '05

06 Mar '05

Update of /project/cells-gtk/cvsroot/root/cells-gtk In directory common-lisp.net:/tmp/cvs-serv22226/root/cells-gtk Modified Files: textview.lisp Log Message: New stuff for gtk-text-buffer tags and marks. Requires libcellsgtk.so Date: Sun Mar 6 17:58:51 2005 Author: pdenno Index: root/cells-gtk/textview.lisp diff -u root/cells-gtk/textview.lisp:1.3 root/cells-gtk/textview.lisp:1.4 --- root/cells-gtk/textview.lisp:1.3 Sat Feb 26 23:29:23 2005 +++ root/cells-gtk/textview.lisp Sun Mar 6 17:58:51 2005 @@ -19,15 +19,21 @@ (in-package :cgtk) (def-object text-buffer () - ((text :accessor text :initarg :text :initform nil)) - () + ((text :accessor text :initarg :text :initform nil) + (tag-table :accessor tag-table :initarg :tag-table :initform (c-in nil)) + (markup :cell nil :accessor markup :initform nil)) () + (modified-changed) :new-args (c? (list c-null))) (def-c-output text ((self text-buffer)) - (gtk-text-buffer-set-text (id self) - (or new-value "") - -1)) + (let ((buf (id self))) + (gtk-text-buffer-set-text buf (or new-value "") -1) + ;; Typically if you are interested in watching for modifications, + ;; you don't want to see ones such as this, where it is done programmatically. + ;; Thus we clear the modified flag. Your on-modified method can check for this. + ;; It can even reset it, if you don't like this arrangement. + (gtk-text-buffer-set-modified buf nil))) (def-widget text-view () ((buffer :accessor buffer :initarg :buffer :initform (mk-text-buffer)) @@ -95,8 +101,49 @@ (setf (old-popups text-view) accum) (mapc #'(lambda (i) (to-be i) (gtk-menu-shell-prepend popup-menu (id i))) tops)))))) +(defmacro with-text-iters (vars &body body) + `(let (,@(loop for var in vars collect `(,var (gtk-adds-text-iter-new)))) + (unwind-protect + (progn ,@body) + ,@(loop for var in vars collect `(gtk-text-iter-free ,var))))) + +(defun text-buffer-get-text (buffer &optional (start 0) stop) + "Get text directly from buffer. Unlike the cell accessor, this sees edits." + (let* ((buf (id buffer)) + (end (or stop (gtk-text-buffer-get-char-count buf)))) + (with-text-iters (s-iter e-iter) + (gtk-text-buffer-get-iter-at-offset buf s-iter start) + (gtk-text-buffer-get-iter-at-offset buf e-iter end) + (gtk-text-buffer-get-text buf s-iter e-iter nil)))) + +(defun text-buffer-insert-text (buffer start text) + (let ((buf (id buffer))) + (with-text-iters (s-iter) + (gtk-text-buffer-get-iter-at-offset buf s-iter start) + (gtk-text-buffer-insert buf s-iter text (length text)) + (gtk-text-buffer-set-modified buf t)))) + +(defun text-buffer-delete-text (buffer start end) + (let ((buf (id buffer))) + (with-text-iters (s-iter e-iter) + (gtk-text-buffer-get-iter-at-offset buf s-iter start) + (gtk-text-buffer-get-iter-at-offset buf e-iter end) + (gtk-text-buffer-delete buf s-iter e-iter)))) + +;;; The next two can be used to check and clear the the modified flag. +;;; The event is registered when you use :on-modified-changed on a text-buffer. +;;; The def-c-output text ((text-buffer)) clears the flag so as to distinguish +;;; programmatic updates to the text from ones done by typing. +(defmethod text-buffer-modified-p ((buffer text-buffer)) + (gtk-text-buffer-get-modified (id buffer))) + +(defmethod (setf text-buffer-modified-p) (val (buffer text-buffer)) + (gtk-text-buffer-set-modified (id buffer) val)) + + (eval-when (:compile-toplevel :load-toplevel :execute) - (export '(def-populate-adds populate-adds))) + (export '(def-populate-adds populate-adds with-text-iters text-buffer-get-text + text-buffer-delete-text text-buffer-insert-text text-buffer-modified-p)))

1 0

[cells-gtk-cvs] CVS update: root/load.lisp
by pdenno＠common-lisp.net 06 Mar '05

06 Mar '05

Update of /project/cells-gtk/cvsroot/root In directory common-lisp.net:/tmp/cvs-serv22177/root Modified Files: load.lisp Log Message: note about not needing this if you are loading the tarball. Date: Sun Mar 6 17:54:48 2005 Author: pdenno Index: root/load.lisp diff -u root/load.lisp:1.6 root/load.lisp:1.7 --- root/load.lisp:1.6 Sat Feb 26 23:46:40 2005 +++ root/load.lisp Sun Mar 6 17:54:47 2005 @@ -2,6 +2,8 @@ #| Step 1: Get ASDF into the game. + ---> This file isn't used if you are loading the snapshot tarball. <---- + Obviously not necessary if you always have that loaded. Note that you will have to adjust the pathname to point to where you have ASDF.lisp.

1 0

[cells-gtk-cvs] CVS update: root/config.lisp
by pdenno＠common-lisp.net 06 Mar '05

06 Mar '05

Update of /project/cells-gtk/cvsroot/root In directory common-lisp.net:/tmp/cvs-serv22156/root Modified Files: config.lisp Log Message: Note about not needing this is you are loading the tarbal Date: Sun Mar 6 17:54:04 2005 Author: pdenno Index: root/config.lisp diff -u root/config.lisp:1.3 root/config.lisp:1.4 --- root/config.lisp:1.3 Sun Feb 27 04:23:19 2005 +++ root/config.lisp Sun Mar 6 17:54:00 2005 @@ -6,8 +6,10 @@ #| + + ----> THIS ISN'T USED IF YOU ARE LOADING A SNAPSHOT TARBALL. <----- + Tell ASDF where to find everything. - This isn't used if you are loading a snapshot tarball. |#

1 0

[cells-gtk-cvs] CVS update: root/INSTALL.TXT
by pdenno＠common-lisp.net 06 Mar '05

06 Mar '05

Update of /project/cells-gtk/cvsroot/root In directory common-lisp.net:/tmp/cvs-serv22133/root Modified Files: INSTALL.TXT Log Message: Note about not needing this if you are loading the tarball Date: Sun Mar 6 17:53:20 2005 Author: pdenno Index: root/INSTALL.TXT diff -u root/INSTALL.TXT:1.2 root/INSTALL.TXT:1.3 --- root/INSTALL.TXT:1.2 Thu Dec 16 17:36:25 2004 +++ root/INSTALL.TXT Sun Mar 6 17:53:19 2005 @@ -1,3 +1,8 @@ + + +You don't need to read this file if you are installing from a snapshot tarball. +This only concerns the situation where you get the pieces cells, hello-c, cells-gtk etc, individually. + ############################################################################################################# The notes below apply to the UFFI port of Cells-gtk done by Ken Tilton. (Actually I have forked UFFI and call it Hello-C, but the idea is the same: portable FFI.)

1 0