December 2006 - mcclim-cvs@common-lisp.net

[mcclim-cvs] CVS mcclim
by thenriksen 13 Dec '06

13 Dec '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv17296 Modified Files: presentation-defs.lisp Log Message: Hopefully fixed `presentation-type-specifier-p'. Of course, I also thought this the last two times. --- /project/mcclim/cvsroot/mcclim/presentation-defs.lisp 2006/12/12 22:17:42 1.63 +++ /project/mcclim/cvsroot/mcclim/presentation-defs.lisp 2006/12/13 19:36:00 1.64 @@ -207,11 +207,9 @@ otherwise return false." ;; Apparently, this funtion has to handle arbitrary objects. (let ((name (presentation-type-name object))) - (when (and (or (symbolp name) - (and (typep name 'class) - (not (typep name 'built-in-class)))) + (when (and (typep name '(or symbol class)) (get-ptype-metaclass name)) - (%presentation-type-specifier-p t object)))) + (funcall-presentation-generic-function presentation-type-specifier-p object)))) (defun default-describe-presentation-type (description stream plural-count) (if (symbolp description) @@ -1634,6 +1632,11 @@ :options #.+completion-options+ :inherit-from t) +(define-presentation-method presentation-type-specifier-p ((type sequence)) + (and (listp type) + (consp (rest type)) + (presentation-type-specifier-p (second type)))) + (define-presentation-method presentation-typep (object (type completion)) (map nil #'(lambda (obj) (when (funcall test object (funcall value-key obj))

1 0

[mcclim-cvs] CVS mcclim
by thenriksen 13 Dec '06

13 Dec '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv17106 Modified Files: presentations.lisp Log Message: Added method on `get-ptype-metaclass' that specifies that a CLOS class is its own ptype metaclass (for handling of anynomous classes as per the CLIM spec). --- /project/mcclim/cvsroot/mcclim/presentations.lisp 2006/08/05 19:54:31 1.77 +++ /project/mcclim/cvsroot/mcclim/presentations.lisp 2006/12/13 19:35:01 1.78 @@ -466,6 +466,12 @@ (defmethod get-ptype-metaclass ((type (eql *builtin-t-class*))) type) +(defmethod get-ptype-metaclass ((type class)) + type) + +(defmethod get-ptype-metaclass (type) + (error "~A is not the name of a presentation type" type)) + ;;; external functions (defun find-presentation-type-class (name &optional (errorp t) environment) (declare (ignore environment))

1 0

[mcclim-cvs] CVS mcclim
by thenriksen 13 Dec '06

13 Dec '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv9667 Modified Files: dialog.lisp Log Message: Now `*use-goatee*' also affects calls to `accept' within `accepting-values'. --- /project/mcclim/cvsroot/mcclim/dialog.lisp 2006/11/08 01:18:22 1.23 +++ /project/mcclim/cvsroot/mcclim/dialog.lisp 2006/12/13 15:31:07 1.24 @@ -449,7 +449,9 @@ (surrounding-output-with-border (stream :shape :inset :move-cursor t) (setq editing-stream - (make-instance 'standard-input-editing-stream + (make-instance (if *use-goatee* + 'goatee-input-editing-stream + 'standard-input-editing-stream) :stream stream :cursor-visibility nil :background-ink +grey90+

1 0

[mcclim-cvs] CVS mcclim
by thenriksen 12 Dec '06

12 Dec '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv6690 Modified Files: input-editing.lisp Log Message: Added support for CLIM 2.2-style `with-activation-gestures' and `with-delimiter-gestures'. --- /project/mcclim/cvsroot/mcclim/input-editing.lisp 2006/12/12 22:32:40 1.54 +++ /project/mcclim/cvsroot/mcclim/input-editing.lisp 2006/12/12 22:36:32 1.55 @@ -63,12 +63,14 @@ (t existing-delimiter-gestures))) (defmacro with-activation-gestures ((gestures &key override) &body body) - ;; XXX Guess this implies that gestures need to be defined at compile time. - ;; Sigh. - (let ((gesture-form (if (and (symbolp gestures) - (gethash gestures *gesture-names*)) - `(list ',gestures) - gestures)) + ;; XXX Guess this implies that gestures need to be defined at + ;; compile time. Sigh. We permit both CLIM 2.0-style gesture names + ;; and CLIM 2.2 style characters. + (let ((gesture-form (cond ((or (and (symbolp gestures) + (gethash gestures *gesture-names*)) + (characterp gestures)) + `(list ',gestures)) + (t gestures))) (gestures (gensym)) (override-var (gensym))) `(let* ((,gestures ,gesture-form) ;Preserve evaluation order of arguments @@ -81,15 +83,17 @@ ,@body))) (defmacro with-delimiter-gestures ((gestures &key override) &body body) - ;; XXX Guess this implies that gestures need to be defined at compile time. - ;; Sigh. - (let ((gesture-form (if (and (symbolp gestures) - (gethash gestures *gesture-names*)) - `(list ',gestures) - gestures)) + ;; XXX Guess this implies that gestures need to be defined at + ;; compile time. Sigh. We permit both CLIM 2.0-style gesture names + ;; and CLIM 2.2 style characters. + (let ((gesture-form (cond ((or (and (symbolp gestures) + (gethash gestures *gesture-names*)) + (characterp gestures)) + `(list ',gestures)) + (t gestures))) (gestures (gensym)) (override-var (gensym))) - `(let* ((,gestures ,gesture-form) ;Preserve evaluation order of arguments + `(let* ((,gestures ,gesture-form) ;Preserve evaluation order of arguments (,override-var ,override) (*delimiter-gestures* (make-delimiter-gestures (if ,override-var

1 0

[mcclim-cvs] CVS mcclim
by afuchs 12 Dec '06

12 Dec '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv6318 Modified Files: input-editing.lisp Log Message: Flip the *use-goatee* default to NIL, as prompted by this discussion: <antifuchs> YuleAthas: do you think it's responsible to flip the *use-goatee* switch now? <YuleAthas> antifuchs: yes. --- /project/mcclim/cvsroot/mcclim/input-editing.lisp 2006/11/08 01:18:22 1.53 +++ /project/mcclim/cvsroot/mcclim/input-editing.lisp 2006/12/12 22:32:40 1.54 @@ -27,7 +27,7 @@ (in-package :clim-internals) -(defvar *use-goatee* t +(defvar *use-goatee* nil "I true, use the Goatee editing component instead of Drei. The Goatee component is faster and more mature than Drei.")

1 0

[mcclim-cvs] CVS mcclim
by thenriksen 12 Dec '06

12 Dec '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv3063 Modified Files: presentation-defs.lisp Log Message: Fixed presentation-type-specifier-p to do as certain older CLIM programs expect. --- /project/mcclim/cvsroot/mcclim/presentation-defs.lisp 2006/12/12 18:54:57 1.62 +++ /project/mcclim/cvsroot/mcclim/presentation-defs.lisp 2006/12/12 22:17:42 1.63 @@ -202,12 +202,16 @@ (define-default-presentation-method presentation-type-specifier-p (type) t) -(defun presentation-type-specifier-p (type) - "Return true if `type' is a valid presentation type specifier, +(defun presentation-type-specifier-p (object) + "Return true if `object' is a valid presentation type specifier, otherwise return false." - (funcall-presentation-generic-function - presentation-type-specifier-p - type)) + ;; Apparently, this funtion has to handle arbitrary objects. + (let ((name (presentation-type-name object))) + (when (and (or (symbolp name) + (and (typep name 'class) + (not (typep name 'built-in-class)))) + (get-ptype-metaclass name)) + (%presentation-type-specifier-p t object)))) (defun default-describe-presentation-type (description stream plural-count) (if (symbolp description)

1 0

[mcclim-cvs] CVS mcclim
by thenriksen 12 Dec '06

12 Dec '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv4739 Modified Files: presentation-defs.lisp NEWS Log Message: Added support for `presentation-type-specifier-p'. --- /project/mcclim/cvsroot/mcclim/presentation-defs.lisp 2006/11/27 07:44:46 1.61 +++ /project/mcclim/cvsroot/mcclim/presentation-defs.lisp 2006/12/12 18:54:57 1.62 @@ -194,6 +194,21 @@ (values t t) (values nil nil))))) +(define-presentation-generic-function + %presentation-type-specifier-p + presentation-type-specifier-p + (type-class type)) + +(define-default-presentation-method presentation-type-specifier-p (type) + t) + +(defun presentation-type-specifier-p (type) + "Return true if `type' is a valid presentation type specifier, +otherwise return false." + (funcall-presentation-generic-function + presentation-type-specifier-p + type)) + (defun default-describe-presentation-type (description stream plural-count) (if (symbolp description) (setq description (make-default-description (symbol-name description)))) --- /project/mcclim/cvsroot/mcclim/NEWS 2006/12/10 23:26:39 1.11 +++ /project/mcclim/cvsroot/mcclim/NEWS 2006/12/12 18:54:57 1.12 @@ -9,6 +9,8 @@ ** Improvement: Added new editor substrate ("Drei"). ** Improvement: Improved the pathname presentation methods considerably. ** specification compliance: DELETE-GESTURE-NAME function now implemented. +** specification compliance: PRESENTATION-TYPE-SPECIFIER-P presentaion + function now implemented. * Changes in mcclim-0.9.3 "All Souls' Day" relative to 0.9.2: ** backend improvement: The Null backend now registers itself in the

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 11 Dec '06

11 Dec '06

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv23363/Drei Modified Files: input-editor.lisp Log Message: Fixed so non-movement of the scan pointer won't cause an error. --- /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2006/12/10 19:28:49 1.13 +++ /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2006/12/11 22:55:28 1.14 @@ -821,10 +821,11 @@ nil)) ;; True if `gesture' was freshly read from the user, and not ;; just retrieved from the buffer during a rescan. - for freshly-inserted = (not (equal (buffer-object - (buffer drei) - (1- (stream-scan-pointer stream))) - gesture)) + for freshly-inserted = (and (plusp (stream-scan-pointer stream)) + (not (equal (buffer-object + (buffer drei) + (1- (stream-scan-pointer stream))) + gesture))) for form = (drei-lisp-syntax::form-after syntax (input-position stream)) ;; We do not stop until the input is complete and an activation ;; gesture has just been provided. The freshness check is so

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 11 Dec '06

11 Dec '06

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv12745/Drei Modified Files: lisp-syntax.lisp Log Message: New default package for Lisp syntax: *package*. Mostly to fix symbol completion in the Listener. --- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax.lisp 2006/12/10 19:28:49 1.12 +++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax.lisp 2006/12/11 22:04:55 1.13 @@ -1370,7 +1370,7 @@ the (in-package) preceding `mark-or-offset'. If none can be found, return the package specified in the attribute list. If no package can be found at all, or the otherwise found packages are -invalid, return the CLIM-USER package." +invalid, return the value of `*package*'." (as-offsets ((offset mark-or-offset)) (let* ((designator (rest (find offset (package-list syntax) :key #'first @@ -1383,7 +1383,7 @@ (package osp) (string (find-package osp)))) (find-package (option-specified-package syntax)) - (find-package :clim-user))))) + *package*)))) (defun provided-package-name-at-mark (syntax mark-or-offset) "Get the name of the specified Lisp package for the

1 0

[mcclim-cvs] CVS mcclim
by thenriksen 10 Dec '06

10 Dec '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv663 Modified Files: stream-output.lisp package.lisp decls.lisp Log Message: Made `stream-set-cursor-position' a generic function and exported it, as seen in CLIM 2.2. --- /project/mcclim/cvsroot/mcclim/stream-output.lisp 2006/05/05 10:24:02 1.60 +++ /project/mcclim/cvsroot/mcclim/stream-output.lisp 2006/12/10 23:35:12 1.61 @@ -223,7 +223,7 @@ (defmethod* (setf stream-cursor-position) (x y (stream standard-extended-output-stream)) (setf (cursor-position (stream-text-cursor stream)) (values x y))) -(defun stream-set-cursor-position (stream x y) +(defmethod stream-set-cursor-position ((stream standard-extended-output-stream) x y) (setf (stream-cursor-position stream) (values x y))) (defmethod stream-increment-cursor-position ((stream standard-extended-output-stream) dx dy) --- /project/mcclim/cvsroot/mcclim/package.lisp 2006/06/29 08:16:02 1.55 +++ /project/mcclim/cvsroot/mcclim/package.lisp 2006/12/10 23:35:12 1.56 @@ -353,6 +353,8 @@ ;; this list of exported symbols was automatically generated from the ;; specification as of version 1.17 of this very file, please think twice ;; before fiddling with it. thanks! --gb 2002-11-10 + ;; A good reason for fiddling with with it is to add symbols from + ;; CLIM 2.2. --thenriksen 2006-12-11 #:*abort-gestures* ;variable #:*accelerator-gestures* ;variable @@ -1417,6 +1419,7 @@ #:stream-replay ;generic function #:stream-rescanning-p ;generic function #:stream-scan-pointer ;generic function + #:stream-set-cursor-position ;generic function #:stream-set-input-focus ;generic function #:stream-start-line-p ;generic function #:stream-start-line-p ;generic function --- /project/mcclim/cvsroot/mcclim/decls.lisp 2006/12/04 22:31:19 1.42 +++ /project/mcclim/cvsroot/mcclim/decls.lisp 2006/12/10 23:35:12 1.43 @@ -429,6 +429,7 @@ (defgeneric (setf stream-text-cursor) (cursor stream)) (defgeneric stream-cursor-position (stream)) ;; (defgeneric (setf* stream-cursor-position) (x y stream)) unsure how to declare this, can somebody help? --GB +(defgeneric stream-set-cusor-position (stream x y)) ; This is actually in 19.3.1 in CLIM 2.2 (defgeneric stream-increment-cursor-position (stream dx dy)) ;;; 15.4 Text Protocol [complete]

1 0