mcclim-cvs November 2006

mcclim-cvs@common-lisp.net

6 participants
128 discussions

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 10 Nov '06

10 Nov '06

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv21845/Drei Modified Files: drei-clim.lisp Log Message: :editable-p handling was moved to the `drei' class. We need to disable read-only status in `(setf gadget-value)'. --- /project/mcclim/cvsroot/mcclim/Drei/drei-clim.lisp 2006/11/10 16:46:51 1.3 +++ /project/mcclim/cvsroot/mcclim/Drei/drei-clim.lisp 2006/11/10 18:39:45 1.4 @@ -297,9 +297,12 @@ (defmethod (setf gadget-value) (new-value (gadget drei-gadget-pane) &key (invoke-callback t)) - (performing-drei-operations (gadget :with-undo nil :redisplay nil) - (delete-buffer-range (buffer gadget) 0 (size (buffer gadget))) - (insert-buffer-sequence (buffer gadget) 0 new-value)) + ;; I think we're supposed to permit this, even if the buffer is + ;; non-editable. + (letf (((read-only-p (buffer gadget)) nil)) + (performing-drei-operations (gadget :with-undo nil :redisplay nil) + (delete-buffer-range (buffer gadget) 0 (size (buffer gadget))) + (insert-buffer-sequence (buffer gadget) 0 new-value))) (when invoke-callback (value-changed-callback gadget (gadget-client gadget) @@ -446,7 +449,7 @@ &rest args &key (syntax nil) (initial-contents "") (minibuffer t) (border-width 1) - (scroll-bars :horizontal) (editable-p t) + (scroll-bars :horizontal) (drei-class 'drei-gadget-pane)) (check-type initial-contents array) (check-type border-width integer) @@ -464,8 +467,8 @@ (drei-pane (apply #'make-pane-1 fm frame drei-class :minibuffer minibuffer-pane args)) (pane drei-pane)) - (insert-sequence (point drei-pane) initial-contents) - (setf (read-only-p (buffer drei-pane)) (not editable-p)) + (letf (((read-only-p (buffer drei-pane)) nil)) + (insert-sequence (point drei-pane) initial-contents)) (if syntax (setf (syntax (buffer drei-pane)) (make-instance (or (when (syntaxp syntax)

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 10 Nov '06

10 Nov '06

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv21743/Drei Modified Files: drei.lisp Log Message: Add :editable-p initarg to Drei. --- /project/mcclim/cvsroot/mcclim/Drei/drei.lisp 2006/11/10 16:47:16 1.2 +++ /project/mcclim/cvsroot/mcclim/Drei/drei.lisp 2006/11/10 18:37:56 1.3 @@ -476,7 +476,7 @@ :type (or minibuffer-pane null) :documentation "The minibuffer pane (or null) associated with the Drei instance.")) - (:default-initargs :active t) + (:default-initargs :active t :editable-p t) (:documentation "An abstract Drei class that should not be directly instantiated.")) @@ -485,10 +485,12 @@ (setf (active cursor) new-val)) (cursors drei))) -(defmethod initialize-instance :after ((object drei) &rest args &key active single-line) +(defmethod initialize-instance :after ((object drei) &rest args &key + active single-line (editable-p t)) (declare (ignore args)) (setf (single-line-p (implementation (buffer object))) single-line) (with-slots (buffer point mark top bot scan) object + (setf (read-only-p buffer) (not editable-p)) (setf point (clone-mark (point buffer))) (when (null point) (setf point (clone-mark (low-mark buffer) :right)))

1 0

[mcclim-cvs] CVS mcclim/Examples
by thenriksen 10 Nov '06

10 Nov '06

Update of /project/mcclim/cvsroot/mcclim/Examples In directory clnet:/tmp/cvs-serv21577/Examples Modified Files: clim-fig.lisp Log Message: The text-field gadget is not supposed to be editable here. Also, this is actually not what this gadget is supposed to be used for. --- /project/mcclim/cvsroot/mcclim/Examples/clim-fig.lisp 2004/02/07 14:05:50 1.28 +++ /project/mcclim/cvsroot/mcclim/Examples/clim-fig.lisp 2006/11/10 18:36:57 1.29 @@ -278,7 +278,8 @@ :activate-callback #'(lambda (x) (declare (ignore x)) (com-clear))) - (status :text-field :value "CLIM Fig")) + (status :text-field :value "CLIM Fig" + :editable-p nil)) (:layouts (default (vertically ()

1 0

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

10 Nov '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv21073 Modified Files: text-editor-gadget.lisp Log Message: A text field is single-line (in display), but it does not have an opinion about its maximum width. Implemented this behavior. --- /project/mcclim/cvsroot/mcclim/text-editor-gadget.lisp 2006/11/08 01:18:22 1.1 +++ /project/mcclim/cvsroot/mcclim/text-editor-gadget.lisp 2006/11/10 18:22:04 1.2 @@ -54,9 +54,8 @@ (w (text-size medium (gadget-value pane)))) (let ((width w) (height (+ as ds))) - (make-space-requirement :width width :height height - :max-width width :max-height height - :min-width width :min-height height))))) + (make-space-requirement :height height :max-height height :min-height height + :min-width width :width width))))) (defmethod allocate-space ((pane text-field-pane) w h) (resize-sheet pane w h))

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 10 Nov '06

10 Nov '06

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv6767/Drei Modified Files: drei.lisp Log Message: CLHS says we're not supposed to use `print-object'. --- /project/mcclim/cvsroot/mcclim/Drei/drei.lisp 2006/11/08 01:15:33 1.1 +++ /project/mcclim/cvsroot/mcclim/Drei/drei.lisp 2006/11/10 16:47:16 1.2 @@ -545,7 +545,7 @@ (user-condition-mixin (c) (beep) (with-minibuffer-stream (minibuffer) (let ((*print-escape* nil)) - (print-object c minibuffer)))))) + (princ c minibuffer)))))) (defmacro with-bound-drei-special-variables ((drei-instance &key current-buffer

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 10 Nov '06

10 Nov '06

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv6699/Drei Modified Files: drei-clim.lisp Log Message: Never let Drei have itself as the minibuffer. --- /project/mcclim/cvsroot/mcclim/Drei/drei-clim.lisp 2006/11/08 13:08:12 1.2 +++ /project/mcclim/cvsroot/mcclim/Drei/drei-clim.lisp 2006/11/10 16:46:51 1.3 @@ -352,7 +352,9 @@ #+(or mcclim building-mcclim) (climi::arm-gadget drei t))) (defmethod execute-drei-command ((drei drei-gadget-pane) command) - (let* ((*minibuffer* (or *minibuffer* *standard-input*))) + (let* ((*minibuffer* (or *minibuffer* + (unless (eq drei *standard-input*) + *standard-input*)))) (accepting-from-user (drei) (execute-drei-command-for-frame (pane-frame drei) drei command))))

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 10 Nov '06

10 Nov '06

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv7476/Drei Modified Files: input-editor.lisp Log Message: Add somewhat-correct implementation of input-editor typeout. I believe Hefner has a better idea for how this should work. --- /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2006/11/08 13:08:12 1.2 +++ /project/mcclim/cvsroot/mcclim/Drei/input-editor.lisp 2006/11/10 01:15:58 1.3 @@ -523,6 +523,45 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; +;;; `With-input-editor-typeout' +;;; +;;; The CLIM spec is very vague about what this function is supposed +;;; to do, but the Franz users guide suggests that it is to be used to +;;; display information to the user while editing, sort of what we +;;; normally use a minibuffer for. Perhaps the output should be put in +;;; an output record above or below the editing area, but for now, we +;;; just put it in the minibuffer. That also means the `:erase' +;;; keyword argument is meaningless. We do add some extra limitations, +;;; though (check the docstring) + +(defgeneric invoke-with-input-editor-typeout (stream continuation &key erase) + (:documentation "Call `continuation' with a single argument, a +stream to do input-editor-typeout on.")) + +(defmethod invoke-with-input-editor-typeout ((stream drei-input-editing-mixin) + (continuation function) &key erase) + (declare (ignore erase)) + (let ((drei (drei-instance stream))) + (when (minibuffer drei) + (funcall continuation (minibuffer drei))))) + +(defmacro with-input-editor-typeout ((&optional (stream t) &rest args + &key erase) + &body body) + "`Stream' is not evaluated and must be a symbol. If T (the +default), `*standard-input*' will be used. `Stream' will be bound +to an `extended-output-stream' while `body' is being evaluated." + (declare (ignore erase)) + (check-type stream symbol) + (let ((stream (if (eq stream t) *standard-input* stream))) + `(apply #'invoke-with-input-editor-typeout + ,stream + #'(lambda (,stream) + ,@body) + ,args))) + +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; ;;; Presentation type specialization. (define-presentation-method accept :around

1 0

[mcclim-cvs] CVS mcclim
by dlichteblau 09 Nov '06

09 Nov '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv22752 Modified Files: sheets.lisp Log Message: revert previous checkins, putting magic 100 and #x10000 values back in --- /project/mcclim/cvsroot/mcclim/sheets.lisp 2006/11/05 15:40:15 1.52 +++ /project/mcclim/cvsroot/mcclim/sheets.lisp 2006/11/09 20:24:20 1.53 @@ -671,16 +671,17 @@ ;; the server, since it is not under our control. ((or (null (sheet-parent sheet)) (null (sheet-parent (sheet-parent sheet)))) + (make-rectangle* 0 0 #x10000 #x10000) + #+nil (make-rectangle* 0 0 (port-mirror-width (port sheet) sheet) (port-mirror-height (port sheet) sheet))) (t ;; For other sheets just use the calculated value, saves a round trip. (or (%sheet-mirror-region sheet) - ;; ... unless we don't have it yet. - (make-rectangle* 0 0 - (port-mirror-width (port sheet) sheet) - (port-mirror-height (port sheet) sheet)) )))) + ;; XXX what to do if the sheet has no idea about its region? + ;; XXX can we consider calling sheet-mirror-region then an error? + (make-rectangle* 0 0 #x10000 #x10000) )))) (defmethod sheet-native-transformation ((sheet mirrored-sheet-mixin)) ;; XXX hm...

1 0

[mcclim-cvs] CVS mcclim/Backends/CLX
by dlichteblau 09 Nov '06

09 Nov '06

Update of /project/mcclim/cvsroot/mcclim/Backends/CLX In directory clnet:/tmp/cvs-serv22752/Backends/CLX Modified Files: port.lisp Log Message: revert previous checkins, putting magic 100 and #x10000 values back in --- /project/mcclim/cvsroot/mcclim/Backends/CLX/port.lisp 2006/11/05 15:35:26 1.124 +++ /project/mcclim/cvsroot/mcclim/Backends/CLX/port.lisp 2006/11/09 20:24:21 1.125 @@ -337,7 +337,7 @@ mirror-region))) (defun realize-mirror-aux (port sheet - &key width height (x 0) (y 0) + &key (width 100) (height 100) (x 0) (y 0) (border-width 0) (border 0) (override-redirect :off) (map t) @@ -367,10 +367,12 @@ (pixel (xlib:alloc-color (xlib:screen-default-colormap (clx-port-screen port)) color)) (window (xlib:create-window :parent (sheet-mirror (sheet-parent sheet)) - :width (or width - (round-coordinate (bounding-rectangle-width (%sheet-mirror-region sheet)))) - :height (or height - (round-coordinate (bounding-rectangle-height (%sheet-mirror-region sheet)))) + :width (if (%sheet-mirror-region sheet) + (round-coordinate (bounding-rectangle-width (%sheet-mirror-region sheet))) + width) + :height (if (%sheet-mirror-region sheet) + (round-coordinate (bounding-rectangle-height (%sheet-mirror-region sheet))) + height) :x (if (%sheet-mirror-transformation sheet) (round-coordinate (nth-value 0 (transform-position (%sheet-mirror-transformation sheet)

1 0

[mcclim-cvs] CVS mcclim/Drei
by thenriksen 09 Nov '06

09 Nov '06

Update of /project/mcclim/cvsroot/mcclim/Drei In directory clnet:/tmp/cvs-serv11341/Drei Modified Files: lisp-syntax.lisp Log Message: Minor fix for supporting multiple views of same parse tree on same stream. --- /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax.lisp 2006/11/08 17:52:55 1.2 +++ /project/mcclim/cvsroot/mcclim/Drei/lisp-syntax.lisp 2006/11/09 00:53:21 1.3 @@ -1866,13 +1866,12 @@ (defmethod display-parse-tree ((parser-symbol literal-object-lexeme) stream (drei drei) (syntax lisp-syntax)) (updating-output - (stream :unique-id (list stream parser-symbol) + (stream :unique-id (list drei parser-symbol) :id-test #'equal :cache-value parser-symbol :cache-test #'eql) (let ((object (token-to-object syntax parser-symbol))) - (present object - (presentation-type-of object) :stream stream)))) + (present object (presentation-type-of object) :stream stream)))) (defmethod display-parse-tree ((parser-symbol lisp-lexeme) stream (drei drei) (syntax lisp-syntax)) @@ -1883,7 +1882,7 @@ (eq (slot-value t1 'face) (text-style-face (medium-text-style (sheet-medium stream))))))) (updating-output - (stream :unique-id (list stream parser-symbol) + (stream :unique-id (list drei parser-symbol) :id-test #'equal :cache-value parser-symbol :cache-test #'cache-test)

1 0

← Newer
1
...
6
7
8
9
10
11
12
13
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

mcclim-cvs November 2006