April 2005 - mcclim-cvs@common-lisp.net - mailman3.common-lisp.net

[mcclim-cvs] CVS update: mcclim/stream-output.lisp
by ahefner＠common-lisp.net 17 Apr '05

17 Apr '05

Update of /project/mcclim/cvsroot/mcclim In directory common-lisp.net:/tmp/cvs-serv26576 Modified Files: stream-output.lisp Log Message: Squashed a "magic fudge factor". Date: Sun Apr 17 18:42:48 2005 Author: ahefner Index: mcclim/stream-output.lisp diff -u mcclim/stream-output.lisp:1.53 mcclim/stream-output.lisp:1.54 --- mcclim/stream-output.lisp:1.53 Wed Feb 2 12:33:59 2005 +++ mcclim/stream-output.lisp Sun Apr 17 18:42:47 2005 @@ -487,15 +487,15 @@ (declare (ignore total-height final-y baseline)) (values final-x total-width)))) -;;; XXX where does "6" come from? Magic fudge factor? -- moore (defmethod stream-text-margin ((stream standard-extended-output-stream)) (with-slots (margin) stream (or margin (- (bounding-rectangle-width (or (pane-viewport stream) stream)) - 6)))) + (text-size stream "O"))))) -(defmethod stream-line-height ((stream standard-extended-output-stream) &key (text-style nil)) +(defmethod stream-line-height ((stream standard-extended-output-stream) + &key (text-style nil)) (+ (text-style-height (or text-style (medium-text-style (sheet-medium stream))) (sheet-medium stream)) (stream-vertical-spacing stream)))

1 0

[mcclim-cvs] CVS update: mcclim/graph-formatting.lisp
by ahefner＠common-lisp.net 12 Apr '05

12 Apr '05

Update of /project/mcclim/cvsroot/mcclim In directory common-lisp.net:/tmp/cvs-serv510 Modified Files: graph-formatting.lisp Log Message: Fixed arc-drawer keyword default, as reported by rpgoldman(a)real-time.com Date: Tue Apr 12 22:43:26 2005 Author: ahefner Index: mcclim/graph-formatting.lisp diff -u mcclim/graph-formatting.lisp:1.11 mcclim/graph-formatting.lisp:1.12 --- mcclim/graph-formatting.lisp:1.11 Sun Dec 5 20:37:52 2004 +++ mcclim/graph-formatting.lisp Tue Apr 12 22:43:26 2005 @@ -3,7 +3,7 @@ ;;; Title: Graph Formatting ;;; Created: 2002-08-13 ;;; License: LGPL (See file COPYING for details). -;;; $Id: graph-formatting.lisp,v 1.11 2004/12/05 19:37:52 hefner1 Exp $ +;;; $Id: graph-formatting.lisp,v 1.12 2005/04/12 20:43:26 ahefner Exp $ ;;; --------------------------------------------------------------------------- ;;; (c) copyright 2002 by Gilbert Baumann @@ -125,7 +125,9 @@ merge-duplicates duplicate-key duplicate-test generation-separation within-generation-separation - center-nodes arc-drawer arc-drawing-options + center-nodes + (arc-drawer #'clim-internals::standard-arc-drawer) + arc-drawing-options graph-type (move-cursor t) &allow-other-keys) (declare (ignore orientation generation-separation within-generation-separation center-nodes))

1 0

[mcclim-cvs] CVS update: mcclim/Doc/manual.tex
by rstrandh＠common-lisp.net 07 Apr '05

07 Apr '05

Update of /project/mcclim/cvsroot/mcclim/Doc In directory common-lisp.net:/tmp/cvs-serv21370 Modified Files: manual.tex Log Message: Applied patch from R P Goldman. Thanks! Date: Thu Apr 7 09:54:59 2005 Author: rstrandh Index: mcclim/Doc/manual.tex diff -u mcclim/Doc/manual.tex:1.26 mcclim/Doc/manual.tex:1.27 --- mcclim/Doc/manual.tex:1.26 Fri Mar 11 23:34:59 2005 +++ mcclim/Doc/manual.tex Thu Apr 7 09:54:59 2005 @@ -7,6 +7,11 @@ \usepackage{alltt} \usepackage{moreverb} +\ifx\pdfoutput\undefined \csname newcount\endcsname\pdfoutput \fi +\ifcase\pdfoutput \else +\usepackage[pdftex]{hyperref} +\fi + \setlength{\parskip}{0.3cm} \setlength{\parindent}{0cm} @@ -372,7 +377,7 @@ \begin{figure} \begin{center} -\inputfig{ex2.pstex_t} +\includegraphics{ex2} \end{center} \caption{\label{figex2} View of the improved example} \end{figure} @@ -643,8 +648,9 @@ c. Mirrors are outlined with dotted rectangles. \begin{figure} -\begin{center} -\inputfig{native.pstex_t} + \begin{center} + \input native.pstex_t +%\inputfig{native.pstex_t} \end{center} \caption{\label{fignative} A sheet with a nontrivial transformation} \end{figure} @@ -1576,7 +1582,7 @@ The new cons cell diagram format looks like this: \begin{center} -\includegraphics{inspect-as-cells.eps} +\includegraphics{inspect-as-cells} \end{center} \section{Extending Clouseau} @@ -1718,7 +1724,7 @@ the right. This gives us some reasonably nice-looking output: \begin{center} -\includegraphics{inspect-object-1.eps} +\includegraphics{inspect-object-1} \end{center} But what we really want is something more closely adapted to our @@ -1754,7 +1760,7 @@ to \cl{x=y} and we're done. It looks like this: \begin{center} -\includegraphics{inspect-object-2.eps} +\includegraphics{inspect-object-2} \end{center} Finally, for our amusement and further practice, we'll try to get some @@ -1816,7 +1822,7 @@ Our final version looks like this: \begin{center} -\includegraphics{inspect-object-3.eps} +\includegraphics{inspect-object-3} \end{center} For more examples of how to extend the inspector, you can look at

1 0

[mcclim-cvs] CVS update: mcclim/Backends/CLX/port.lisp
by crhodes＠common-lisp.net 05 Apr '05

05 Apr '05

Update of /project/mcclim/cvsroot/mcclim/Backends/CLX In directory common-lisp.net:/tmp/cvs-serv23885/Backends/CLX Modified Files: port.lisp Log Message: Fix the new $DISPLAY parsing code after feedback from rpg. Date: Tue Apr 5 22:09:29 2005 Author: crhodes Index: mcclim/Backends/CLX/port.lisp diff -u mcclim/Backends/CLX/port.lisp:1.110 mcclim/Backends/CLX/port.lisp:1.111 --- mcclim/Backends/CLX/port.lisp:1.110 Sun Apr 3 00:18:20 2005 +++ mcclim/Backends/CLX/port.lisp Tue Apr 5 22:09:29 2005 @@ -194,8 +194,8 @@ (t :internet)))) (list :clx :host (getf path :host host) - :display-id (getf path :display-id display) - :screen-id (getf path :screen-id screen) + :display-id (getf path :display-id (or display 0)) + :screen-id (getf path :screen-id (or screen 0)) :protocol protocol))) (setf (get :x11 :port-type) 'clx-port) @@ -268,7 +268,9 @@ (defmethod initialize-clx ((port clx-port)) (let ((options (cdr (port-server-path port)))) (setf (clx-port-display port) - (xlib:open-display (getf options :host "") :display (getf options :display-id 0) :protocol (getf options :protocol :local))) + (xlib:open-display (getf options :host) + :display (getf options :display-id) + :protocol (getf options :protocol))) (progn (setf (xlib:display-error-handler (clx-port-display port)) #'clx-error-handler) @@ -277,7 +279,7 @@ (setf (xlib:display-after-function (clx-port-display port)) #'xlib:display-force-output)) - (setf (clx-port-screen port) (nth (getf options :screen-id 0) + (setf (clx-port-screen port) (nth (getf options :screen-id) (xlib:display-roots (clx-port-display port)))) (setf (clx-port-window port) (xlib:screen-root (clx-port-screen port))) (make-cursor-table port)

1 0

[mcclim-cvs] CVS update: mcclim/Backends/CLX/port.lisp
by crhodes＠common-lisp.net 02 Apr '05

02 Apr '05

Update of /project/mcclim/cvsroot/mcclim/Backends/CLX In directory common-lisp.net:/tmp/cvs-serv9380/Backends/CLX Modified Files: port.lisp Log Message: Fix clim-over-ssh-x-fails, by parsing $DISPLAY more correctly. Date: Sun Apr 3 00:18:21 2005 Author: crhodes Index: mcclim/Backends/CLX/port.lisp diff -u mcclim/Backends/CLX/port.lisp:1.109 mcclim/Backends/CLX/port.lisp:1.110 --- mcclim/Backends/CLX/port.lisp:1.109 Tue Mar 22 13:31:22 2005 +++ mcclim/Backends/CLX/port.lisp Sun Apr 3 00:18:20 2005 @@ -170,16 +170,33 @@ (defun parse-clx-server-path (path) (pop path) - (let* ((s (get-environment-variable "DISPLAY")) - (colon (position #\: s)) - (dot (position #\. s :start colon)) - (host-name (subseq s 0 colon)) - (display-number (parse-integer s :start (1+ colon) :end dot)) - (screen-number (if dot (parse-integer s :start (1+ dot)) 0))) + (let* ((name (get-environment-variable "DISPLAY")) + ;; this code courtesy telent-clx. + (slash-i (or (position #\/ name) -1)) + (colon-i (position #\: name :start (1+ slash-i))) + (decnet-colon-p (eql (elt name (1+ colon-i)) #\:)) + (host (subseq name (1+ slash-i) colon-i)) + (dot-i (and colon-i (position #\. name :start colon-i))) + (display (when colon-i + (parse-integer name + :start (if decnet-colon-p + (+ colon-i 2) + (1+ colon-i)) + :end dot-i))) + (screen (when dot-i + (parse-integer name :start (1+ dot-i)))) + (protocol + (cond ((or (string= host "") (string-equal host "unix")) :local) + (decnet-colon-p :decnet) + ((> slash-i -1) (intern + (string-upcase (subseq name 0 slash-i)) + :keyword)) + (t :internet)))) (list :clx - :host (getf path :host host-name) - :display-id (getf path :display-id display-number) - :screen-id (getf path :screen-id screen-number)))) + :host (getf path :host host) + :display-id (getf path :display-id display) + :screen-id (getf path :screen-id screen) + :protocol protocol))) (setf (get :x11 :port-type) 'clx-port) (setf (get :x11 :server-path-parser) 'parse-clx-server-path) @@ -251,7 +268,7 @@ (defmethod initialize-clx ((port clx-port)) (let ((options (cdr (port-server-path port)))) (setf (clx-port-display port) - (xlib:open-display (getf options :host "") :display (getf options :display-id 0))) + (xlib:open-display (getf options :host "") :display (getf options :display-id 0) :protocol (getf options :protocol :local))) (progn (setf (xlib:display-error-handler (clx-port-display port)) #'clx-error-handler)

1 0

[mcclim-cvs] CVS update: mcclim/Apps/Inspector/inspector.lisp
by pscott＠common-lisp.net 02 Apr '05

02 Apr '05

Update of /project/mcclim/cvsroot/mcclim/Apps/Inspector In directory common-lisp.net:/tmp/cvs-serv27378 Modified Files: inspector.lisp Log Message: Fixed problems with PRINT-DOCUMENTATION, which turned out to be more complicated than I thought. It should work on ACL now. Date: Sat Apr 2 20:03:59 2005 Author: pscott Index: mcclim/Apps/Inspector/inspector.lisp diff -u mcclim/Apps/Inspector/inspector.lisp:1.30 mcclim/Apps/Inspector/inspector.lisp:1.31 --- mcclim/Apps/Inspector/inspector.lisp:1.30 Fri Mar 18 21:51:29 2005 +++ mcclim/Apps/Inspector/inspector.lisp Sat Apr 2 20:03:59 2005 @@ -157,7 +157,11 @@ (formatting-cell (,evaluated-pane) (formatting-table (,evaluated-pane) ,@body)))) - (print-documentation ,evaluated-object ,evaluated-pane))))) + (print-documentation (if (eql (class-of ,evaluated-object) + (find-class 'standard-class)) + ,evaluated-object + (class-of ,evaluated-object)) + ,evaluated-pane))))) (defmacro inspector-table-row ((pane) left right) "Output a table row with two items, produced by evaluating LEFT and @@ -182,10 +186,15 @@ (princ ,label ,evaluated-pane) (inspect-object ,value ,evaluated-pane))))))) +;; The error handler shouldn't be necessary, but it works around an +;; ACL bug and shouldn't mess anything up on other lisps. The warning +;; handler is there in case DOCUMENTATION raises a warning, to tell +;; lisp that we don't care and it shouldn't go alarming the user. (defun print-documentation (object pane) "Print OBJECT's documentation, if any, to PANE" - (when (handler-bind ((warning #'muffle-warning)) - (documentation object t)) + (when (handler-case (documentation object t) + (error ()) + (warning ())) (with-heading-style (pane) (format pane "~&Documentation: ")) (princ (documentation object t) pane)))

1 0