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

[mcclim-cvs] CVS update: mcclim/Backends/beagle/input/events.lisp
by crhodes＠common-lisp.net 16 Jun '05

16 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/input In directory common-lisp.net:/tmp/cvs-serv5715/Backends/beagle/input Modified Files: events.lisp Log Message: Rearrange pointer class hierarchy a little, according to mail message "pointer protocol class / standard-pointer" mcclim-devel 2005-06-15. Date: Thu Jun 16 11:27:50 2005 Author: crhodes Index: mcclim/Backends/beagle/input/events.lisp diff -u mcclim/Backends/beagle/input/events.lisp:1.8 mcclim/Backends/beagle/input/events.lisp:1.9 --- mcclim/Backends/beagle/input/events.lisp:1.8 Sun Jun 5 21:52:55 2005 +++ mcclim/Backends/beagle/input/events.lisp Thu Jun 16 11:27:50 2005 @@ -28,7 +28,7 @@ #|| -$Id: events.lisp,v 1.8 2005/06/05 19:52:55 drose Exp $ +$Id: events.lisp,v 1.9 2005/06/16 09:27:50 crhodes Exp $ Events in Cocoa --------------- @@ -666,9 +666,8 @@ ;;; This has been added to McCLIM and the CLX back end; I'm not sure what it's supposed ;;; to be for. Never mind, add it anyway. defgeneric is in stream-input.lisp - ;;; SHOULD BE -> (defmethod synthesize-pointer-motion-event ((pointer beagle-pointer)) -(defmethod synthesize-pointer-motion-event (pointer) +(defmethod synthesize-pointer-motion-event ((pointer beagle-pointer)) ;; *-current-event-modifier-state-* is set whenever an event or notification is received ;; containing this information. ;; *-current-pointer-button-state-* is set whenever there is a mouse down or drag, and

1 0

[mcclim-cvs] CVS update: mcclim/Backends/beagle/windowing/port.lisp
by crhodes＠common-lisp.net 16 Jun '05

16 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Backends/beagle/windowing In directory common-lisp.net:/tmp/cvs-serv5715/Backends/beagle/windowing Modified Files: port.lisp Log Message: Rearrange pointer class hierarchy a little, according to mail message "pointer protocol class / standard-pointer" mcclim-devel 2005-06-15. Date: Thu Jun 16 11:27:51 2005 Author: crhodes Index: mcclim/Backends/beagle/windowing/port.lisp diff -u mcclim/Backends/beagle/windowing/port.lisp:1.4 mcclim/Backends/beagle/windowing/port.lisp:1.5 --- mcclim/Backends/beagle/windowing/port.lisp:1.4 Tue May 17 22:26:38 2005 +++ mcclim/Backends/beagle/windowing/port.lisp Thu Jun 16 11:27:51 2005 @@ -38,14 +38,9 @@ ;;; at least a little about pointers, and it appears to all be handled in ;;; the back end at the moment. -(defclass beagle-pointer (pointer) +(defclass beagle-pointer (standard-pointer) ((cursor :accessor pointer-cursor :initform :upper-left))) - -(defclass standard-pointer (beagle-pointer) - ()) - - (defclass beagle-cursor () ((image :accessor cursor-image :initform nil) (hotspot :accessor cursor-hotspot :initform nil))) @@ -117,7 +112,7 @@ (slot-value port 'frame-managers)) (push (make-instance *default-frame-manager* :port port) (slot-value port 'frame-managers))) (setf (slot-value port 'pointer) - (make-instance 'standard-pointer :port port)) + (make-instance 'beagle-pointer :port port)) (setf *beagle-port* port) (initialize-beagle port))

1 0

[mcclim-cvs] CVS update: mcclim/stream-input.lisp
by crhodes＠common-lisp.net 16 Jun '05

16 Jun '05

Update of /project/mcclim/cvsroot/mcclim In directory common-lisp.net:/tmp/cvs-serv5715 Modified Files: stream-input.lisp Log Message: Rearrange pointer class hierarchy a little, according to mail message "pointer protocol class / standard-pointer" mcclim-devel 2005-06-15. Date: Thu Jun 16 11:27:49 2005 Author: crhodes Index: mcclim/stream-input.lisp diff -u mcclim/stream-input.lisp:1.42 mcclim/stream-input.lisp:1.43 --- mcclim/stream-input.lisp:1.42 Tue Feb 22 15:00:11 2005 +++ mcclim/stream-input.lisp Thu Jun 16 11:27:49 2005 @@ -637,6 +637,13 @@ (define-protocol-class pointer () ((port :reader port :initarg :port))) +;;; FIXME: I think the standard-pointer should absorb some of the +;;; common methods that are currently entirely provided by the +;;; backends. + +(defclass standard-pointer (pointer) + ()) + (defgeneric pointer-sheet (pointer)) (defmethod pointer-sheet ((pointer pointer))

1 0

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

16 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Backends/CLX In directory common-lisp.net:/tmp/cvs-serv5715/Backends/CLX Modified Files: port.lisp Log Message: Rearrange pointer class hierarchy a little, according to mail message "pointer protocol class / standard-pointer" mcclim-devel 2005-06-15. Date: Thu Jun 16 11:27:49 2005 Author: crhodes Index: mcclim/Backends/CLX/port.lisp diff -u mcclim/Backends/CLX/port.lisp:1.111 mcclim/Backends/CLX/port.lisp:1.112 --- mcclim/Backends/CLX/port.lisp:1.111 Tue Apr 5 22:09:29 2005 +++ mcclim/Backends/CLX/port.lisp Thu Jun 16 11:27:49 2005 @@ -42,12 +42,9 @@ ;;; CLX-PORT class -(defclass clx-pointer (pointer) +(defclass clx-pointer (standard-pointer) ((cursor :accessor pointer-cursor :initform :upper-left))) -(defclass standard-pointer (clx-pointer) - ()) - #| Perhaps this belongs elsewhere @@ -207,7 +204,7 @@ (declare (ignore args)) (push (make-instance 'clx-frame-manager :port port) (slot-value port 'frame-managers)) (setf (slot-value port 'pointer) - (make-instance 'standard-pointer :port port)) + (make-instance 'clx-pointer :port port)) (initialize-clx port)) (defmethod print-object ((object clx-port) stream)

1 0

[mcclim-cvs] CVS update: mcclim/Apps/Inspector/package.lisp mcclim/Apps/Inspector/INSTALL mcclim/Apps/Inspector/clouseau.asd
by crhodes＠common-lisp.net 15 Jun '05

15 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Apps/Inspector In directory common-lisp.net:/tmp/cvs-serv13195 Modified Files: INSTALL clouseau.asd Added Files: package.lisp Log Message: Make clouseau.asd loadable without McCLIM. Date: Wed Jun 15 11:04:43 2005 Author: crhodes Index: mcclim/Apps/Inspector/INSTALL diff -u mcclim/Apps/Inspector/INSTALL:1.4 mcclim/Apps/Inspector/INSTALL:1.5 --- mcclim/Apps/Inspector/INSTALL:1.4 Tue Feb 8 23:23:12 2005 +++ mcclim/Apps/Inspector/INSTALL Wed Jun 15 11:04:43 2005 @@ -1,8 +1,7 @@ Quick start =========== -1. Start your Lisp system and make sure you have ASDF and McCLIM in - your core file. +1. Start your Lisp system and make sure you have ASDF loaded. 2. (asdf:operate 'asdf:load-op :clouseau) Index: mcclim/Apps/Inspector/clouseau.asd diff -u mcclim/Apps/Inspector/clouseau.asd:1.5 mcclim/Apps/Inspector/clouseau.asd:1.6 --- mcclim/Apps/Inspector/clouseau.asd:1.5 Wed Mar 9 23:25:54 2005 +++ mcclim/Apps/Inspector/clouseau.asd Wed Jun 15 11:04:43 2005 @@ -20,17 +20,10 @@ ;;; CLIM inspector application -(defpackage :clouseau - (:use :clim-lisp :clim) - (:export #:inspector - #:inspect-object - #:inspect-object-briefly - #:define-inspector-command - #:inspector-table - #:inspector-table-row)) - (asdf:defsystem clouseau + :depends-on (:mcclim) :serial t :components - ((:file "disassembly") - (:file "inspector"))) \ No newline at end of file + ((:file "package") + (:file "disassembly") + (:file "inspector")))

1 0

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

15 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Experimental/freetype In directory common-lisp.net:/tmp/cvs-serv17684 Modified Files: freetype-fonts.lisp Log Message: Add a little caching to make-vague-font and make-concrete-font; this seems to fix the fd leake in make-concrete-font which eventually results in an unchecked error return code from Freetype and a NULL pointer deref the next time we call into Freetype. Date: Wed Jun 15 03:34:06 2005 Author: bmastenbrook Index: mcclim/Experimental/freetype/freetype-fonts.lisp diff -u mcclim/Experimental/freetype/freetype-fonts.lisp:1.5 mcclim/Experimental/freetype/freetype-fonts.lisp:1.6 --- mcclim/Experimental/freetype/freetype-fonts.lisp:1.5 Tue Jun 14 02:07:56 2005 +++ mcclim/Experimental/freetype/freetype-fonts.lisp Wed Jun 15 03:34:06 2005 @@ -35,30 +35,43 @@ ((lib :initarg :lib) (filename :initarg :filename))) +(defparameter *vague-font-hash* (make-hash-table :test #'equal)) + (defun make-vague-font (filename) - (make-instance 'vague-font - :lib (let ((libf (make-alien freetype:library))) - (declare (type (alien (* freetype:library)) libf)) - (freetype:init-free-type libf) - (deref libf)) - :filename filename)) + (let ((val (gethash filename *vague-font-hash*))) + (or val + (setf (gethash filename *vague-font-hash*) + (make-instance 'vague-font + :lib (let ((libf (make-alien freetype:library))) + (declare (type (alien (* freetype:library)) libf)) + (freetype:init-free-type libf) + (deref libf)) + :filename filename))))) (defparameter *dpi* 72) +(defparameter *concrete-font-hash* (make-hash-table :test #'equal)) + (defun make-concrete-font (vague-font size &key (dpi *dpi*)) (with-slots (lib filename) vague-font - (let ((facef (make-alien freetype:face))) - (declare (type (alien (* freetype:face)) facef)) - (freetype:new-face lib filename 0 facef) - (let ((face (deref facef))) - (declare (type (alien freetype:face) face)) - (freetype:set-char-size face 0 (round (* size 64)) (round dpi) (round dpi)) - face)))) + (let* ((key (cons lib filename)) + (val (gethash key *concrete-font-hash*))) + (unless val + (let ((facef (make-alien freetype:face))) + (declare (type (alien (* freetype:face)) facef)) + (if (zerop (freetype:new-face lib filename 0 facef)) + (setf val (setf (gethash key *concrete-font-hash*) + (deref facef))) + (error "Freetype error in make-concrete-font")))) + (let ((face val)) + (declare (type (alien freetype:face) face)) + (freetype:set-char-size face 0 (round (* size 64)) (round dpi) (round dpi)) + face)))) (declaim (inline make-concrete-font)) (defun glyph-pixarray (face char) - (declare (optimize (speed 3) (safety 3) (debug 1)) + (declare (optimize (speed 3) (debug 1)) (inline freetype:load-glyph freetype:render-glyph) (type (alien freetype:face) face)) (freetype:load-glyph face (freetype:get-char-index face (char-code char)) 0)

1 0

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

14 Jun '05

Update of /project/mcclim/cvsroot/mcclim/Experimental/freetype In directory common-lisp.net:/tmp/cvs-serv22084 Modified Files: freetype-fonts.lisp Log Message: Add keywords to the fonts -> filenames table Date: Tue Jun 14 02:07:56 2005 Author: bmastenbrook Index: mcclim/Experimental/freetype/freetype-fonts.lisp diff -u mcclim/Experimental/freetype/freetype-fonts.lisp:1.4 mcclim/Experimental/freetype/freetype-fonts.lisp:1.5 --- mcclim/Experimental/freetype/freetype-fonts.lisp:1.4 Fri Jun 10 15:58:31 2005 +++ mcclim/Experimental/freetype/freetype-fonts.lisp Tue Jun 14 02:07:56 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*) @@ -284,7 +284,7 @@ (cond (size (setf size (getf *sizes* size size)) (let* ((font-path-relative (cdr (assoc (list family face) *families/faces* - :test #'equal))) + :test #'equal))) (font-path (namestring (merge-pathnames font-path-relative *freetype-font-path*)))) (if (and font-path (probe-file font-path)) (make-free-type-face (slot-value port 'clim-clx::display)

1 0

[mcclim-cvs] CVS update: mcclim/Backends/beagle/native-panes/beagle-fundamental-button-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-serv2620/beagle/native-panes Added Files: beagle-fundamental-button-pane.lisp Log Message: Add native button support (only for push buttons). There are several limitations in this code, the most significant of which are:- + inter-control spacing. How to work out what this is supposed to be (assume buttons are next to more buttons for now) + event handling across separate frames - most obvious in DEMODEMO. When one of the demo apps is started from the demodemo panel, every frame involved locks up (demodemo panel waiting for callback to return and apparently consuming all events until this happens). Date: Sun Jun 12 18:53:26 2005 Author: drose

1 0

[mcclim-cvs] CVS update: mcclim/Backends/beagle/native/lisp-button.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-serv2620/beagle/native Added Files: lisp-button.lisp Log Message: Add native button support (only for push buttons). There are several limitations in this code, the most significant of which are:- + inter-control spacing. How to work out what this is supposed to be (assume buttons are next to more buttons for now) + event handling across separate frames - most obvious in DEMODEMO. When one of the demo apps is started from the demodemo panel, every frame involved locks up (demodemo panel waiting for callback to return and apparently consuming all events until this happens). Date: Sun Jun 12 18:53:26 2005 Author: drose

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-serv2620/beagle Modified Files: README.txt beagle-backend.asd Log Message: Add native button support (only for push buttons). There are several limitations in this code, the most significant of which are:- + inter-control spacing. How to work out what this is supposed to be (assume buttons are next to more buttons for now) + event handling across separate frames - most obvious in DEMODEMO. When one of the demo apps is started from the demodemo panel, every frame involved locks up (demodemo panel waiting for callback to return and apparently consuming all events until this happens). Date: Sun Jun 12 18:53:25 2005 Author: drose Index: mcclim/Backends/beagle/README.txt diff -u mcclim/Backends/beagle/README.txt:1.17 mcclim/Backends/beagle/README.txt:1.18 --- mcclim/Backends/beagle/README.txt:1.17 Sun Jun 12 15:27:39 2005 +++ mcclim/Backends/beagle/README.txt Sun Jun 12 18:53:25 2005 @@ -212,13 +212,13 @@ TITLE-PANE TITLE-PANE POINTER-DOCUMENTATION-PANE POINTER-DOCUMENTATION-PANE - PUSH-BUTTON-PANE (g) PUSH-BUTTON-PANE NSButton [ ] + PUSH-BUTTON-PANE (g) PUSH-BUTTON-PANE NSButton [x] (32) 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 [ ] + RADIO-BOX-PANE (g) RADIO-BOX-PANE NSMatrix [ ] + CHECK-BOX-PANE (g) CHECK-BOX-PANE NSMatrix [ ] GENERIC-LIST-PANE (g) GENERIC-LIST-PANE GENERIC-OPTION-PANE (g) GENERIC-OPTION-PANE NSComboBox [ ] TEXT-FIELD-PANE (g) TEXT-FIELD-PANE NSTextField [ ] @@ -341,7 +341,9 @@ 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)) + depressed (menu isn't drawn)) [yes, it is - no problem with popups that + I can see now, other than whilst the button is held down the events + aren't routed to them]. 31. Using the scroll wheel over (aqua) scroll panes doesn't work (but does @@ -353,6 +355,16 @@ BEAGLE-SCROLL-BAR-PANE should inherit from SCROLL-BAR rather than SCROLL-BAR-PANE I think. + + +32. Using a button to fire up a new frame is problematical; the callback + for the button doesn't return, so the button never releases focus and + no events are processed. Specific to aqua buttons. + + +33. When a window is closed by the (x) button it should be cleared up + properly; specifically, its event loop etc. should be gced. Appears + at the moment that this isn't happening. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% Index: mcclim/Backends/beagle/beagle-backend.asd diff -u mcclim/Backends/beagle/beagle-backend.asd:1.6 mcclim/Backends/beagle/beagle-backend.asd:1.7 --- mcclim/Backends/beagle/beagle-backend.asd:1.6 Sun Jun 12 15:27:39 2005 +++ mcclim/Backends/beagle/beagle-backend.asd Sun Jun 12 18:53:25 2005 @@ -1,6 +1,6 @@ ;; -*- Mode: Lisp; -*- -;; $Id: beagle-backend.asd,v 1.6 2005/06/12 13:27:39 drose Exp $ +;; $Id: beagle-backend.asd,v 1.7 2005/06/12 16:53:25 drose Exp $ (defpackage "BEAGLE" (:use "CLIM" "CLIM-LISP") @@ -99,6 +99,7 @@ (:file "lisp-view-additional" :depends-on ("lisp-view")) (:file "lisp-scroller") (:file "lisp-slider") + (:file "lisp-button") (:file "lisp-image"))) (:file "cocoa-util") (:module "Windowing" @@ -114,6 +115,10 @@ :components ((:file "beagle-scroll-bar-pane") (:file "beagle-slider-pane") + ;; Basic buttons - not collections of buttons + (:file "beagle-fundamental-button-pane") + ;; Button collections (radio + checkbox) +;; (:file "beagle-button-collection-pane") (:file "scroller-pane-fix"))) (:module "Output" :depends-on ("Windowing")

1 0