mcclim-cvs

mcclim-cvs@common-lisp.net

1697 discussions

[mcclim-cvs] CVS mcclim
by ahefner 07 Dec '08

07 Dec '08

Update of /project/mcclim/cvsroot/mcclim In directory cl-net:/tmp/cvs-serv22434 Modified Files: dialog.lisp Log Message: Center the label with the text field, since s-o-w-b scrambles the notion of the baseline. --- /project/mcclim/cvsroot/mcclim/dialog.lisp 2008/12/06 14:56:41 1.30 +++ /project/mcclim/cvsroot/mcclim/dialog.lisp 2008/12/07 03:22:54 1.31 @@ -339,7 +339,7 @@ (let ((query-record nil)) (if align (formatting-row (stream) - (formatting-cell (stream :align-x align) + (formatting-cell (stream :align-x align :align-y :center) (do-prompt)) (formatting-cell (stream) (setq query-record (do-accept-present-default))))

1 0

[mcclim-cvs] CVS mcclim
by ahefner 06 Dec '08

06 Dec '08

Update of /project/mcclim/cvsroot/mcclim In directory cl-net:/tmp/cvs-serv9908 Modified Files: commands.lisp dialog.lisp Log Message: Add new keyword to accepting-values, select-first-query, to automatically select the first field in the dialog (we could do this using an existing keyword, but figuring out the right query ID and getting it where it needed to be looked like too much work). This highlights what I think is an existing bug - the exit buttons often don't work when a field in the dialog is accepting. Minor aesthetic tweaks to accepting-values dialog (change border styles, dress up exit buttons, rearrange some line breaks). --- /project/mcclim/cvsroot/mcclim/commands.lisp 2008/10/23 20:49:41 1.80 +++ /project/mcclim/cvsroot/mcclim/commands.lisp 2008/12/06 14:56:41 1.81 @@ -856,24 +856,26 @@ ,command-table :errorp nil)) ,@(mapcar #'list required-arg-names original-args)) - (accepting-values (,stream) + (accepting-values (,stream :select-first-query t + :align-prompts t) (format ,stream - "You are being prompted for arguments to ~S~%~%" + "You are being prompted for arguments to ~S~%" ,command-line-name) ,@(loop for var in required-arg-names for original-var in original-args for parameter in required-args + for first-arg = t then nil append `((multiple-value-bind (,value ,ptype ,changedp) ,(accept-form-for-argument-partial stream parameter var original-var) (declare (ignore ,ptype)) - (terpri ,stream) + ,@(unless first-arg `((terpri ,stream))) (when ,changedp (setq ,var ,value))))) (when still-missing (format ,stream - "~&Please supply all arguments."))) + "~&Please supply all arguments.~%"))) (setf ,partial-command (list ,command-name ,@required-arg-names)) (unless (partial-command-p ,partial-command) (return ,partial-command)))))))))) --- /project/mcclim/cvsroot/mcclim/dialog.lisp 2008/02/01 00:22:04 1.29 +++ /project/mcclim/cvsroot/mcclim/dialog.lisp 2008/12/06 14:56:41 1.30 @@ -155,12 +155,12 @@ &rest args &key own-window exit-boxes initially-select-query-identifier modify-initial-query resynchronize-every-pass resize-frame - align-prompts label scroll-bars + align-prompts label scroll-bars select-first-query x-position y-position width height command-table frame-class) &body body) (declare (ignorable exit-boxes initially-select-query-identifier modify-initial-query resynchronize-every-pass resize-frame - align-prompts scroll-bars + align-prompts scroll-bars select-first-query x-position y-position width height command-table frame-class)) (setq stream (stream-designator-symbol stream '*standard-input*)) (with-gensyms (accepting-values-continuation) @@ -185,6 +185,7 @@ (stream body &key own-window exit-boxes (initially-select-query-identifier nil initially-select-p) + select-first-query modify-initial-query resynchronize-every-pass resize-frame align-prompts label scroll-bars x-position y-position width height @@ -229,6 +230,14 @@ ('(command :command-table accept-values)) (object) (progn + (when (and select-first-query + (not initially-select-p)) + (setf current-command + `(com-select-query + ,(query-identifier + (first + (queries *accepting-values-stream*)))) + select-first-query nil)) (apply (command-name current-command) (command-arguments current-command)) ;; If current command returns without throwing a @@ -252,13 +261,22 @@ (declare (ignore frame)) (updating-output (stream :unique-id 'buttons :cache-value t) (fresh-line stream) - (with-output-as-presentation - (stream nil 'exit-button) - (format stream "OK")) - (write-char #\space stream) - (with-output-as-presentation - (stream nil 'abort-button) - (format stream "Cancel")) + (formatting-table (stream) + (formatting-row (stream) + (formatting-cell (stream) + (with-output-as-presentation (stream nil 'exit-button) + (surrounding-output-with-border + (stream :shape :rounded :radius 6 + :background +gray80+ :highlight-background +gray90+) + (format stream "OK")))) + (formatting-cell (stream) + (with-output-as-presentation + (stream nil 'abort-button) (with-output-as-presentation + (stream nil 'exit-button) + (surrounding-output-with-border + (stream :shape :rounded :radius 6 + :background +gray80+ :highlight-background +gray90+) + (format stream "Cancel"))))))) (terpri stream))) (defmethod stream-accept ((stream accepting-values-stream) type @@ -457,16 +475,25 @@ (stream query-identifier 'selectable-query :single-box t) (surrounding-output-with-border - (stream :shape :inset :move-cursor t) + (stream :shape :rounded + :radius 3 :background +white+ + :foreground +gray40+ + :move-cursor t) + ;;; FIXME: In this instance we really want borders that + ;;; react to the growth of their children. This should + ;;; be straightforward unless there is some involvement + ;;; of incremental redisplay. + ;;; KLUDGE: Arbitrary min-width. (setq editing-stream (make-instance (if *use-goatee* 'goatee-input-editing-stream 'standard-input-editing-stream) :stream stream :cursor-visibility nil - :background-ink +grey90+ :single-line t - :min-width t)))) + :min-width (- (bounding-rectangle-max-x stream) + (stream-cursor-position stream) + 100))))) (when default-supplied-p (input-editing-rescan-loop ;XXX probably not needed editing-stream

1 0

[mcclim-cvs] CVS mcclim
by ahefner 30 Nov '08

30 Nov '08

Update of /project/mcclim/cvsroot/mcclim In directory cl-net:/tmp/cvs-serv32619 Modified Files: text-formatting.lisp Log Message: Fix bug in stream-write-string on filling-streams which caused an error if the END keyword is nil, observable when climacs attempts to print a lisp arglist (strange this wasn't observed earlier, though). --- /project/mcclim/cvsroot/mcclim/text-formatting.lisp 2008/05/15 16:07:59 1.10 +++ /project/mcclim/cvsroot/mcclim/text-formatting.lisp 2008/11/30 22:26:21 1.11 @@ -81,8 +81,8 @@ (call-next-method)))) (defmethod stream-write-string :around ((stream filling-stream) string - &optional (start 0) (end (length string))) - (dotimes (i (- end start)) + &optional (start 0) end) + (dotimes (i (- (or end (length string)) start)) (stream-write-char stream (aref string (+ i start))))) ;;; All the monkey business with the lambda form has to do with capturing the

1 0

[mcclim-cvs] CVS mcclim
by ahefner 30 Nov '08

30 Nov '08

Update of /project/mcclim/cvsroot/mcclim In directory cl-net:/tmp/cvs-serv31753 Modified Files: panes.lisp Log Message: In fit-pane-to-output, accomodate the space preferences of the pane by calling compose-space, so that an empty window can still enforce a minimum size. Fixes the disappearing pointer documentation pane bug. --- /project/mcclim/cvsroot/mcclim/panes.lisp 2008/11/09 19:58:26 1.192 +++ /project/mcclim/cvsroot/mcclim/panes.lisp 2008/11/30 22:22:29 1.193 @@ -27,7 +27,7 @@ ;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;;; Boston, MA 02111-1307 USA. -;;; $Id: panes.lisp,v 1.192 2008/11/09 19:58:26 ahefner Exp $ +;;; $Id: panes.lisp,v 1.193 2008/11/30 22:22:29 ahefner Exp $ (in-package :clim-internals) @@ -906,7 +906,10 @@ &key resize-frame &allow-other-keys) (declare (ignore space-req-keys)) (cond (*changing-space-requirements* - ;; just record what we have + ;; Record changed space requirements. + ;; What happens if we change the requirements successively + ;; with different values? Only the first takes effect? + ;; -Hefner (unless (find pane *changed-space-requirements* :key #'second) (push (list (pane-frame pane) pane resize-frame) *changed-space-requirements*))) @@ -2972,9 +2975,15 @@ (defmethod fit-pane-to-output ((stream clim-stream-pane)) (when (sheet-mirror stream) (let* ((output (stream-output-history stream)) - (width (bounding-rectangle-max-x output)) - (height (bounding-rectangle-max-y output))) + (fit-width (bounding-rectangle-max-x output)) + (fit-height (bounding-rectangle-max-y output))) + (multiple-value-bind (width min-width max-width + height min-height max-height) + (space-requirement-components (compose-space stream)) (change-space-requirements stream - :min-width width :min-height height - ;;:max-width width :max-height height - :width width :height height)))) \ No newline at end of file + :min-width (max fit-width min-width) + :min-height (max fit-height min-height) + :width (max fit-width width) + :height (max fit-height height) + :max-width max-width + :max-height max-height)))))

1 0

[mcclim-cvs] CVS mcclim/Apps/Listener
by ahefner 30 Nov '08

30 Nov '08

Update of /project/mcclim/cvsroot/mcclim/Apps/Listener In directory cl-net:/tmp/cvs-serv29980 Modified Files: dev-commands.lisp Log Message: Two error handling fixes to com-eval: First, don't handle errors when evaluating in the foreground thread, so that errors can be handled in the SLIME debugger or similar.. Second, rebind *debugger-hook* if evaluating in a background thread. --- /project/mcclim/cvsroot/mcclim/Apps/Listener/dev-commands.lisp 2008/10/23 20:54:53 1.64 +++ /project/mcclim/cvsroot/mcclim/Apps/Listener/dev-commands.lisp 2008/11/30 22:19:52 1.65 @@ -1516,21 +1516,25 @@ ((form 'clim:form :prompt "form")) (let ((standard-output *standard-output*) (standard-input *standard-input*) + (debugger-hook *debugger-hook*) (application-frame *application-frame*)) (flet ((evaluate () (let ((- form) (*standard-output* standard-output) (*standard-input* standard-input) (*error-output* standard-output) + (*debugger-hook* debugger-hook) (*application-frame* application-frame) error success) - (unwind-protect (handler-case (prog1 (cons :values (multiple-value-list (eval form))) - (setf success t)) - (serious-condition (e) - (setf error e) - (error e))) - (when (not success) - (return-from evaluate (cons :error error))))))) + (if *use-background-eval* + (unwind-protect (handler-case (prog1 (cons :values (multiple-value-list (eval form))) + (setf success t)) + (serious-condition (e) + (setf error e) + (error e))) + (when (not success) + (return-from evaluate (cons :error error)))) + (cons :values (multiple-value-list (eval form))))))) ;; If possible, use a thread for evaluation, permitting us to ;; interrupt it. (let ((start-time (get-internal-real-time)))

1 0

[mcclim-cvs] CVS mcclim/Apps/Inspector
by ahefner 09 Nov '08

09 Nov '08

Update of /project/mcclim/cvsroot/mcclim/Apps/Inspector In directory cl-net:/tmp/cvs-serv11274/Apps/Inspector Modified Files: inspector.lisp Log Message: Fit space requirements to output history bounding rectangle automatically after redisplay and drawing of graphs/tables. --- /project/mcclim/cvsroot/mcclim/Apps/Inspector/inspector.lisp 2008/02/11 22:51:42 1.44 +++ /project/mcclim/cvsroot/mcclim/Apps/Inspector/inspector.lisp 2008/11/09 19:58:26 1.45 @@ -71,14 +71,6 @@ (- (bounding-rectangle-height scrollable-pane) (bounding-rectangle-height viewport))))))) -(defmethod redisplay-frame-pane :after ((frame inspector) - (pane application-pane) - &key force-p) - (declare (ignore force-p)) - (change-space-requirements - pane - :height (bounding-rectangle-height (stream-output-history pane)))) - (defun inspector (obj &key (new-process nil)) (flet ((run () (let ((*print-length* 10)

1 0

[mcclim-cvs] CVS mcclim
by ahefner 09 Nov '08

09 Nov '08

Update of /project/mcclim/cvsroot/mcclim In directory cl-net:/tmp/cvs-serv11274 Modified Files: panes.lisp graph-formatting.lisp table-formatting.lisp Log Message: Fit space requirements to output history bounding rectangle automatically after redisplay and drawing of graphs/tables. --- /project/mcclim/cvsroot/mcclim/panes.lisp 2008/08/21 22:34:29 1.191 +++ /project/mcclim/cvsroot/mcclim/panes.lisp 2008/11/09 19:58:26 1.192 @@ -27,7 +27,7 @@ ;;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;;; Boston, MA 02111-1307 USA. -;;; $Id: panes.lisp,v 1.191 2008/08/21 22:34:29 ahefner Exp $ +;;; $Id: panes.lisp,v 1.192 2008/11/09 19:58:26 ahefner Exp $ (in-package :clim-internals) @@ -2472,7 +2472,8 @@ (pane pane-display-mixin) &key force-p) (declare (ignore force-p)) - (invoke-display-function frame pane)) + (invoke-display-function frame pane) + (fit-pane-to-output pane)) (defgeneric pane-double-buffering (pane)) @@ -2965,3 +2966,15 @@ (warn "Are you sure you want to use schedule-timer-event? It probably doesn't work.") (schedule-event pane (make-instance 'timer-event :token token :sheet pane) delay)) +(defgeneric fit-pane-to-output (pane) + (:method (pane) (declare (ignore pane)))) + +(defmethod fit-pane-to-output ((stream clim-stream-pane)) + (when (sheet-mirror stream) + (let* ((output (stream-output-history stream)) + (width (bounding-rectangle-max-x output)) + (height (bounding-rectangle-max-y output))) + (change-space-requirements stream + :min-width width :min-height height + ;;:max-width width :max-height height + :width width :height height)))) \ No newline at end of file --- /project/mcclim/cvsroot/mcclim/graph-formatting.lisp 2007/09/17 19:20:49 1.22 +++ /project/mcclim/cvsroot/mcclim/graph-formatting.lisp 2008/11/09 19:58:26 1.23 @@ -3,7 +3,7 @@ ;;; Title: Graph Formatting ;;; Created: 2002-08-13 ;;; License: LGPL (See file COPYING for details). -;;; $Id: graph-formatting.lisp,v 1.22 2007/09/17 19:20:49 crhodes Exp $ +;;; $Id: graph-formatting.lisp,v 1.23 2008/11/09 19:58:26 ahefner Exp $ ;;; --------------------------------------------------------------------------- ;;; (c) copyright 2002 by Gilbert Baumann @@ -188,6 +188,7 @@ (setf (stream-cursor-position stream) (values (bounding-rectangle-max-x graph-output-record) (bounding-rectangle-max-y graph-output-record)))) + (fit-pane-to-output stream) graph-output-record)))) ;;;; Graph Output Records --- /project/mcclim/cvsroot/mcclim/table-formatting.lisp 2007/07/21 14:17:15 1.40 +++ /project/mcclim/cvsroot/mcclim/table-formatting.lisp 2008/11/09 19:58:26 1.41 @@ -336,7 +336,8 @@ (values (bounding-rectangle-max-x table) (bounding-rectangle-max-y table))) (setf (stream-cursor-position stream) - (values cursor-old-x cursor-old-y)))))) + (values cursor-old-x cursor-old-y))))) + (fit-pane-to-output stream)) ;;; Think about rewriting this using a common superclass for row and ;;; column records.

1 0

[mcclim-cvs] CVS mcclim/Backends/CLX
by ahefner 09 Nov '08

09 Nov '08

Update of /project/mcclim/cvsroot/mcclim/Backends/CLX In directory cl-net:/tmp/cvs-serv11057 Modified Files: medium.lisp Log Message: Fix typo in with-clx-graphics. --- /project/mcclim/cvsroot/mcclim/Backends/CLX/medium.lisp 2008/01/30 18:56:40 1.88 +++ /project/mcclim/cvsroot/mcclim/Backends/CLX/medium.lisp 2008/11/09 19:55:38 1.89 @@ -612,7 +612,7 @@ (defmacro with-clx-graphics ((medium) &body body) `(let* ((port (port ,medium)) - (mirror (or (medium-buffer medium) (port-lookup-mirror port (medium-sheet ,medium))))) + (mirror (or (medium-buffer ,medium) (port-lookup-mirror port (medium-sheet ,medium))))) (when mirror (let* ((line-style (medium-line-style ,medium)) (ink (medium-ink ,medium))

1 0

[mcclim-cvs] CVS mcclim
by ahefner 09 Nov '08

09 Nov '08

Update of /project/mcclim/cvsroot/mcclim In directory cl-net:/tmp/cvs-serv10554 Modified Files: text-editor-gadget.lisp Log Message: Eliminate allocate-space method on text-field-panes, because it blocks the vbox layout from running, which stops the child (substrate) pane from being sized correctly. --- /project/mcclim/cvsroot/mcclim/text-editor-gadget.lisp 2008/01/11 02:44:14 1.11 +++ /project/mcclim/cvsroot/mcclim/text-editor-gadget.lisp 2008/11/09 19:52:44 1.12 @@ -376,9 +376,6 @@ (setf (substrate object) substrate) (sheet-adopt-child object substrate))) -(defmethod allocate-space ((pane text-field-pane) w h) - (resize-sheet pane w h)) - ;;; ------------------------------------------------------------------------------------------ ;;; 30.4.9 The concrete text-editor Gadget

1 0

[mcclim-cvs] CVS mcclim/Looks
by ahefner 09 Nov '08

09 Nov '08

Update of /project/mcclim/cvsroot/mcclim/Looks In directory cl-net:/tmp/cvs-serv10554/Looks Modified Files: pixie.lisp Log Message: Eliminate allocate-space method on text-field-panes, because it blocks the vbox layout from running, which stops the child (substrate) pane from being sized correctly. --- /project/mcclim/cvsroot/mcclim/Looks/pixie.lisp 2008/08/22 22:36:00 1.25 +++ /project/mcclim/cvsroot/mcclim/Looks/pixie.lisp 2008/11/09 19:52:44 1.26 @@ -1150,9 +1150,6 @@ :max-width width :max-height height :min-width width :min-height height))))) -(defmethod allocate-space ((pane pixie-text-field-pane) w h) - (resize-sheet pane w h)) - ;;;; Pixie tab-layout. Reuses implementation of the generic tab-layout-pane. (define-pixie-gadget clim-tab-layout:tab-layout pixie-tab-layout-pane)

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
170
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

mcclim-cvs