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

[mcclim-cvs] CVS update: mcclim/Examples/method-browser.lisp
by ahefner＠common-lisp.net 06 Mar '05

06 Mar '05

Update of /project/mcclim/cvsroot/mcclim/Examples In directory common-lisp.net:/tmp/cvs-serv2663 Modified Files: method-browser.lisp Log Message: Support for EQL specializers on SBCL and CMUCL. Date: Sun Mar 6 21:35:40 2005 Author: ahefner Index: mcclim/Examples/method-browser.lisp diff -u mcclim/Examples/method-browser.lisp:1.1 mcclim/Examples/method-browser.lisp:1.2 --- mcclim/Examples/method-browser.lisp:1.1 Mon Jan 31 07:24:24 2005 +++ mcclim/Examples/method-browser.lisp Sun Mar 6 21:35:40 2005 @@ -22,7 +22,8 @@ ;;; -------------------------------------------------------------------- ;;; This is an example of how to write a CLIM application with a -;;; "normal" GUI. McCLIM can do more than just command lines.. +;;; "normal" GUI, where "normal" is a completely event driven app +;;; built using gadgets and not using the command-oriented framework. ;;; Running the method-browser: ;;; (clim-demo::run-test 'clim-demo::method-browser) @@ -45,7 +46,7 @@ ;;; * Portable MOP provided by CLIM-MOP package ;;; TODO: -;;; * EQL specializers (not portable according to AMOP) +;;; * EQL specializers on implementations other than SBCL/CMUCL ;;; * Nicer, more clever display of methods than simply listing them in a row. ;;; To do this right really involes some nonportable fun and a codewalker. ;;; You could probably write something that just understood the standard @@ -66,6 +67,28 @@ collect (remove-duplicates (mapcar (lambda (specs) (nth index specs)) specializers))))) +(defun classp (x) + (or (typep x 'cl:class) + #+CMU (typep x 'pcl::class))) + +(defun eql-specializer-p (x) + #+SBCL (typep x 'sb-mop:eql-specializer) + #+CMU (typep x 'pcl:eql-specializer)) + +(defun eql-specializer-object (x) + #+SBCL (sb-mop:eql-specializer-object x) + #+CMU (pcl::eql-specializer-object x)) + +(defun compute-applicable-methods-from-specializers (gf specializers) + (clim-mop:compute-applicable-methods gf + (mapcar (lambda (spec) + (cond ((eql-specializer-p spec) + (eql-specializer-object spec)) + ((classp spec) + (clim-mop:class-prototype spec)) + (t (error "Can't compute effective methods, specializer ~A is not understood." spec)))) + specializers))) + ;; FIXME: Support EQL specializers. ;; This is hard to do ideally, and I'm not really trying. ;; So we just make sure that T ends up at the head of the list. @@ -77,8 +100,23 @@ (cond ((eql a (find-class t)) t) ((eql b (find-class t)) nil) - (t (string< (class-name a) - (class-name b))))))) + ((and (classp a) + (classp b)) + (string< (class-name a) + (class-name b))) + ((and (eql-specializer-p a) + (not (eql-specializer-p b))) + nil) + ((and (not (eql-specializer-p a)) + (eql-specializer-p b)) + t) + ((and (eql-specializer-p a) + (eql-specializer-p b)) + (string< + (princ-to-string (eql-specializer-object a)) + (princ-to-string (eql-specializer-object b)))) + (t (warn "Received specializer of unknown type") + nil) )))) (compute-gf-specializers gf))) (defun simple-generic-function-lambda-list (gf) @@ -95,9 +133,10 @@ (defun specializer-pretty-name (spec) "Pretty print the name of a method specializer" - (cond ((or (typep spec 'class) - #+CMU (typep spec 'pcl::class)) + (cond ((classp spec) (princ-to-string (class-name spec))) + ((eql-specializer-p spec) + (format nil "(EQL '~A)" (eql-specializer-object spec))) (t (princ-to-string spec)))) (defun maybe-find-gf (name) @@ -274,10 +313,10 @@ "Generates the display of applicable methods in the output-pane" (when (gf frame) (let* ((gf (gf frame)) - (methods (clim-mop:compute-applicable-methods-using-classes gf (arg-types frame))) + (methods (compute-applicable-methods-from-specializers gf (arg-types frame))) (combination (clim-mop:generic-function-method-combination gf)) (effective-methods (clim-mop:compute-effective-method gf combination methods)) - (serial-methods (walk-em-form effective-methods))) + (serial-methods (walk-em-form effective-methods))) ;; Print the header (fresh-line) (with-drawing-options (pane :text-style (make-text-style :sans-serif :bold :large)

1 0

[mcclim-cvs] CVS update: mcclim/Apps/Listener/cmu-hacks.lisp
by ahefner＠common-lisp.net 06 Mar '05

06 Mar '05

Update of /project/mcclim/cvsroot/mcclim/Apps/Listener In directory common-lisp.net:/tmp/cvs-serv1772 Modified Files: cmu-hacks.lisp Log Message: Apply package lock patch from Paolo Amoroso. Date: Sun Mar 6 21:23:13 2005 Author: ahefner Index: mcclim/Apps/Listener/cmu-hacks.lisp diff -u mcclim/Apps/Listener/cmu-hacks.lisp:1.4 mcclim/Apps/Listener/cmu-hacks.lisp:1.5 --- mcclim/Apps/Listener/cmu-hacks.lisp:1.4 Sun Aug 1 07:39:41 2004 +++ mcclim/Apps/Listener/cmu-hacks.lisp Sun Mar 6 21:23:13 2005 @@ -2,6 +2,11 @@ (in-package :climi) +#+cmu19a +(progn (setf (ext:package-definition-lock (find-package "DEBUG")) nil) + (setf (ext:package-definition-lock (find-package "COMMON-LISP")) nil) + (setf (ext:package-definition-lock (find-package "EXT")) nil)) + ;; a patch (defmethod stream-listen ((stream standard-extended-input-stream)) (with-encapsulating-stream (estream stream)

1 0

[mcclim-cvs] CVS update: mcclim/INSTALL.ASDF
by afuchs＠common-lisp.net 06 Mar '05

06 Mar '05

Update of /project/mcclim/cvsroot/mcclim In directory common-lisp.net:/tmp/cvs-serv32551 Modified Files: INSTALL.ASDF Log Message: <vja> antifuchs: in INSTALL.ASDF: asdf:*central-repository* --> asdf:*central-registry* (three times) (argh.) Date: Sun Mar 6 20:57:12 2005 Author: afuchs Index: mcclim/INSTALL.ASDF diff -u mcclim/INSTALL.ASDF:1.1 mcclim/INSTALL.ASDF:1.2 --- mcclim/INSTALL.ASDF:1.1 Sun Mar 6 19:57:18 2005 +++ mcclim/INSTALL.ASDF Sun Mar 6 20:57:12 2005 @@ -5,13 +5,13 @@ first time, perform these steps: 1. Symlink mcclim.asd to a directory in your - asdf:*central-repository* list. E.g., for SBCL, that would be: + asdf:*central-registry* list. E.g., for SBCL, that would be: $ ln -sf /path/to/mcclim.asd ~/.sbcl/systems/ 2. If you are using a Lisp implementation that requires a separate CLX to be installed, do this now and symlink the clx's .asd file - to your asdf:*central-repository*, as above. If your + to your asdf:*central-registry*, as above. If your implementation's CLX doesn't come with a clx.asd file, you will have to load CLX via (require :clx) or a similar mechanism yourself. @@ -30,7 +30,7 @@ Installing mcclim.asd if you were using ASDF & system.lisp before ================================================================= -Make sure to remove all symlinks in your asdf:*central-repository* to +Make sure to remove all symlinks in your asdf:*central-registry* to system.lisp and replace them with symlinks to mcclim.asd. Keeping the old links around will break loading the McCLIM system in subtle ways.

1 0

[mcclim-cvs] CVS update: mcclim/Backends/beagle/README.txt
by afuchs＠common-lisp.net 06 Mar '05

06 Mar '05

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle In directory common-lisp.net:/tmp/cvs-serv29201/Backends/beagle Modified Files: README.txt Log Message: Install documentation update to reflect the ASDF changes & recommend mcclim.asd Date: Sun Mar 6 19:57:22 2005 Author: afuchs Index: mcclim/Backends/beagle/README.txt diff -u mcclim/Backends/beagle/README.txt:1.6 mcclim/Backends/beagle/README.txt:1.7 --- mcclim/Backends/beagle/README.txt:1.6 Sun Aug 22 00:42:51 2004 +++ mcclim/Backends/beagle/README.txt Sun Mar 6 19:57:20 2005 @@ -43,42 +43,29 @@ changes in the OpenMCL Cocoa Bridge. Compiling and running the back end currently is a straight-forward (if -rather limiting [see note #3]) task: - -Optional: - -1. Create a symbolic link from .../McCLIM/Backends/beagle/load-clim.lisp - to your home directory. -2. Ditto for load-clx.lisp (if you intend to run the clx backend too... there - are other ways to do this, but this is how I'm doing it at the moment) -3. Ditto for load-beagle.lisp - -Then: +rather limiting [see note #2]) task: +1. Install McCLIM according to INSTALL.ASDF in the McCLIM root + directory. 2. Start OpenMCL 3. Evaluate '(require "COCOA")' The following are evaluated from the 'OpenMCL Listener' that opens: 4. Evaluate '(require "ASDF")' -5. Evaluate '(load "home:load-clim")' [See note #1] -6. Evaluate '(load "home:load-beagle")' [See note #4] +5. Evaluate '(asdf:oos 'asdf:load-op :clim-beagle)' +6. Evaluate '(asdf:oos 'asdf:load-op :mcclim)' [See note #3] The McCLIM Listener should now be able to be started from the OpenMCL Listener by evaluating '(clim-listener:run-listener)'. See the McCLIM -installation notes for other things you might want to do. [See note #2] - -Note #1: If you did not create the symbolic link in (1), load the - "load-clim.lisp" file from whereever it is; for example, - - '(load "/Users/me/McCLIM/Backends/beagle/load-clim")' +installation notes for other things you might want to do. [See note #1] -Note #2: Some of the examples provided with McCLIM do not execute when using +Note #1: Some of the examples provided with McCLIM do not execute when using the Beagle back end, either because of unimplemented features in the back end or because of lossage in the back end. Reports and patches would be appreciated! -Note #3: Yes, this is a little silly. For a while the Beagle back end could +Note #2: Yes, this is a little silly. For a while the Beagle back end could be built into its own bundle by making use of Mikel Evins' Bosco framework. This framework is currently undergoing some change in any case so I decided to make the initial CVS version available @@ -89,10 +76,11 @@ currently-executing (non-graphical) application can have an event loop. -Note #4: If you'd rather run with the CLX back end, do a load-clx instead - here. Hopefully it will (soon?) be possible to run with multiple - ports simultaneously so that both a CLX and a Beagle Listener can - be run side by side for comparative purposes. +Note #3: If you'd rather run with the CLX back end, load CLX + instead here. Hopefully it will (soon?) be possible to run + with multiple ports simultaneously so that both a CLX and a + Beagle Listener can be run side by side for comparative + purposes. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

1 0

[mcclim-cvs] CVS update: mcclim/INSTALL.ASDF mcclim/INSTALL.CLISP mcclim/INSTALL.CMU mcclim/INSTALL.OPENMCL mcclim/INSTALL.SBCL
by afuchs＠common-lisp.net 06 Mar '05

06 Mar '05

Update of /project/mcclim/cvsroot/mcclim In directory common-lisp.net:/tmp/cvs-serv29201 Modified Files: INSTALL.CLISP INSTALL.CMU INSTALL.OPENMCL INSTALL.SBCL Added Files: INSTALL.ASDF Log Message: Install documentation update to reflect the ASDF changes & recommend mcclim.asd Date: Sun Mar 6 19:57:18 2005 Author: afuchs Index: mcclim/INSTALL.CLISP diff -u mcclim/INSTALL.CLISP:1.1 mcclim/INSTALL.CLISP:1.2 --- mcclim/INSTALL.CLISP:1.1 Mon Dec 20 16:51:26 2004 +++ mcclim/INSTALL.CLISP Sun Mar 6 19:57:18 2005 @@ -1,6 +1,12 @@ Install instructions for GNU CLISP ---------------------------------- +:::NOTE::: +These install instructions refer to the "system.lisp" installation +approach. If you have ASDF available, we recommend you follow the +install instructions in INSTALL.ASDF. +:::NOTE::: + 1. Get clisp-20041218 or newer. Build it with option --with-module=clx/mit-clx. 2. Get a copy of the ASDF package. Compile it: Index: mcclim/INSTALL.CMU diff -u mcclim/INSTALL.CMU:1.16 mcclim/INSTALL.CMU:1.17 --- mcclim/INSTALL.CMU:1.16 Sun Aug 22 17:48:17 2004 +++ mcclim/INSTALL.CMU Sun Mar 6 19:57:18 2005 @@ -1,7 +1,13 @@ Install instructions for CMU Common Lisp ---------------------------------------- -McCLIM has been tested with CMUCL 18e. +:::NOTE::: +These install instructions refer to the "system.lisp" installation +approach. If you have ASDF available, we recommend you follow the +install instructions in INSTALL.ASDF. +:::NOTE::: + +McCLIM has been tested with CMUCL 19a. 1. Make sure you have a Lisp core file that includes Index: mcclim/INSTALL.OPENMCL diff -u mcclim/INSTALL.OPENMCL:1.3 mcclim/INSTALL.OPENMCL:1.4 --- mcclim/INSTALL.OPENMCL:1.3 Wed Mar 24 10:30:29 2004 +++ mcclim/INSTALL.OPENMCL Sun Mar 6 19:57:18 2005 @@ -1,6 +1,12 @@ Install instructions for OpenMCL on Mac OS X -------------------------------------------- +:::NOTE::: +These install instructions refer to the "system.lisp" installation +approach. If you have ASDF available, we recommend you follow the +install instructions in INSTALL.ASDF. +:::NOTE::: + McCLIM has been tested with OpenMCL 0.13.6 and OpenMCL 0.14.1-p1 (which is recommended). Index: mcclim/INSTALL.SBCL diff -u mcclim/INSTALL.SBCL:1.3 mcclim/INSTALL.SBCL:1.4 --- mcclim/INSTALL.SBCL:1.3 Wed Nov 19 14:51:17 2003 +++ mcclim/INSTALL.SBCL Sun Mar 6 19:57:18 2005 @@ -1,6 +1,13 @@ Install instructions for SBCL ----------------------------- +:::NOTE::: +These install instructions refer to the "system.lisp" installation +approach. If you have ASDF available, we recommend you follow the +install instructions in INSTALL.ASDF. +:::NOTE::: + + 1. Get a recent SBCL, it will be equipped with ASDF, which you will need.

1 0

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

05 Mar '05

Update of /project/mcclim/cvsroot/mcclim/Apps/Inspector In directory common-lisp.net:/tmp/cvs-serv999 Modified Files: inspector.lisp Log Message: Fixed PRIN1 bugs that I introduced with the last "bugfix" commit. Thanks to Vincent Arkesteijn for pointing them out. I thought I tested that code! Really! Date: Sat Mar 5 16:48:18 2005 Author: pscott Index: mcclim/Apps/Inspector/inspector.lisp diff -u mcclim/Apps/Inspector/inspector.lisp:1.23 mcclim/Apps/Inspector/inspector.lisp:1.24 --- mcclim/Apps/Inspector/inspector.lisp:1.23 Fri Mar 4 22:32:08 2005 +++ mcclim/Apps/Inspector/inspector.lisp Sat Mar 5 16:48:18 2005 @@ -429,27 +429,15 @@ (formatting-cell (pane) (princ ")" pane)))))) -;; For some strange reason, objects that are displayed with PRINT are -;; slightly wider than those displayed with PRIN1. Generally, PRIN1 is -;; what you want, and to prevent strings and numbers from getting -;; slightly wider when they're toggled to full inspection, the -;; INSPECT-OBJECT methods for them call the INSPECT-OBJECT-BRIEFLY -;; methods which do the right thing. (defmethod inspect-object-briefly ((object string) pane) (with-output-as-presentation (pane object (presentation-type-of object)) (prin1 object))) -(defmethod inspect-object ((object string) pane) - (inspect-object-briefly object pane)) - (defmethod inspect-object-briefly ((object number) pane) (with-output-as-presentation (pane object (presentation-type-of object)) (prin1 object))) - -(defmethod inspect-object ((object number) pane) - (inspect-object-briefly object pane)) (defun inspect-complex (object pane) "Inspect a complex number. Since complex numbers should be inspected

1 0

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

04 Mar '05

Update of /project/mcclim/cvsroot/mcclim/Apps/Inspector In directory common-lisp.net:/tmp/cvs-serv3338 Modified Files: inspector.lisp Log Message: Fixed a bunch of little bugs. Added some comments. Package display was ugly in one place I forgot to change earlier, so I changed it. Numbers and strings had some weird display problems, which I've mostly fixed (and I can only hope that I didn't introduce minor bugs in some other part of the program). I think this is ready for the Mothering Sunday release! Date: Fri Mar 4 22:32:09 2005 Author: pscott Index: mcclim/Apps/Inspector/inspector.lisp diff -u mcclim/Apps/Inspector/inspector.lisp:1.22 mcclim/Apps/Inspector/inspector.lisp:1.23 --- mcclim/Apps/Inspector/inspector.lisp:1.22 Wed Feb 16 00:12:07 2005 +++ mcclim/Apps/Inspector/inspector.lisp Fri Mar 4 22:32:08 2005 @@ -304,9 +304,10 @@ (formatting-cell (pane) (inspect-object car pane))))))) (defmethod inspect-object ((object cons) pane) + ;; Decide how to display the cons by looking in cons-cell-dico (if (gethash object (cons-cell-dico *application-frame*)) - (inspect-cons-as-cells object pane) - (inspect-cons-as-list object pane))) + (inspect-cons-as-cells object pane) + (inspect-cons-as-list object pane))) (defmethod inspect-object-briefly ((object hash-table) pane) @@ -383,9 +384,13 @@ (print-documentation object pane))) (defmethod inspect-object-briefly ((object package) pane) + ;; Display as 'Package: "PACKAGE-NAME"'. We're doing something a + ;; little unusual here by not bolding the "Package:" part. This may + ;; be a tad inconsistent, but the other way looks very odd. (with-output-as-presentation (pane object (presentation-type-of object)) (format pane "Package: ~S" (package-name object)))) + (defmethod inspect-object ((object package) pane) (inspector-table (format pane "Package: ~S" (package-name object)) @@ -408,7 +413,8 @@ (inspector-table-row (princ "Uses:") (dolist (uses (package-use-list object)) - (inspect-object uses pane))))) + (fresh-line pane) + (inspect-object uses pane))))) (defmethod inspect-object ((object vector) pane) (with-output-as-presentation @@ -423,15 +429,27 @@ (formatting-cell (pane) (princ ")" pane)))))) +;; For some strange reason, objects that are displayed with PRINT are +;; slightly wider than those displayed with PRIN1. Generally, PRIN1 is +;; what you want, and to prevent strings and numbers from getting +;; slightly wider when they're toggled to full inspection, the +;; INSPECT-OBJECT methods for them call the INSPECT-OBJECT-BRIEFLY +;; methods which do the right thing. (defmethod inspect-object-briefly ((object string) pane) (with-output-as-presentation (pane object (presentation-type-of object)) - (print object))) + (prin1 object))) + +(defmethod inspect-object ((object string) pane) + (inspect-object-briefly object pane)) (defmethod inspect-object-briefly ((object number) pane) (with-output-as-presentation (pane object (presentation-type-of object)) - (print object))) + (prin1 object))) + +(defmethod inspect-object ((object number) pane) + (inspect-object-briefly object pane)) (defun inspect-complex (object pane) "Inspect a complex number. Since complex numbers should be inspected

1 0

[mcclim-cvs] CVS update: mcclim/Backends/beagle/package.lisp
by afuchs＠common-lisp.net 04 Mar '05

04 Mar '05

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle In directory common-lisp.net:/tmp/cvs-serv20688 Modified Files: package.lisp Log Message: Tom Winchester's patch to package.lisp to adapt the beagle to the new backend protocol Date: Fri Mar 4 08:54:43 2005 Author: afuchs Index: mcclim/Backends/beagle/package.lisp diff -u mcclim/Backends/beagle/package.lisp:1.1 mcclim/Backends/beagle/package.lisp:1.2 --- mcclim/Backends/beagle/package.lisp:1.1 Sun Jul 11 21:48:16 2004 +++ mcclim/Backends/beagle/package.lisp Fri Mar 4 08:54:42 2005 @@ -43,7 +43,7 @@ #:port-disable-sheet #:port-motion-hints #:port-force-output - #:set-port-keyboard-focus + #:%set-port-keyboard-focus #:set-sheet-pointer-cursor ;; #:port-set-mirror-region

1 0

[mcclim-cvs] CVS update: mcclim/Backends/beagle/events.lisp
by afuchs＠common-lisp.net 04 Mar '05

04 Mar '05

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle In directory common-lisp.net:/tmp/cvs-serv19834 Modified Files: events.lisp Log Message: Commit Tom Winchester's patch to make events.lisp compile with the new backend protocol. Date: Fri Mar 4 08:35:40 2005 Author: afuchs Index: mcclim/Backends/beagle/events.lisp diff -u mcclim/Backends/beagle/events.lisp:1.4 mcclim/Backends/beagle/events.lisp:1.5 --- mcclim/Backends/beagle/events.lisp:1.4 Sat Aug 21 22:51:28 2004 +++ mcclim/Backends/beagle/events.lisp Fri Mar 4 08:35:39 2005 @@ -28,7 +28,7 @@ #|| -$Id: events.lisp,v 1.4 2004/08/21 20:51:28 duncan Exp $ +$Id: events.lisp,v 1.5 2005/03/04 07:35:39 afuchs Exp $ All these are copied pretty much from CLX/port.lisp @@ -334,7 +334,7 @@ (target-sheet (port-lookup-sheet-for-view *beagle-port* target-view))) (unless (null target-sheet) (format *debug-io* "Setting focus in *beagle-port* onto (hopefully correct) sheet: ~S~%" target-sheet) - (set-port-keyboard-focus target-sheet *beagle-port*)))))) + (%set-port-keyboard-focus target-sheet *beagle-port*)))))) ((send (send notification 'name) :is-equal-to-string #@"NSWindowDidExposeNotification") (setf return-event (make-instance 'window-repaint-event :timestamp (incf timestamp) @@ -720,7 +720,7 @@ ;;; Cocoa note: the Frame (NSWindow) must be made key for us to receive events; but they ;;; must then be sent to the Sheet that has focus. -(defmethod set-port-keyboard-focus (focus (port beagle-port)) +(defmethod %set-port-keyboard-focus (focus (port beagle-port) &key timestamp) (let ((mirror (sheet-mirror focus))) (debug-log 2 "events.lisp:set-port-keyboard-focus - got mirror ~S~%" mirror) (when mirror

1 0

[mcclim-cvs] CVS update: mcclim/mcclim.asd
by afuchs＠common-lisp.net 01 Mar '05

01 Mar '05

Update of /project/mcclim/cvsroot/mcclim In directory common-lisp.net:/tmp/cvs-serv28245 Modified Files: mcclim.asd Log Message: without-package-locks is in cmucl's EXTENSIONS package. Date: Tue Mar 1 16:46:14 2005 Author: afuchs Index: mcclim/mcclim.asd diff -u mcclim/mcclim.asd:1.3 mcclim/mcclim.asd:1.4 --- mcclim/mcclim.asd:1.3 Mon Feb 28 17:23:20 2005 +++ mcclim/mcclim.asd Tue Mar 1 16:46:13 2005 @@ -39,8 +39,8 @@ (unless (ignore-errors (ext:search-list "gray-streams:")) (setf (ext:search-list "gray-streams:") '("target:pcl/" "library:subsystems/"))) - (if (fboundp 'without-package-locks) - (without-package-locks + (if (fboundp 'extensions:without-package-locks) + (extensions:without-package-locks (load "gray-streams:gray-streams-library")) (load "gray-streams:gray-streams-library"))) #-clx

1 0