mcclim-cvs

mcclim-cvs@common-lisp.net

1697 discussions

[mcclim-cvs] CVS mcclim/Tests
by varkesteijn 23 Mar '06

23 Mar '06

Update of /project/mcclim/cvsroot/mcclim/Tests In directory clnet:/tmp/cvs-serv2336/Tests Modified Files: commands.lisp Log Message: * fix remove-command-from-command-table * add relevant test --- /project/mcclim/cvsroot/mcclim/Tests/commands.lisp 2005/09/30 16:02:33 1.2 +++ /project/mcclim/cvsroot/mcclim/Tests/commands.lisp 2006/03/23 17:03:40 1.3 @@ -41,3 +41,12 @@ (lookup-keystroke-command-item gesture 'menu-test-table))))) 'menu-test-table) (assert (= count 1))) + +(define-command-table removal-test-table) +(add-command-to-command-table 'com-test-command 'removal-test-table) +(remove-command-from-command-table 'com-test-command 'removal-test-table) +(assert (handler-case + (remove-command-from-command-table 'com-test-command + 'removal-test-table) + (command-not-present () t) + (:no-error (x) (declare (ignore x)) nil)))

1 0

[mcclim-cvs] CVS mcclim
by varkesteijn 23 Mar '06

23 Mar '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv2336 Modified Files: commands.lisp Log Message: * fix remove-command-from-command-table * add relevant test --- /project/mcclim/cvsroot/mcclim/commands.lisp 2006/03/20 08:15:26 1.60 +++ /project/mcclim/cvsroot/mcclim/commands.lisp 2006/03/23 17:03:38 1.61 @@ -198,11 +198,11 @@ (when (typep item 'menu-item) (remove-menu-item-from-command-table table (command-menu-item-name item) - :errorp nil) - - (when (command-item-name item) - (remhash (command-item-name item) (command-line-names table))) - (remhash command-name (commands table))))))) + :errorp nil)) + + (when (command-item-name item) + (remhash (command-item-name item) (command-line-names table))) + (remhash command-name (commands table)))))) (defun add-command-to-command-table (command-name command-table

1 0

[mcclim-cvs] CVS mcclim
by varkesteijn 23 Mar '06

23 Mar '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv32694 Modified Files: mcclim.asd Log Message: * mcclim.asd (defsystem :clim-system): include a few more of the examples. (patch by Douglas Crosher, mcclim-devel, 'Patch: clim-example system definition', 16 March 2006) --- /project/mcclim/cvsroot/mcclim/mcclim.asd 2006/03/23 15:27:23 1.13 +++ /project/mcclim/cvsroot/mcclim/mcclim.asd 2006/03/23 16:59:47 1.14 @@ -286,16 +286,24 @@ :components ((:file "calculator") (:file "colorslider") + (:file "menutest") ; extra (:file "address-book") (:file "traffic-lights") (:file "clim-fig") (:file "postscript-test") + (:file "puzzle") + (:file "transformations-test") + (:file "demodemo") (:file "stream-test") (:file "presentation-test") + (:file "dragndrop") #+clx (:file "gadget-test") (:file "accepting-values") (:file "method-browser") - (:file "dragndrop-translator"))))) + (:file "dragndrop-translator"))) + (:module "Goatee" + :components + ((:file "goatee-test"))))) ;;; This won't load in SBCL, either. I have really crappy code to ;;; extract dependency information from :serial t ASDF systems, but

1 0

[mcclim-cvs] CVS mcclim
by tmoore 23 Mar '06

23 Mar '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv32705 Modified Files: TODO Log Message: update --- /project/mcclim/cvsroot/mcclim/TODO 2004/07/23 12:36:44 1.11 +++ /project/mcclim/cvsroot/mcclim/TODO 2006/03/23 16:59:18 1.12 @@ -14,19 +14,12 @@ General designs need more work, particularly the support of compositing. - A compound output recording record structure based on R trees or - another spatial data structure is needed. - make-design-from-output-record (setf* pointer-position) - drag-output-record, dragging-output - More spiffy presentation accept and present methods - define-drag-and-drop-translator - with-input-editor-typeout read-only extents in Goatee @@ -39,12 +32,10 @@ display-command-table-menu, menu-choose-command-from-table - raise-frame, bury-frame, notify-user + notify-user :accept-values panes - frame-drag-and-drop-feedback, frame-drag-and-drop-highlighting - display-command-menu restraining-pane @@ -70,6 +61,19 @@ each pane to decide when it wants the input focus. ====================== Resolved issues ====================== +TBM:20060323:175700 + A compound output recording record structure based on R trees or + another spatial data structure is needed. [Implemented by + Christophe Rhodes and Andreas Fuchs]. + + drag-output-record, dragging-output + + define-drag-and-drop-translator + + raise-frame, bury-frame + + frame-drag-and-drop-feedback, frame-drag-and-drop-highlighting + TBM:20040524:100000 command-enable

1 0

[mcclim-cvs] CVS mcclim
by tmoore 23 Mar '06

23 Mar '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv31048 Modified Files: INSTALL Log Message: Typo --- /project/mcclim/cvsroot/mcclim/INSTALL 2006/03/23 16:37:54 1.7 +++ /project/mcclim/cvsroot/mcclim/INSTALL 2006/03/23 16:44:58 1.8 @@ -93,7 +93,7 @@ functional-geometry - Frank Buss' and Rainer Joswig's functional - geometry explorer, implmented on top of clim-listener: + geometry explorer, implemented on top of clim-listener: (load "Apps/Functional-Geometry/functional-geometry.asd") (asdf:oos 'asdf:load :functional-geometry)

1 0

[mcclim-cvs] CVS mcclim
by tmoore 23 Mar '06

23 Mar '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv30838 Modified Files: INSTALL Removed Files: INSTALL.ASDF INSTALL.CLISP INSTALL.CMU INSTALL.OPENMCL INSTALL.SBCL Log Message: Updated instructions to refer only to asdf method --- /project/mcclim/cvsroot/mcclim/INSTALL 2003/11/19 13:51:17 1.6 +++ /project/mcclim/cvsroot/mcclim/INSTALL 2006/03/23 16:37:54 1.7 @@ -1,64 +1,148 @@ -Install instructions for Franz Allegro Common Lisp --------------------------------------------------- +Prerequisites: +============== -1. Start Lisp +ASDF - The ASDF system definition facility. Many implementations come +with it and (require :asdf) is all that is needed. If yours doesn't, +see http://www.cliki.net/asdf. -2. Load the system definition file: - (load "system") -3. Compile and load the system: +Installing McCLIM using mcclim.asd +================================== - (compile-system :clim) - (compile-system :clim-clx) - (compile-system :clim-examples) +To tell ASDF about the wherabouts of McCLIM and to compile it for the +first time, perform these steps: -4. Load the compiled system: + 1. Symlink mcclim.asd to a directory in your + asdf:*central-registry* list. E.g., for SBCL, that would be: - (load-system :clim) - (load-system :clim-clx) - (load-system :clim-examples) + $ 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-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. + + 3. You need to install the spatial-trees library (available at + http://cliki.net/spatial-trees). The preferred method for that is + via asdf-install. see http://cliki.net/asdf-install for an + introduction to that method. + + 4. On your Lisp's REPL (with ASDF loaded), type + + (asdf:oos 'asdf:load-op :mcclim) + ; compilation messages should zip past + +After step 4, McCLIM and the CLX backend should be loaded and +you are good to go. + +When you restart your lisp image, you will need to perform step 4 to +load McCLIM again. + +Installing mcclim.asd if you were using ASDF & system.lisp before +================================================================= + +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. + +After replacing the symlinks, follow the "Installing McCLIM..." +section above, beginning at step 1 - the symlink mcclim.asd itself is +required, too. + +Writing a system that depends on McCLIM +======================================= + +In an ASDF system that depends on a loaded CLIM, use the following +code to declare a dependency on McCLIM: + +(defsystem :your-clim-using-system + :depends-on (:mcclim #| other dependencies |#) + :components (#| components |#) + ) + +The dependency on the McCLIM system will also load a suitable display +backend on implementations where it can determine one. Running the demos ------------------ +================= + +McCLIM comes with some interesting demo programs and applications: + + address-book - The classic CLIM demo: + + (asdf:oos 'asdf:load :clim-examples) + (in-package :clim-demo) + (run-frame-top-level (make-application-frame 'address-book) + + The Examples directory includes other demo programs that might be + of interest. Many of these are quite old and were written before + large parts of the CLIM specification were implemented; for good + examples of CLIM style it is best to look elsewhere. + + + clim-listener - a Lisp 'listener' or top-level loop with many + goodies for examining directories, CLOS classes, etc. Printed + results are mouse-sensitive and in supported implementations + (currently OpenMCL) can be used directly as arguments in Lisp expressions: + + (asdf:oos 'asdf:load :clim-listener) + (clim-listener:run-listener) + + + functional-geometry - Frank Buss' and Rainer Joswig's functional + geometry explorer, implmented on top of clim-listener: + + (load "Apps/Functional-Geometry/functional-geometry.asd") + (asdf:oos 'asdf:load :functional-geometry) + (functional-geometry::run-functional-geometry) + + +Installation Notes for Implementations +====================================== + +Notes about bugs or gotchas in specific Common Lisp implementations +appear in the release notes found in the ReleaseNotes directory. + +Franz Allegro Common Lisp +========================= + +McCLIM has been tested with the ANSI Common Lisp image alisp. It +doesn't currently work in with "modern Lisp" but support is on the way. + -1. Run the calculator demo +OpenMCL +======= - (clim-demo::calculator) +McCLIM has been tested with openmcl-1.0. It is recommended that you +download CLX from ftp://clozure.com/pub/CLX. - This demo is self-explanatory. - - when you get tired of it, hit ^C in the Lisp listener. +An experimental Cocoa backend for McCLIM, called Beagle, is included +in Backends/beagle. -2. Run the menu demo - (menutest::menutest) +CLISP +===== - This demo is self-explanatory. - - when you get tired of it, hit ^C in the Lisp listener. +1. Get clisp-20041218 or newer. Build it with option --with-module=clx/mit-clx. -3. Run the slider demo +2. Get a copy of the ASDF package. Compile it: + $ clisp -c $ASDF/asdf.lisp - (clim-demo::colorslider) +3. Start + $ clisp -K full -i $ASDF/asdf.fas - You should see three sliders on the left and a color area on the right. - Use the three sliders to adjust RGB values to obtain a color. +and continue as above. - when you get tired of it, hit ^C in the Lisp listener. -4. A some of the demos should be run using the function clim-demo::run-test: - (clim-demo::run-test 'clim-demo::address-book) - (clim-demo::run-test 'goatee::goatee-test) - [N.B.: This advice is mostly obsolete. The usual way to start a - CLIM application is with e.g., - (run-frame-top-level (make-application-frame 'clim-demo::address-book) - Any problems that result should be reported as bugs.] +CMUCL +===== -Note: +McCLIM has been tested with version 19.c. - Before running any McCLIM application, it may be necessary for you - to enable host based access to the X server. This can be - accomplished by executing the following command at a shell prompt: +SBCL +==== - xhost localhost +McCLIM has been tested with version 0.9.8 and later.

1 0

[mcclim-cvs] CVS mcclim/Backends/beagle/input
by tmoore 23 Mar '06

23 Mar '06

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/input In directory clnet:/tmp/cvs-serv22888/Backends/beagle/input Modified Files: events.lisp Log Message: Changes to get Beagle running with current sources. Various demos 'run' (tested address-book, clim-listener, functional-geometry) but many things aren't working (scroll bars). --- /project/mcclim/cvsroot/mcclim/Backends/beagle/input/events.lisp 2005/06/16 09:27:50 1.9 +++ /project/mcclim/cvsroot/mcclim/Backends/beagle/input/events.lisp 2006/03/23 15:27:24 1.10 @@ -28,7 +28,7 @@ #|| -$Id: events.lisp,v 1.9 2005/06/16 09:27:50 crhodes Exp $ +$Id: events.lisp,v 1.10 2006/03/23 15:27:24 tmoore Exp $ Events in Cocoa --------------- @@ -747,14 +747,6 @@ ;; Need to make use of the Cocoa method for getting modifier state - this is independent of events ;; pretty much (i.e. pointer documentation pane changes depending what modifier keys are pressed ;; prior to a mouse click etc.) ::FIXME:: -(defmethod pointer-modifier-state ((pointer beagle-pointer)) - ;; (multiple-value-bind (x y same-screen-p child mask) - ;; (xlib:query-pointer (clx-port-window (port pointer))) - ;; (declare (ignore x y same-screen-p child)) - ;; (x-event-state-modifiers (port pointer) mask))) - (warn "pointer-modifier-state: implement me") - nil) - ;; Again, make use of Cocoa methods for querying the pointer position. See above ::FIXME:: (defmethod pointer-position ((pointer beagle-pointer)) @@ -763,12 +755,6 @@ (warn "pointer-position: implement me") nil) - -;; Ditto previous two methods... -(defmethod pointer-button-state ((pointer beagle-pointer)) - (warn "pointer-button-state: implement me") - nil) - ;;; Is PORT-POINTER-SHEET also needed? See STREAM-POINTER-POSITION in ;;; STREAM-INPUT.LISP

1 0

[mcclim-cvs] CVS mcclim/Backends/beagle/output
by tmoore 23 Mar '06

23 Mar '06

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/output In directory clnet:/tmp/cvs-serv22888/Backends/beagle/output Modified Files: fonts.lisp Log Message: Changes to get Beagle running with current sources. Various demos 'run' (tested address-book, clim-listener, functional-geometry) but many things aren't working (scroll bars). --- /project/mcclim/cvsroot/mcclim/Backends/beagle/output/fonts.lisp 2005/05/18 20:21:57 1.2 +++ /project/mcclim/cvsroot/mcclim/Backends/beagle/output/fonts.lisp 2006/03/23 15:27:24 1.3 @@ -200,71 +200,104 @@ ;;; All mediums and output sheets must implement a method for this generic function. -(defmethod text-size ((medium beagle-medium) string &key text-style (start 0) end) - (declare (special *default-text-style*)) - - ;; Method can be passed either a string or a char; make sure for the latter - ;; that we see only strings. - (when (characterp string) - (setf string (string string))) - - ;; Make sure there's an 'end' specified - (unless end - (setf end (length string))) - - ;; Make sure there's a text-style - (unless text-style - (setf text-style (medium-text-style medium))) +;;; Helper that doesn't handle newline +;;; XXX text-size and text-bounding-rectangle* are both broken because the +;;; Cocoa NSString function :size-with-attributes is quite buggy. Text +;;; rendering should be rewritten to use glyphs or ATSUI (a pleasant task I'm +;;; sure). -- moore + +(defun text-size-aux (medium string font start end) + ;; See if there's a better way to do this; is this stack allocation? + (let ((objc-str (%make-nsstring (subseq string start end)))) + (slet ((bsize (send objc-str :size-with-attributes + (reuse-attribute-dictionary medium font)))) + (let* ((descender (abs (send font 'descender))) + (fragment-width (pref bsize :<NSS>ize.width)) + (fragment-height (pref bsize :<NSS>ize.height)) + (fragment-baseline (- fragment-height descender))) + (send objc-str 'release) + (values fragment-width fragment-height descender fragment-baseline))))) + +(defmethod text-size ((medium beagle-medium) (s character) + &key (text-style (medium-text-style medium)) + (start 0) + (end 1)) + (text-size medium (string s) :text-style text-style :start start :end end)) + +(defmethod text-size ((medium beagle-medium) (string string) + &key (text-style (medium-text-style medium)) + (start 0) + ( end (length string))) + (declare (special *default-text-style*)) ;; Check for 'empty string' case - (if (>= start end) - (values 0 0 0 0 0) - (let ((position-newline (position #\newline string :start start)) - ;; See if there's a better way to do this; is this stack - ;; allocation? - (objc-str (%make-nsstring (subseq string start end))) - (font (%text-style->beagle-font (or text-style - *default-text-style*)))) - (slet ((bsize (send objc-str :size-with-attributes - (reuse-attribute-dictionary medium font)))) - ;; Don't use 'text-style-descent' in the following, since that - ;; method is defined in terms of this one :-) - (let* ((descender (abs (send font 'descender))) - (fragment-width (pref bsize :<NSS>ize.width)) - (fragment-height (pref bsize :<NSS>ize.height)) - (fragment-x (pref bsize :<NSS>ize.width)) - ;; subtract line height from this later... - (fragment-y (pref bsize :<NSS>ize.height)) - ;; baseline = height - descender - (fragment-baseline (- fragment-height descender))) - (send objc-str 'release) - (if (null position-newline) - (values fragment-width - fragment-height - fragment-x - (- fragment-y fragment-height) - fragment-baseline) - (progn - (multiple-value-bind (w h x y b) - (text-size medium string :text-style text-style - :start position-newline - :end end) - ;; Current width, or width of sub-fragment, whichever - ;; is larger - (let ((largest-width (max fragment-width w)) - ;; current height + height of sub-fragment - (current+fragment-height (+ fragment-height h)) - ;; new y position; one line height smaller than the - ;; total height - (y-position (- (+ fragment-y y) fragment-height)) - ;; baseline of string; total height - baseline size, where - ;; baseline 'size' is (line-height - baseline). - (baseline (- (+ fragment-height h) (- h b)))) - (values largest-width - current+fragment-height - x ; always use last x calculated... - y-position - baseline)))))))))) + (when (>= start end) + ;; XXX is 0 value for the baseline correct? + (return-from text-size (values 0 0 0 0 0))) + (let ((position-newline (position #\newline string :start start :end end)) + (font (%text-style->beagle-font (or text-style *default-text-style*)))) + (multiple-value-bind + (fragment-width fragment-height descender fragment-baseline) + (text-size-aux medium string font start (or position-newline end)) + (declare (ignore descender)) + (unless position-newline + (return-from text-size + (values fragment-width fragment-height fragment-width 0 + fragment-baseline))) + (multiple-value-bind (w h x y b) + (text-size medium string :text-style text-style + :start (1+ position-newline) + :end end) + ;; Current width, or width of sub-fragment, whichever is larger + (let ((largest-width (max fragment-width w)) + ;; current height + height of sub-fragment + (current+fragment-height (+ fragment-height h)) + ;; new y position; one line height smaller than the total height + (y-position y) + ;; baseline of string; total height - baseline size, where + ;; baseline 'size' is (line-height - baseline). + (Baseline (- (+ fragment-height h) (- h b)))) + (values largest-width + current+fragment-height + x ; always use last x calculated... + y-position + baseline)))))) + +(defmethod climi::text-bounding-rectangle* + ((medium beagle-medium) (s character) + &key (text-style (medium-text-style medium)) + (start 0) + (end 1)) + (climi::text-bounding-rectangle* medium (string s) + :text-style text-style :start start :end end)) + +(defmethod climi::text-bounding-rectangle* + ((medium beagle-medium) (s string) + &key (text-style (medium-text-style medium)) + (start 0) + (end 1)) + (declare (special *default-text-style*)) + ;; Check for 'empty string' case + (when (>= start end) + (return-from climi::text-bounding-rectangle* (values 0 0 0 0))) + (let ((font (%text-style->beagle-font (or text-style *default-text-style*))) + (height 0) + (width 0) + (baseline nil)) + (loop + for line-start = start then (1+ line-end) + for line-end = (position #\newline s :start line-start :end end) + do (multiple-value-bind + (fragment-width fragment-height descender fragment-baseline) + (text-size-aux medium s font line-start (or line-end end)) + (declare (ignore descender)) + (incf height fragment-height) + (setq width (max width fragment-width)) + (unless baseline + (setq baseline fragment-baseline))) + while line-end) + (values 0 (- baseline) width (- height baseline)))) + ;;; Note: we DO NOT want to draw the fonts in the medium-foreground colour - we want

1 0

[mcclim-cvs] CVS mcclim
by tmoore 23 Mar '06

23 Mar '06

Update of /project/mcclim/cvsroot/mcclim In directory clnet:/tmp/cvs-serv22888 Modified Files: mcclim.asd Log Message: Changes to get Beagle running with current sources. Various demos 'run' (tested address-book, clim-listener, functional-geometry) but many things aren't working (scroll bars). --- /project/mcclim/cvsroot/mcclim/mcclim.asd 2006/03/20 11:01:54 1.12 +++ /project/mcclim/cvsroot/mcclim/mcclim.asd 2006/03/23 15:27:23 1.13 @@ -256,35 +256,6 @@ "Backends/OpenGL/opengl-medium" "Backends/OpenGL/opengl-x-graft") -;;; TODO/asf: I don't have the required macintosh to get :clim-beagle to load. - -(defsystem :clim-objc-support) -(defmethod perform ((op load-op) (c (eql (find-system :clim-objc-support)))) - (require "OBJC-SUPPORT")) - -(clim-defsystem (:clim-beagle :depends-on (:clim :clim-objc-support)) - "Backends/beagle/package" - "Backends/beagle/lisp-window" - "Backends/beagle/lisp-window-delegate" - "Backends/beagle/lisp-view" - "Backends/beagle/lisp-view-additional" - "Backends/beagle/lisp-image" - "Backends/beagle/lisp-unmanaged-view" - "Backends/beagle/cocoa-util" - "Backends/beagle/port" - "Backends/beagle/frame-manager" - "Backends/beagle/medium" - "Backends/beagle/mirror" - "Backends/beagle/events" - "Backends/beagle/graft" - "Backends/beagle/fonts" - "Backends/beagle/image" - "Backends/beagle/keysymdef") - -;;; legacy system that loads :clim-beagle -(defsystem :beagle - :depends-on (:clim-beagle)) - ;;; A system that loads the appropriate backend for the current ;;; platform. (defsystem :clim-looks

1 0

[mcclim-cvs] CVS mcclim/Backends/CLX
by crhodes 23 Mar '06

23 Mar '06

Update of /project/mcclim/cvsroot/mcclim/Backends/CLX In directory clnet:/tmp/cvs-serv27080/Backends/CLX Modified Files: medium.lisp Log Message: Fix for ellipse drawing (from Troels Henriksen) --- /project/mcclim/cvsroot/mcclim/Backends/CLX/medium.lisp 2006/02/17 14:16:39 1.72 +++ /project/mcclim/cvsroot/mcclim/Backends/CLX/medium.lisp 2006/03/23 11:59:00 1.73 @@ -564,7 +564,7 @@ (with-transformed-position ((sheet-native-transformation (medium-sheet medium)) center-x center-y) (let* ((arc-angle (- end-angle start-angle)) - (arc-angle (if (< end-angle 0) + (arc-angle (if (< arc-angle 0) (+ (* pi 2) arc-angle) arc-angle))) (with-clx-graphics (medium) @@ -588,7 +588,7 @@ medium)) center-x center-y) (let* ((arc-angle (- end-angle start-angle)) - (arc-angle (if (< end-angle 0) + (arc-angle (if (< arc-angle 0) (+ (* pi 2) arc-angle) arc-angle)) (min-x (round-coordinate (- center-x radius)))

1 0

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