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

[mcclim-cvs] CVS update: mcclim/Backends/beagle/native-panes/beagle-slider-pane.lisp mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp
by drose＠common-lisp.net 12 Jun '05

12 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/native-panes In directory common-lisp.net:/tmp/cvs-serv22111/beagle/native-panes Modified Files: beagle-scroll-bar-pane.lisp Added Files: beagle-slider-pane.lisp Log Message: Added native slider pane. Updated README with list of panes that need native equivalents, and whether these are provided yet or not. Date: Sun Jun 12 15:27:42 2005 Author: drose Index: mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp diff -u mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp:1.5 mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp:1.6 --- mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp:1.5 Fri Jun 10 20:01:56 2005 +++ mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp Sun Jun 12 15:27:42 2005 @@ -1,6 +1,14 @@ (in-package :beagle) +;;; Limitations: +;;; +;;; - ignores different NSControl sizes +;;; - inherits from the 'standard' scroll-bar-pane, rather than from the abstract +;;; scroll bar + +;;; Inheriting from 'scroll-bar' will probably work if we use the :default-initargs +;;; hackery out of gadgets.lisp (but shouldn't these be part of the abstract type?) ;;;(defclass beagle-scroll-bar-pane (scroll-bar) (defclass beagle-scroll-bar-pane (scroll-bar-pane) @@ -107,7 +115,7 @@ :knob-proportion (coerce loz-size 'short-float)))) -(defun action-handler (pane sender) +(defun scroll-bar-action-handler (pane sender) ;; Now we need to decide exactly what we do with these events... not sure ;; if this is the right way to invoke the callbacks... shouldn't

1 0

[mcclim-cvs] CVS update: mcclim/Backends/beagle/native/lisp-slider.lisp mcclim/Backends/beagle/native/lisp-scroller.lisp
by drose＠common-lisp.net 12 Jun '05

12 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/native In directory common-lisp.net:/tmp/cvs-serv22111/beagle/native Modified Files: lisp-scroller.lisp Added Files: lisp-slider.lisp Log Message: Added native slider pane. Updated README with list of panes that need native equivalents, and whether these are provided yet or not. Date: Sun Jun 12 15:27:41 2005 Author: drose Index: mcclim/Backends/beagle/native/lisp-scroller.lisp diff -u mcclim/Backends/beagle/native/lisp-scroller.lisp:1.2 mcclim/Backends/beagle/native/lisp-scroller.lisp:1.3 --- mcclim/Backends/beagle/native/lisp-scroller.lisp:1.2 Fri Jun 10 20:01:52 2005 +++ mcclim/Backends/beagle/native/lisp-scroller.lisp Sun Jun 12 15:27:40 2005 @@ -41,16 +41,5 @@ ;;; (we set the scrollbar up as its own action 'target'). It just calls ;;; back into Lisp [BEAGLE-SCROLL-BAR-PANE] to handle things. (define-objc-method ((:void :take-scroller-action (:id sender)) lisp-scroller) - (action-handler (view-lisp-scroller self) sender)) + (scroll-bar-action-handler (view-lisp-scroller self) sender)) - -;;; Need to get scroll wheel events handled... not sure quite how though. -(define-objc-method ((:void :scroll-wheel event) lisp-scroller) - ;; Do what? Should pass them on to either the parent of the scroller - ;; (scroll-pane?), or onto the viewport. Can it be guaranteed that - ;; there will *be* a viewport? Should send this to the next object in - ;; the responder chain, but that (parent) view appears not to be - ;; interested in scroll wheel events. Bah. - #+nil - (format *trace-output* "Received scroll-wheel event~%") - ) \ No newline at end of file

1 0

[mcclim-cvs] CVS update: mcclim/Backends/beagle/README.txt mcclim/Backends/beagle/beagle-backend.asd
by drose＠common-lisp.net 12 Jun '05

12 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle In directory common-lisp.net:/tmp/cvs-serv22111/beagle Modified Files: README.txt beagle-backend.asd Log Message: Added native slider pane. Updated README with list of panes that need native equivalents, and whether these are provided yet or not. Date: Sun Jun 12 15:27:40 2005 Author: drose Index: mcclim/Backends/beagle/README.txt diff -u mcclim/Backends/beagle/README.txt:1.16 mcclim/Backends/beagle/README.txt:1.17 --- mcclim/Backends/beagle/README.txt:1.16 Fri Jun 10 20:01:47 2005 +++ mcclim/Backends/beagle/README.txt Sun Jun 12 15:27:39 2005 @@ -8,6 +8,7 @@ . frame manager . multiple ports . KNOWN LIMITATIONS / TODO LIST + . NATIVE PANES . FIXED STUFF PREVIOUSLY ON THE KNOWN LIMITATIONS / TODO LIST . WISH LIST . APPLICATIONS @@ -178,6 +179,61 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +NATIVE PANES + +The following panes have native equivalents... + + +From the spec.:- + + Spec. name McCLIM class Cocoa equiv Impl? + ------------------------------------------------------------------------- + BASIC-PANE BASIC-PANE + HBOX-PANE HBOX-PANE + VBOX-PANE VBOX-PANE + HRACK-PANE HRACK-PANE + VRACK-PANE VRACK-PANE + TABLE-PANE TABLE-PANE NSTableView [ ] + GRID-PANE GRID-PANE + SPACING-PANE SPACING-PANE + OUTLINED-PANE OUTLINED-PANE NSBox [ ] + BORDER-PANE + RAISED-PANE + LOWERED-PANE + RESTRAINING-PANE RESTRAINING-PANE + BBOARD-PANE BBOARD-PANE + VIEWPORT-PANE + LABEL-PANE LABEL-PANE NSBox [ ] + SCROLLER-PANE SCROLLER-PANE NSScrollView [ ] + CLIM-STREAM-PANE CLIM-STREAM-PANE + INTERACTOR-PANE INTERACTOR-PANE + APPLICATION-PANE APPLICATION-PANE + COMMAND-MENU-PANE COMMAND-MENU-PANE + TITLE-PANE TITLE-PANE + POINTER-DOCUMENTATION-PANE POINTER-DOCUMENTATION-PANE + + PUSH-BUTTON-PANE (g) PUSH-BUTTON-PANE NSButton [ ] + TOGGLE-BUTTON-PANE (g) TOGGLE-BUTTON-PANE NSButton [ ] + MENU-BUTTON-PANE (g) MENU-BUTTON-PANE NSMenuItem [ ] + SCROLL-BAR-PANE (g) SCROLL-BAR-PANE NSScroller [x] + SLIDER-PANE (g) SLIDER-PANE NSSlider [x] + RADIO-BOX-PANE (g) RADIO-BOX-PANE NSButton [ ] + CHECK-BOX-PANE (g) CHECK-BOX-PANE NSButton [ ] + GENERIC-LIST-PANE (g) GENERIC-LIST-PANE + GENERIC-OPTION-PANE (g) GENERIC-OPTION-PANE NSComboBox [ ] + TEXT-FIELD-PANE (g) TEXT-FIELD-PANE NSTextField [ ] + TEXT-EDITOR-PANE (g) TEXT-EDITOR-PANE NSTextView [ ] + + +McCLIM extensions:- + + McCLIM class + ------------ + BOX-ADJUSTER-GADGET NSSplitView [ ] + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + 1. Speed! The current implementation is __slow__, especially when there is a large output history. Paolo's stress test takes 26 seconds and conses 16MB on my (admittedly slow) iMac compared to 1.5 seconds on a 2.4GHz @@ -218,10 +274,6 @@ with faith and it should work anyway. -3. There are not yet any aqua look and feel panes. Sorry, I'm trying to - get everything else working first! - - 7. Keyboard events are not handled "properly" as far as any OS X user will be concerned; only the ASCII characters are recognised, along with simple modifiers. It's enough to enter commands and edit the command via @@ -277,6 +329,9 @@ those events are 'trapped' in the queue until other events take place. Looking at the code, I don't think this should happen... (but it does). + NB. (11.JUN.2005) I haven't observed this since the move to 0.14.3 + Hopefully it has been resolved within OpenMCL. + 30. Event handling over 'drop down' menus is strange; after clicking on the menu name, all events appear to be blocked until the mouse button is @@ -296,9 +351,20 @@ done (lozenge size = 1.0), but I can't even deactivate them at this point! + BEAGLE-SCROLL-BAR-PANE should inherit from SCROLL-BAR rather than + SCROLL-BAR-PANE I think. + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% FIXED STUFF PREVIOUSLY ON THE KNOWN LIMITATIONS / TODO LIST + + +-3.- There are not yet any aqua look and feel panes. Sorry, I'm trying to + get everything else working first! + + UPDATE 11.JUN.2005 - I have implemented (90+%) native scroll bars, and + am looking at implementing other native panes over + time. These will be added over time. -4.- Pixmap support is not implemented; this means clim-fig drawing doesn't Index: mcclim/Backends/beagle/beagle-backend.asd diff -u mcclim/Backends/beagle/beagle-backend.asd:1.5 mcclim/Backends/beagle/beagle-backend.asd:1.6 --- mcclim/Backends/beagle/beagle-backend.asd:1.5 Mon Jun 6 19:49:21 2005 +++ mcclim/Backends/beagle/beagle-backend.asd Sun Jun 12 15:27:39 2005 @@ -1,6 +1,6 @@ ;; -*- Mode: Lisp; -*- -;; $Id: beagle-backend.asd,v 1.5 2005/06/06 17:49:21 drose Exp $ +;; $Id: beagle-backend.asd,v 1.6 2005/06/12 13:27:39 drose Exp $ (defpackage "BEAGLE" (:use "CLIM" "CLIM-LISP") @@ -98,6 +98,7 @@ (:file "lisp-view" :depends-on ("lisp-bezier-path")) (:file "lisp-view-additional" :depends-on ("lisp-view")) (:file "lisp-scroller") + (:file "lisp-slider") (:file "lisp-image"))) (:file "cocoa-util") (:module "Windowing" @@ -112,6 +113,7 @@ :pathname #.(make-pathname :directory '(:relative "native-panes")) :components ((:file "beagle-scroll-bar-pane") + (:file "beagle-slider-pane") (:file "scroller-pane-fix"))) (:module "Output" :depends-on ("Windowing")

1 0

[mcclim-cvs] CVS update: mcclim/Backends/beagle/native-panes/.cvsignore mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp mcclim/Backends/beagle/native-panes/scroller-pane-fix.lisp
by drose＠common-lisp.net 10 Jun '05

10 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/native-panes In directory common-lisp.net:/tmp/cvs-serv26538/beagle/native-panes Modified Files: beagle-scroll-bar-pane.lisp scroller-pane-fix.lisp Added Files: .cvsignore Log Message: Some tidying of native scroll bar (NSScroller) code; added .cvsignore and updated README with current OpenMCL version used (0.14.3) and what's left to do with NSScroller. Date: Fri Jun 10 20:01:56 2005 Author: drose Index: mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp diff -u mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp:1.4 mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp:1.5 --- mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp:1.4 Fri Jun 10 00:42:32 2005 +++ mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp Fri Jun 10 20:01:56 2005 @@ -14,27 +14,22 @@ (defmethod realize-mirror ((port beagle-port) (sheet beagle-scroll-bar-pane)) - ;; How do we construct one of these puppies so it looks right, is the - ;; correct orientation, etc.? Cocoa docs are a little lacking in this - ;; regard. - ;; Orientation is defined by the longer relative dimension; if - ;; maxx-minx > maxy - miny, we will get a :horizontal bar; otherwise - ;; we get a vertical bar. - ;; Use 'init with frame'? + ;; Orientation is defined by the longer relative dimension in + ;; Cocoa; if maxx-minx > maxy - miny, we will get a :horizontal + ;; bar; otherwise we get a :vertical bar. + (let* ((q (compose-space sheet)) (rect (ccl::make-ns-rect 0.0 0.0 (space-requirement-width q) (space-requirement-height q))) - (mirror (make-instance 'lisp-scroller :with-frame rect)) - ;; Not sure if this is sufficient... - #+nil - (action-mask (logior #$NSLeftMouseDown - #$NSScrollWheel))) + (mirror (make-instance 'lisp-scroller :with-frame rect))) (send mirror 'retain) + ;; Scrollers are disabled by default; enable it (otherwise the ;; lozenge and buttons are not displayed). (send mirror :set-enabled #$YES) + ;; Make knob fill pane initially. (send mirror :set-float-value 0.0 :knob-proportion 1.0) (setf (toolkit-object sheet) mirror) @@ -47,24 +42,8 @@ ;; generates the actions). Not sure if this is a good architectural ;; decision or not... (send mirror :set-target mirror) - -;;; Don't need to do the following... these are the defaults for -;;; NSScroller anyway. - -;;; ;; Also need to specify when an action is sent (i.e. which actions -;;; ;; result in an action being posted) -;;; (send mirror :send-action-on action-mask) -;;; (send mirror :send-action-on #$NSScrollWheelMask) -;;; ;; We want continuous actions when we can get them... -;;; (send mirror :set-continuous #$YES) - (send mirror :set-action (ccl::@selector "takeScrollerAction:")) - ;; We ignore event masks etc. altogether; most things we would be - ;; interested in are handled as actions, and any other event we - ;; take any notice of, we're interested in (scroll wheel events). -;;; (setf (view-event-mask mirror) +ignores-events+) - (port-register-mirror (port sheet) sheet mirror) (%beagle-mirror->sheet-assoc port mirror sheet) (send (sheet-mirror (sheet-parent sheet)) :add-subview mirror) @@ -148,34 +127,23 @@ (let ((value (* (send sender 'float-value) ; 0.0 - 1.0 (- (gadget-max-value pane) ; range; 0.0 -> max extent ... (gadget-min-value pane))))) ; ... (probably) - - #+nil - (format *trace-output* "Action was NSScrollerKnob/Slot, value = ~a~%" value) (clim:drag-callback pane (gadget-client pane) (gadget-id pane) value))) ((eq hit-part #$NSScrollerDecrementLine) - #+nil - (format *trace-output* "Action was NSScrollerDecrementLine~%") (clim:scroll-up-line-callback pane (gadget-client pane) (gadget-id pane))) ((eq hit-part #$NSScrollerDecrementPage) - #+nil - (format *trace-output* "Action was NSScrollerDecrementPage~%") (clim:scroll-up-page-callback pane (gadget-client pane) (gadget-id pane))) ((eq hit-part #$NSScrollerIncrementLine) - #+nil - (format *trace-output* "Action was NSScrollerIncrementLine~%") (clim:scroll-down-line-callback pane (gadget-client pane) (gadget-id pane))) ((eq hit-part #$NSScrollerIncrementPage) - #+nil - (format *trace-output* "Action was NSScrollerIncrementPage~%") (clim:scroll-down-page-callback pane (gadget-client pane) (gadget-id pane)))))) Index: mcclim/Backends/beagle/native-panes/scroller-pane-fix.lisp diff -u mcclim/Backends/beagle/native-panes/scroller-pane-fix.lisp:1.1 mcclim/Backends/beagle/native-panes/scroller-pane-fix.lisp:1.2 --- mcclim/Backends/beagle/native-panes/scroller-pane-fix.lisp:1.1 Mon Jun 6 19:49:19 2005 +++ mcclim/Backends/beagle/native-panes/scroller-pane-fix.lisp Fri Jun 10 20:01:56 2005 @@ -1,9 +1,11 @@ (in-package :clim-internals) + (setf *scrollbar-thickness* (ccl::send (ccl::@class ns:ns-scroller) :scroller-width-for-control-size #$NSRegularControlSize)) + ;;; Should the side of the scroller-pane that the vertical scrollbar ;;; appears be configurable?

1 0

[mcclim-cvs] CVS update: mcclim/Backends/beagle/native/lisp-scroller.lisp
by drose＠common-lisp.net 10 Jun '05

10 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/native In directory common-lisp.net:/tmp/cvs-serv26538/beagle/native Modified Files: lisp-scroller.lisp Log Message: Some tidying of native scroll bar (NSScroller) code; added .cvsignore and updated README with current OpenMCL version used (0.14.3) and what's left to do with NSScroller. Date: Fri Jun 10 20:01:52 2005 Author: drose Index: mcclim/Backends/beagle/native/lisp-scroller.lisp diff -u mcclim/Backends/beagle/native/lisp-scroller.lisp:1.1 mcclim/Backends/beagle/native/lisp-scroller.lisp:1.2 --- mcclim/Backends/beagle/native/lisp-scroller.lisp:1.1 Fri Jun 10 00:42:31 2005 +++ mcclim/Backends/beagle/native/lisp-scroller.lisp Fri Jun 10 20:01:52 2005 @@ -37,22 +37,20 @@ (:metaclass ns:+ns-object)) -;;; See if this makes a difference... it doesn't. -#+nil -(define-objc-method ((:<BOOL> is-flipped) lisp-view) - #$YES) - ;;; This method is the 'recipient' of any actions sent by the scrollbar ;;; (we set the scrollbar up as its own action 'target'). It just calls ;;; back into Lisp [BEAGLE-SCROLL-BAR-PANE] to handle things. (define-objc-method ((:void :take-scroller-action (:id sender)) lisp-scroller) (action-handler (view-lisp-scroller self) sender)) + ;;; Need to get scroll wheel events handled... not sure quite how though. (define-objc-method ((:void :scroll-wheel event) lisp-scroller) ;; Do what? Should pass them on to either the parent of the scroller ;; (scroll-pane?), or onto the viewport. Can it be guaranteed that - ;; there will *be* a viewport? + ;; there will *be* a viewport? Should send this to the next object in + ;; the responder chain, but that (parent) view appears not to be + ;; interested in scroll wheel events. Bah. #+nil (format *trace-output* "Received scroll-wheel event~%") )

1 0

[mcclim-cvs] CVS update: mcclim/Backends/beagle/README.txt
by drose＠common-lisp.net 10 Jun '05

10 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle In directory common-lisp.net:/tmp/cvs-serv26538/beagle Modified Files: README.txt Log Message: Some tidying of native scroll bar (NSScroller) code; added .cvsignore and updated README with current OpenMCL version used (0.14.3) and what's left to do with NSScroller. Date: Fri Jun 10 20:01:50 2005 Author: drose Index: mcclim/Backends/beagle/README.txt diff -u mcclim/Backends/beagle/README.txt:1.15 mcclim/Backends/beagle/README.txt:1.16 --- mcclim/Backends/beagle/README.txt:1.15 Thu Jun 9 00:19:04 2005 +++ mcclim/Backends/beagle/README.txt Fri Jun 10 20:01:47 2005 @@ -35,7 +35,7 @@ INSTALLATION -The code has been written using OpenMCL Version (Beta: Darwin) 0.14.2-p1 and +The code has been written using OpenMCL Version (Beta: Darwin) 0.14.3 and up-to-date McCLIM sources (since both are available within the same CVS module, it should be safe to assume the back end will work with whatever McCLIM sources were checked out at the same time). Hopefully newer versions @@ -284,6 +284,17 @@ processed (but then it's too late, the menu is gone). Note that this is *nothing* to do with tracking pointer, which appears not to be used in drop down menus (only popup menus, which work, more or less). + + (This is also a problem for context menus, if you keep the right button + depressed (menu isn't drawn)) + + +31. Using the scroll wheel over (aqua) scroll panes doesn't work (but does + when used over the appropriate viewport). + + Also, I'd like to hide the scrollbar when there's no scrolling to be + done (lozenge size = 1.0), but I can't even deactivate them at this + point! %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

1 0

[mcclim-cvs] CVS update: mcclim/Experimental/freetype/freetype-fonts.lisp
by crhodes＠common-lisp.net 10 Jun '05

10 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Experimental/freetype In directory common-lisp.net:/tmp/cvs-serv10311 Modified Files: freetype-fonts.lisp Log Message: The text style contains (:bold :italic), not :bold-italic. Fix the alist. Date: Fri Jun 10 15:58:32 2005 Author: crhodes Index: mcclim/Experimental/freetype/freetype-fonts.lisp diff -u mcclim/Experimental/freetype/freetype-fonts.lisp:1.3 mcclim/Experimental/freetype/freetype-fonts.lisp:1.4 --- mcclim/Experimental/freetype/freetype-fonts.lisp:1.3 Sun Jun 5 22:50:29 2005 +++ mcclim/Experimental/freetype/freetype-fonts.lisp Fri Jun 10 15:58:31 2005 @@ -259,18 +259,18 @@ (defparameter *families/faces* '(((:fix :roman) . "VeraMono.ttf") ((:fix :italic) . "VeraMoIt.ttf") - ((:fix :bold-italic) . "VeraMoBI.ttf") - ((:fix :italic-bold) . "VeraMoBI.ttf") + ((:fix (:bold italic)) . "VeraMoBI.ttf") + ((:fix (:italic bold)) . "VeraMoBI.ttf") ((:fix :bold) . "VeraMoBd.ttf") ((:serif :roman) . "VeraSe.ttf") ((:serif :italic) . "VeraSe.ttf") - ((:serif :bold-italic) . "VeraSeBd.ttf") - ((:serif :italic-bold) . "VeraSeBd.ttf") + ((:serif (:bold italic)) . "VeraSeBd.ttf") + ((:serif (:italic bold)) . "VeraSeBd.ttf") ((:serif :bold) . "VeraSeBd.ttf") ((:sans-serif :roman) . "Vera.ttf") ((:sans-serif :italic) . "VeraIt.ttf") - ((:sans-serif :bold-italic) . "VeraBI.ttf") - ((:sans-serif :italic-bold) . "VeraBI.ttf") + ((:sans-serif (:bold italic)) . "VeraBI.ttf") + ((:sans-serif (:italic bold)) . "VeraBI.ttf") ((:sans-serif :bold) . "VeraBd.ttf"))) (defvar *freetype-font-path*)

1 0

[mcclim-cvs] CVS update: mcclim/Backends/beagle/native/lisp-scroller.lisp
by drose＠common-lisp.net 09 Jun '05

09 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/native In directory common-lisp.net:/tmp/cvs-serv4648/beagle/native Added Files: lisp-scroller.lisp Log Message: Add NSScroller subclass (lisp-scroller) which I forgot to add previously; remove some native scroll bar set-up that was performed implicitly by Cocoa anyway. Date: Fri Jun 10 00:42:32 2005 Author: drose

1 0

[mcclim-cvs] CVS update: mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp
by drose＠common-lisp.net 09 Jun '05

09 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/native-panes In directory common-lisp.net:/tmp/cvs-serv4648/beagle/native-panes Modified Files: beagle-scroll-bar-pane.lisp Log Message: Add NSScroller subclass (lisp-scroller) which I forgot to add previously; remove some native scroll bar set-up that was performed implicitly by Cocoa anyway. Date: Fri Jun 10 00:42:32 2005 Author: drose Index: mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp diff -u mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp:1.3 mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp:1.4 --- mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp:1.3 Thu Jun 9 01:20:15 2005 +++ mcclim/Backends/beagle/native-panes/beagle-scroll-bar-pane.lisp Fri Jun 10 00:42:32 2005 @@ -47,15 +47,24 @@ ;; generates the actions). Not sure if this is a good architectural ;; decision or not... (send mirror :set-target mirror) - ;; Also need to specify when an action is sent (i.e. which actions - ;; result in an action being posted) + +;;; Don't need to do the following... these are the defaults for +;;; NSScroller anyway. + +;;; ;; Also need to specify when an action is sent (i.e. which actions +;;; ;; result in an action being posted) ;;; (send mirror :send-action-on action-mask) - (send mirror :send-action-on #$NSScrollWheelMask) - ;; We want continuous actions when we can get them... - (send mirror :set-continuous #$YES) +;;; (send mirror :send-action-on #$NSScrollWheelMask) +;;; ;; We want continuous actions when we can get them... +;;; (send mirror :set-continuous #$YES) + (send mirror :set-action (ccl::@selector "takeScrollerAction:")) - (setf (view-event-mask mirror) +ignores-events+) + ;; We ignore event masks etc. altogether; most things we would be + ;; interested in are handled as actions, and any other event we + ;; take any notice of, we're interested in (scroll wheel events). +;;; (setf (view-event-mask mirror) +ignores-events+) + (port-register-mirror (port sheet) sheet mirror) (%beagle-mirror->sheet-assoc port mirror sheet) (send (sheet-mirror (sheet-parent sheet)) :add-subview mirror) @@ -118,6 +127,7 @@ :set-float-value (coerce position 'short-float) :knob-proportion (coerce loz-size 'short-float)))) + (defun action-handler (pane sender) ;; Now we need to decide exactly what we do with these events... not sure @@ -132,18 +142,19 @@ ;; which wouldn't suprise me... perhaps it's reasonable that 'up line' and ;; 'decrement line' are the same thing. - (let ((hit-part (send sender 'hit-part)) - (value (* (send sender 'float-value) ; 0.0 - 1.0 - (- (gadget-max-value pane) ; range of bar; 0.0 -> max extent ... - (gadget-min-value pane))))); ... (probably) + (let ((hit-part (send sender 'hit-part))) (cond ((or (eq hit-part #$NSScrollerKnob) ; drag knob (eq hit-part #$NSScrollerKnobSlot)) ; click on knob (or alt-click on slot) - #+nil - (format *trace-output* "Action was NSScrollerKnob/Slot, value = ~a~%" value) - (clim:drag-callback pane - (gadget-client pane) - (gadget-id pane) - value)) + (let ((value (* (send sender 'float-value) ; 0.0 - 1.0 + (- (gadget-max-value pane) ; range; 0.0 -> max extent ... + (gadget-min-value pane))))) ; ... (probably) + + #+nil + (format *trace-output* "Action was NSScrollerKnob/Slot, value = ~a~%" value) + (clim:drag-callback pane + (gadget-client pane) + (gadget-id pane) + value))) ((eq hit-part #$NSScrollerDecrementLine) #+nil (format *trace-output* "Action was NSScrollerDecrementLine~%")

1 0

[mcclim-cvs] CVS update: mcclim/Backends/beagle/native-panes/scroller-pane-fix.lisp
by drose＠common-lisp.net 08 Jun '05

08 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/native-panes In directory common-lisp.net:/tmp/cvs-serv15500/beagle/native-panes Added Files: scroller-pane-fix.lisp Log Message: Add hack to make vertical scroll bars swap sides in scroller-pane sheets - looks more Cocoa-ey. Should conditionalize this so it's only used when frame-manager is beagle-aqua-frame-manager. Date: Mon Jun 6 19:49:20 2005 Author: drose

3 2