cells-cvs

cells-cvs@common-lisp.net

721 discussions

[cells-cvs] CVS cells/tutorial
by ktilton 30 May '06

30 May '06

Update of /project/cells/cvsroot/cells/tutorial In directory clnet:/tmp/cvs-serv19816/tutorial Log Message: Directory /project/cells/cvsroot/cells/tutorial added to the repository

1 0

[cells-cvs] CVS Celtk
by fgoenninger 29 May '06

29 May '06

Update of /project/cells/cvsroot/Celtk In directory clnet:/tmp/cvs-serv20307 Modified Files: fileevent.lisp Log Message: Changed: function test-fileevent: No more using slot eval-text (this slot is obsolete in the text widget). --- /project/cells/cvsroot/Celtk/fileevent.lisp 2006/05/28 15:34:27 1.4 +++ /project/cells/cvsroot/Celtk/fileevent.lisp 2006/05/28 23:53:57 1.5 @@ -21,7 +21,7 @@ ;;; DEALINGS IN THE SOFTWARE. ;;; ;;; --------------------------------------------------------------------------- -;;; $Header: /project/cells/cvsroot/Celtk/fileevent.lisp,v 1.4 2006/05/28 15:34:27 ktilton Exp $ +;;; $Header: /project/cells/cvsroot/Celtk/fileevent.lisp,v 1.5 2006/05/28 23:53:57 fgoenninger Exp $ ;;; --------------------------------------------------------------------------- ;;; =========================================================================== @@ -463,8 +463,7 @@ :width 80 :borderwidth 2 :relief 'sunken - :pady 5 - :eval-text nil)) + :pady 5)) (mk-fileevent :id :fileevent-test :read-fn 'read-from-pipe :iostream (open "/0dev/hw.txt"

1 0

[cells-cvs] CVS Celtk
by fgoenninger 29 May '06

29 May '06

Update of /project/cells/cvsroot/Celtk In directory clnet:/tmp/cvs-serv20152 Modified Files: Celtk.lisp Log Message: CVS playing tricks on me... No change, really. --- /project/cells/cvsroot/Celtk/Celtk.lisp 2006/05/28 23:45:03 1.27 +++ /project/cells/cvsroot/Celtk/Celtk.lisp 2006/05/28 23:47:24 1.28 @@ -16,7 +16,7 @@ |# -;;; $Header: /project/cells/cvsroot/Celtk/Celtk.lisp,v 1.27 2006/05/28 23:45:03 fgoenninger Exp $ +;;; $Header: /project/cells/cvsroot/Celtk/Celtk.lisp,v 1.28 2006/05/28 23:47:24 fgoenninger Exp $ (defpackage :celtk (:nicknames "CTK") @@ -134,7 +134,6 @@ ; ; --- debug stuff --------------------------------- ; -<<<<<<< Celtk.lisp ;; (let ((yes '( "insert" "end")) ;; (no '())) ;; (declare (ignorable yes no)) @@ -143,15 +142,6 @@ ;; (format t "~&tk> ~a~%" tk$)) ;; (break)) ;; (assert *tki*) -======= - (let ((yes '( "insert")) - (no '())) - (declare (ignorable yes no)) - (when (and (find-if (lambda (s) (search s tk$)) yes) - (not (find-if (lambda (s) (search s tk$)) no))) - (format t "~&tk> ~a~%" tk$))) - (assert *tki*) ->>>>>>> 1.26 ; --- end debug stuff ------------------------------ ; ; --- serious stuff ---

1 0

[cells-cvs] CVS Celtk
by fgoenninger 29 May '06

29 May '06

Update of /project/cells/cvsroot/Celtk In directory clnet:/tmp/cvs-serv18944 Modified Files: Celtk.lisp Log Message: Commented out debug stuff in tk-format-now. Added Header info tag at beginning of file. --- /project/cells/cvsroot/Celtk/Celtk.lisp 2006/05/28 15:34:27 1.26 +++ /project/cells/cvsroot/Celtk/Celtk.lisp 2006/05/28 23:45:03 1.27 @@ -16,6 +16,7 @@ |# +;;; $Header: /project/cells/cvsroot/Celtk/Celtk.lisp,v 1.27 2006/05/28 23:45:03 fgoenninger Exp $ (defpackage :celtk (:nicknames "CTK") @@ -133,6 +134,16 @@ ; ; --- debug stuff --------------------------------- ; +<<<<<<< Celtk.lisp +;; (let ((yes '( "insert" "end")) +;; (no '())) +;; (declare (ignorable yes no)) +;; (when (and (find-if (lambda (s) (search s tk$)) yes) +;; (not (find-if (lambda (s) (search s tk$)) no))) +;; (format t "~&tk> ~a~%" tk$)) +;; (break)) +;; (assert *tki*) +======= (let ((yes '( "insert")) (no '())) (declare (ignorable yes no)) @@ -140,6 +151,7 @@ (not (find-if (lambda (s) (search s tk$)) no))) (format t "~&tk> ~a~%" tk$))) (assert *tki*) +>>>>>>> 1.26 ; --- end debug stuff ------------------------------ ; ; --- serious stuff ---

1 0

[cells-cvs] CVS Celtk
by fgoenninger 29 May '06

29 May '06

Update of /project/cells/cvsroot/Celtk In directory clnet:/tmp/cvs-serv18540 Modified Files: entry.lisp Log Message: Removed function replace-dangerous-chars. Removed slot eval-text from text widget. --- /project/cells/cvsroot/Celtk/entry.lisp 2006/05/28 15:34:27 1.11 +++ /project/cells/cvsroot/Celtk/entry.lisp 2006/05/28 23:40:32 1.12 @@ -16,6 +16,8 @@ |# +;;; $Header: /project/cells/cvsroot/Celtk/entry.lisp,v 1.12 2006/05/28 23:40:32 fgoenninger Exp $ + (in-package :Celtk) ;---------------------------------------------------------------------------- @@ -68,9 +70,7 @@ (tcl-set-var *tki* (^path) new-value (var-flags :TCL-NAMESPACE-ONLY))))) (deftk text-widget (widget) - ((modified :initarg :modified :accessor modified :initform nil) - (eval-text :initarg :eval-text :accessor eval-text :initform (c-in t) - :documentation "Set to nil if you want to make sure text entries do not get evaluated. If set to nil the /dangerous charachters/ will be replaced by space char.")) + ((modified :initarg :modified :accessor modified :initform nil)) (:tk-spec text -background -borderwidth -cursor -exportselection (tkfont -font) -foreground @@ -106,20 +106,8 @@ (tk-format-now "~a delete 1.0 end" (^path)) (when (plusp (length new-value)) (tk-format-now "~a insert end {~a}" (^path) new-value)))) ;; kt060528: simple {} seems to block evaluation - -;; frgo, 2006-05-27: -;; replace-dangeorous-chars is meant to replace characters in a -;; sequence that would start/end evaluation in Tcl land. -(defun replace-dangerous-chars (seq &optional (dangerous-chars "[]{}")) - (assert (stringp seq)) - (let ((result seq)) - (loop for pos from 0 to (1- (length result)) - do - (let ((c (char result pos))) - (if (find c dangerous-chars) - (setf (char result pos) #\Space)))) - (values result))) ->>>>>>> 1.10 + ;; Yes, it does. But we had to change ~s to ~a also in order to prevent + ;; side effects - frgo 2006-05-29 1:30 am ;-) ;;;(defvar +tk-keysym-table+ ;;; (let ((ht (make-hash-table :test 'string=)))

1 0

[cells-cvs] CVS Celtk
by ktilton 28 May '06

28 May '06

Update of /project/cells/cvsroot/Celtk In directory clnet:/tmp/cvs-serv19640 Modified Files: CELTK.lpr Celtk.lisp demos.lisp entry.lisp fileevent.lisp tk-structs.lisp Log Message: Suppress Tcl evaluation of entry and text fields; look for more of these to surface --- /project/cells/cvsroot/Celtk/CELTK.lpr 2006/05/27 06:04:22 1.13 +++ /project/cells/cvsroot/Celtk/CELTK.lpr 2006/05/28 15:34:27 1.14 @@ -104,7 +104,7 @@ :old-space-size 256000 :new-space-size 6144 :runtime-build-option :standard - :on-initialization 'celtk::test-fileevent + :on-initialization 'celtk::tk-test :on-restart 'do-default-restart) ;; End of Project Definition --- /project/cells/cvsroot/Celtk/Celtk.lisp 2006/05/25 15:41:32 1.25 +++ /project/cells/cvsroot/Celtk/Celtk.lisp 2006/05/28 15:34:27 1.26 @@ -124,6 +124,8 @@ "]" "\\]") "\"" "\\\"")) +(tkescape "[exit]") + (defun tk-format-now (fmt$ &rest fmt-args) (unless (find *tkw* *windows-destroyed*) (let* ((*print-circle* nil) @@ -131,10 +133,10 @@ ; ; --- debug stuff --------------------------------- ; - (let ((yes '( "destroy")) + (let ((yes '( "insert")) (no '())) (declare (ignorable yes no)) - (when nil #+not (and (find-if (lambda (s) (search s tk$)) yes) + (when (and (find-if (lambda (s) (search s tk$)) yes) (not (find-if (lambda (s) (search s tk$)) no))) (format t "~&tk> ~a~%" tk$))) (assert *tki*) --- /project/cells/cvsroot/Celtk/demos.lisp 2006/05/25 07:12:59 1.19 +++ /project/cells/cvsroot/Celtk/demos.lisp 2006/05/28 15:34:27 1.20 @@ -20,11 +20,11 @@ (defun ctk::tk-test () ;; ACL project manager needs a zero-argument function, in project package (test-window - ;;'one-button-window + 'one-button-window ;;'ltktest-cells-inside ;;'menu-button-test ;;'spinbox-test - 'lotsa-widgets + ;;'lotsa-widgets ;; Now in Gears project 'gears-demo )) @@ -33,22 +33,22 @@ (:default-initargs :kids (c? (the-kids (mk-menubar - :kids (c? (the-kids - (mk-menu-entry-cascade-ex (:label "File") - (mk-menu-entry-command-ex () "Load" (format t "~&Load pressed")) - (mk-menu-entry-command-ex () "Save" (format t "~&Save pressed")))))) + :kids (c? (the-kids + (mk-menu-entry-cascade-ex (:label "File") + (mk-menu-entry-command-ex () "Load" (format t "~&Load pressed")) + (mk-menu-entry-command-ex () "Save" (format t "~&Save pressed")))))) (mk-frame-stack :packing (c?pack-self) :kids (c? (the-kids (mk-text-widget :id :my-text - :md-value (c?n "hello, world") + :md-value (c?n "[bzbzbzbz]") :height 8 :width 25) - ;;; (make-instance 'entry - ;;; :id :entree - ;;; :fm-parent *parent* - ;;; :md-value (c-in "Boots")) + (make-instance 'entry + :id :entree + :fm-parent *parent* + :md-value (c-in "Boots")) ;;; (make-instance 'button ;;; :fm-parent *parent* ;;; :text "read" --- /project/cells/cvsroot/Celtk/entry.lisp 2006/05/27 22:28:01 1.10 +++ /project/cells/cvsroot/Celtk/entry.lisp 2006/05/28 15:34:27 1.11 @@ -48,7 +48,7 @@ (tcl-get-string (xsv user-data xe)))) ;; assuming write op, but data field shows that (let ((new-value (tcl-get-var *tki* (^path) - (var-flags :TCL_NAMESPACE_ONLY)))) + (var-flags :TCL-NAMESPACE-ONLY)))) (unless (string= new-value (^md-value)) (setf (^md-value) new-value)))))))) @@ -65,7 +65,7 @@ (when new-value (unless (string= new-value old-value) (trc nil "md-value output" self new-value) - (tk-format `(:variable ,self) "set ~a ~s" (^path) new-value)))) + (tcl-set-var *tki* (^path) new-value (var-flags :TCL-NAMESPACE-ONLY))))) (deftk text-widget (widget) ((modified :initarg :modified :accessor modified :initform nil) @@ -104,12 +104,8 @@ (trc nil "md-value output" self new-value) (with-integrity (:client `(:variable ,self)) (tk-format-now "~a delete 1.0 end" (^path)) - (let ((value nil)) - (when (plusp (length new-value)) - (if (not (^eval-text)) - (setq value (replace-dangerous-chars new-value)) - (setq value new-value)) - (tk-format-now "~a insert end ~s" (^path) value))))) + (when (plusp (length new-value)) + (tk-format-now "~a insert end {~a}" (^path) new-value)))) ;; kt060528: simple {} seems to block evaluation ;; frgo, 2006-05-27: ;; replace-dangeorous-chars is meant to replace characters in a @@ -123,6 +119,7 @@ (if (find c dangerous-chars) (setf (char result pos) #\Space)))) (values result))) +>>>>>>> 1.10 ;;;(defvar +tk-keysym-table+ ;;; (let ((ht (make-hash-table :test 'string=))) --- /project/cells/cvsroot/Celtk/fileevent.lisp 2006/05/27 22:25:18 1.3 +++ /project/cells/cvsroot/Celtk/fileevent.lisp 2006/05/28 15:34:27 1.4 @@ -21,7 +21,7 @@ ;;; DEALINGS IN THE SOFTWARE. ;;; ;;; --------------------------------------------------------------------------- -;;; $Header: /project/cells/cvsroot/Celtk/fileevent.lisp,v 1.3 2006/05/27 22:25:18 fgoenninger Exp $ +;;; $Header: /project/cells/cvsroot/Celtk/fileevent.lisp,v 1.4 2006/05/28 15:34:27 ktilton Exp $ ;;; --------------------------------------------------------------------------- ;;; =========================================================================== @@ -352,7 +352,7 @@ (interp :pointer) (argc :int) (argv :pointer)) - (declare (ignorable clientData argc interp)) + (declare (ignore clientData argc interp)) (let* ((path (foreign-string-to-lisp (mem-aref argv :pointer 1))) (self (gethash path (dictionary *tkw*)))) (bwhen (fn (^read-fn)) @@ -364,7 +364,7 @@ (interp :pointer) (argc :int) (argv :pointer)) - (declare (ignorable clientData argc interp)) + (declare (ignore clientData argc interp)) (let* ((path (foreign-string-to-lisp (mem-aref argv :pointer 1))) (self (gethash path (dictionary *tkw*)))) (bwhen (fn (^write-fn)) @@ -376,7 +376,8 @@ (interp :pointer) (argc :int) (argv :pointer)) - (declare (ignorable clientData interp argc)) + (declare (ignore clientData interp argc)) + (trc "eof!!!!!") (let* ((path (foreign-string-to-lisp (mem-aref argv :pointer 1))) (self (gethash path (dictionary *tkw*)))) (bwhen (fn (^eof-fn)) @@ -466,7 +467,7 @@ :eval-text nil)) (mk-fileevent :id :fileevent-test :read-fn 'read-from-pipe - :iostream (open "/Users/frgo/tmp/frgo-test" + :iostream (open "/0dev/hw.txt" ;;; Adapt here !!! ^^^^^^^^^^^^^^^^^^^^^^^^^^^ :direction :input)))))) @@ -475,3 +476,6 @@ (trc "-----------------------------------------------------------------------------") (test-window 'fileevent-test-window) (trc "-----------------------------------------------------------------------------")) + +#+test +(test-window 'fileevent-test-window) \ No newline at end of file --- /project/cells/cvsroot/Celtk/tk-structs.lisp 2006/05/24 20:38:54 1.2 +++ /project/cells/cvsroot/Celtk/tk-structs.lisp 2006/05/28 15:34:27 1.3 @@ -132,23 +132,23 @@ (:tcl-all-events -3)) (defcenum tcl-variable-related-flag - "Flags passed to getvar, setvar, tracevar, etc" - (:TCL_GLOBAL_ONLY 1) - (:TCL_NAMESPACE_ONLY 2) - (:TCL_APPEND_VALUE 4) - (:TCL_LIST_ELEMENT 8) - (:TCL_TRACE_READS #x10) - (:TCL_TRACE_WRITES #x20) - (:TCL_TRACE_UNSETS #x40) - (:TCL_TRACE_DESTROYED #x80) - (:TCL_INTERP_DESTROYED #x100) - (:TCL_LEAVE_ERR_MSG #x200) - (:TCL_TRACE_ARRAY #x800) - ;; Required to support old variable/vdelete/vinfo traces */ - (:TCL_TRACE_OLD_STYLE #x1000) - ;; Indicate the semantics of the result of a trace */ - (:TCL_TRACE_RESULT_DYNAMIC #x8000) - (:TCL_TRACE_RESULT_OBJECT #x10000)) + "flags passed to getvar, setvar, tracevar, etc" + (:tcl-global-only 1) + (:tcl-namespace-only 2) + (:tcl-append-value 4) + (:tcl-list-element 8) + (:tcl-trace-reads #x10) + (:tcl-trace-writes #x20) + (:tcl-trace-unsets #x40) + (:tcl-trace-destroyed #x80) + (:tcl-interp-destroyed #x100) + (:tcl-leave-err-msg #x200) + (:tcl-trace-array #x800) + ;; required to support old variable/vdelete/vinfo traces */ + (:tcl-trace-old-style #x1000) + ;; indicate the semantics of the result of a trace */ + (:tcl-trace-result-dynamic #x8000) + (:tcl-trace-result-object #x10000)) (defun var-flags (&rest kws) (apply '+ (loop for kw in kws

1 0

[cells-cvs] CVS Celtk
by fgoenninger 28 May '06

28 May '06

Update of /project/cells/cvsroot/Celtk In directory clnet:/tmp/cvs-serv12824 Modified Files: entry.lisp Log Message: Changed/added: text widget: new slot eval-text. Defaults to t. If nil then upon setting the model value of the text widget the new valiue will be scanned for "dangerous" characters. These are: [Ê]Ê{Ê} Reason: Tcl evaluates text in brackets as commands. This may be dangerous. If any such dangerous character is found it is replaced by a Space character in order to not change the length of the text. --- /project/cells/cvsroot/Celtk/entry.lisp 2006/05/24 20:38:54 1.9 +++ /project/cells/cvsroot/Celtk/entry.lisp 2006/05/27 22:28:01 1.10 @@ -68,7 +68,9 @@ (tk-format `(:variable ,self) "set ~a ~s" (^path) new-value)))) (deftk text-widget (widget) - ((modified :initarg :modified :accessor modified :initform nil)) + ((modified :initarg :modified :accessor modified :initform nil) + (eval-text :initarg :eval-text :accessor eval-text :initform (c-in t) + :documentation "Set to nil if you want to make sure text entries do not get evaluated. If set to nil the /dangerous charachters/ will be replaced by space char.")) (:tk-spec text -background -borderwidth -cursor -exportselection (tkfont -font) -foreground @@ -102,8 +104,25 @@ (trc nil "md-value output" self new-value) (with-integrity (:client `(:variable ,self)) (tk-format-now "~a delete 1.0 end" (^path)) - (when (plusp (length new-value)) - (tk-format-now "~a insert end ~s" (^path) new-value)))) + (let ((value nil)) + (when (plusp (length new-value)) + (if (not (^eval-text)) + (setq value (replace-dangerous-chars new-value)) + (setq value new-value)) + (tk-format-now "~a insert end ~s" (^path) value))))) + +;; frgo, 2006-05-27: +;; replace-dangeorous-chars is meant to replace characters in a +;; sequence that would start/end evaluation in Tcl land. +(defun replace-dangerous-chars (seq &optional (dangerous-chars "[]{}")) + (assert (stringp seq)) + (let ((result seq)) + (loop for pos from 0 to (1- (length result)) + do + (let ((c (char result pos))) + (if (find c dangerous-chars) + (setf (char result pos) #\Space)))) + (values result))) ;;;(defvar +tk-keysym-table+ ;;; (let ((ht (make-hash-table :test 'string=))) @@ -116,7 +135,7 @@ ;;; finally (return ht))))) (defun tk-translate-keysym (keysym$) - (if (= 1 (length keysym$)) + (if (= 1 (length keysym$)) (schar keysym$ 0) (intern (string-upcase keysym$)) #+nah (gethash keysym$ +tk-keysym-table+))) \ No newline at end of file

1 0

[cells-cvs] CVS Celtk
by fgoenninger 28 May '06

28 May '06

Update of /project/cells/cvsroot/Celtk In directory clnet:/tmp/cvs-serv12756 Modified Files: fileevent.lisp Log Message: Changed testing example to use the new slot eval-text of the text widget. See file entry.lisp for more details. --- /project/cells/cvsroot/Celtk/fileevent.lisp 2006/05/25 14:03:44 1.2 +++ /project/cells/cvsroot/Celtk/fileevent.lisp 2006/05/27 22:25:18 1.3 @@ -21,7 +21,7 @@ ;;; DEALINGS IN THE SOFTWARE. ;;; ;;; --------------------------------------------------------------------------- -;;; $Header: /project/cells/cvsroot/Celtk/fileevent.lisp,v 1.2 2006/05/25 14:03:44 fgoenninger Exp $ +;;; $Header: /project/cells/cvsroot/Celtk/fileevent.lisp,v 1.3 2006/05/27 22:25:18 fgoenninger Exp $ ;;; --------------------------------------------------------------------------- ;;; =========================================================================== @@ -188,6 +188,33 @@ ;;; =========================================================================== (defmethod set-tk-readable ((self tk-fileevent) ch-name path) + +;; frgo, 2006-05-26: +;; The code here was aimed at EOF checking after reading... +;; So the API needs rework... +;; (tk-format-now " proc readable {channel path} { +;; # check for async errors (sockets only, I think) +;; if {[string length [set err [fconfigure $channel -error]]]} { +;; error-cb $path $err +;; close $channel +;; return +;; } +;; # read a line from the channel +;; if {[catch {set line [gets $channel]} err]} { +;; error-cb $path $err +;; close $channel +;; return +;; } +;; if {[string length $line]} { +;; received-cb $path $line +;; } +;; # check for eof +;; if {[eof $channel]} { +;; eof-cb $path +;; close $channel +;; } +;; }") + (tk-format-now "proc readable {channel path} { if [ eof $channel ] then { eof-cb $path } else { readable-cb $path } }") (tk-format-now "fileevent ~A readable [list readable ~A ~A]" ch-name @@ -419,8 +446,7 @@ (let ((data (read-line stream nil nil nil))) (trc "*** READ-FROM-PIPE: data = " data) (when data - (setf (md-value (fm-other :receive-window)) data)))) -) + (setf (md-value (fm-other :receive-window)) data))))) (defmodel fileevent-test-window (window) () @@ -436,7 +462,8 @@ :width 80 :borderwidth 2 :relief 'sunken - :pady 5)) + :pady 5 + :eval-text nil)) (mk-fileevent :id :fileevent-test :read-fn 'read-from-pipe :iostream (open "/Users/frgo/tmp/frgo-test"

1 0

[cells-cvs] CVS Celtk
by ktilton 27 May '06

27 May '06

Update of /project/cells/cvsroot/Celtk In directory clnet:/tmp/cvs-serv7353 Modified Files: CELTK.lpr togl.lisp Log Message: Get destroy callbacks working on Togls --- /project/cells/cvsroot/Celtk/CELTK.lpr 2006/05/24 20:38:54 1.12 +++ /project/cells/cvsroot/Celtk/CELTK.lpr 2006/05/27 06:04:22 1.13 @@ -10,6 +10,7 @@ (make-instance 'module :name "tk-interp.lisp") (make-instance 'module :name "tk-events.lisp") (make-instance 'module :name "tk-object.lisp") + (make-instance 'module :name "fileevent.lisp") (make-instance 'module :name "widget.lisp") (make-instance 'module :name "font.lisp") (make-instance 'module :name "layout.lisp") @@ -103,7 +104,7 @@ :old-space-size 256000 :new-space-size 6144 :runtime-build-option :standard - :on-initialization 'celtk::tk-test + :on-initialization 'celtk::test-fileevent :on-restart 'do-default-restart) ;; End of Project Definition --- /project/cells/cvsroot/Celtk/togl.lisp 2006/05/26 17:50:36 1.7 +++ /project/cells/cvsroot/Celtk/togl.lisp 2006/05/27 06:04:22 1.8 @@ -98,7 +98,7 @@ ;(assert (not (zerop (tk-init-stubs interp "8.1" 0)))) (togl_init interp) (togl-create-func (callback togl-create)) - ;;; needed? (togl-destroy-func (callback togl-destroy) + (togl-destroy-func (callback togl-destroy)) (togl-display-func (callback togl-display)) (togl-reshape-func (callback togl-reshape)) (togl-timer-func (callback togl-timer)) ;; probably want to make this optional @@ -175,6 +175,7 @@ (let ((,self-var (or (gethash (pointer-address ,ptr-var) (tkwins *tkw*)) (gethash (togl-ident ,ptr-var)(dictionary *tkw*))))) ,@preamble + (trc nil "selves" ,cb$ (togl-ident ,ptr-var) (gethash (pointer-address ,ptr-var) (tkwins *tkw*))(gethash (togl-ident ,ptr-var)(dictionary *tkw*))) (,(intern uc$) ,self-var)))) (defmethod ,(intern uc$) :around ((self togl)) (if (,(intern cb-slot$) self) @@ -183,7 +184,9 @@ (defmethod ,(intern uc$) ((self togl)))))) (def-togl-callback create () - (setf (togl-ptr self) togl-ptr)) + (setf (togl-ptr self) togl-ptr) + (setf (gethash (pointer-address togl-ptr) (tkwins *tkw*)) self)) + (def-togl-callback display ()) (def-togl-callback reshape ()) (def-togl-callback destroy ()) @@ -195,3 +198,16 @@ (tk-format-now "togl ~a ~{~(~a~) ~a~^ ~}" (path self)(tk-configurations self)))) ;; this leads to "togl <path> [-<config option> <value]*", in turn to togl_create + +;;; +;;;(DEFCFUN ("Togl_DestroyFunc" TOGL-DESTROY-FUNC) :VOID (CALLBACK :POINTER)) +;;;(defcallback togl-destroy :void ((togl-ptr :pointer)) +;;; (trc "togl-destroy ptr" togl-ptr (loop for k being the hash-keys of (tkwins *tkw*) +;;; collecting k)) +;;; (unless (c-stopped) +;;; (let ((self (or (gethash (pointer-address togl-ptr) (tkwins *tkw*)) (gethash (togl-ident togl-ptr) (dictionary *tkw*))))) +;;; +;;; (togl-destroy-using-class self)))) +;;;(DEFMETHOD TOGL-DESTROY-USING-CLASS :AROUND ((SELF TOGL)) +;;; (IF (CB-DESTROY SELF) (FUNCALL (CB-DESTROY SELF) SELF) (CALL-NEXT-METHOD))) +;;;(DEFMETHOD TOGL-DESTROY-USING-CLASS ((SELF TOGL))) \ No newline at end of file

1 0

[cells-cvs] CVS Celtk
by ktilton 26 May '06

26 May '06

Update of /project/cells/cvsroot/Celtk In directory clnet:/tmp/cvs-serv6466 Modified Files: widget.lisp Removed Files: Gears.lpr textual.lisp Log Message: --- /project/cells/cvsroot/Celtk/widget.lisp 2006/05/25 07:12:59 1.10 +++ /project/cells/cvsroot/Celtk/widget.lisp 2006/05/26 18:02:02 1.11 @@ -260,12 +260,6 @@ ;;; --- images ------------------------------------------------------- (defobserver image-files () - ; - ; I do not know how to create the photo for X before X exists - ; though it seems to work. <g> perhaps Tk understands it does not need to - ; place the image in a tree and lets the undefined path go? If so, - ; just add :pre-make-kt before :make-kt in the sort list - ; (loop for (name file-pathname) in (set-difference new-value old-value :key 'car) do (tk-format `(:pre-make-tk ,self) "image create photo ~(~a.~a~) -file ~a" (^path) name (tkescape (namestring file-pathname)))))

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
73
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

cells-cvs