suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ffi/unsafe/obj: add +A' and -A' method modes

Browse Source 
On Cocoa, a view's `drawRect:' method can be called from a
heartbeat thread that animates controls. Such a call happens
rarely for a `canvas%' or other class where `drawRect:'
is overridden, but since it can happen, ensure that the
callback runs on the Racket thread.
This commit is contained in:
Matthew Flatt 2013-04-19 06:00:05 -06:00
parent 3fd9df03f7
commit 57516164de
5 changed files with 27 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
collects/ffi/unsafe/objc.rkt
View File

@ -756,11 +756,14 @@
(or (free-identifier=? #'kind #'+) (or (free-identifier=? #'kind #'+)
(free-identifier=? #'kind #'-) (free-identifier=? #'kind #'-)
(free-identifier=? #'kind #'+a) (free-identifier=? #'kind #'+a)
(free-identifier=? #'kind #'-a)) (free-identifier=? #'kind #'-a)
(free-identifier=? #'kind #'+A)
(free-identifier=? #'kind #'-A))
(let ([id #'id] (let ([id #'id]
[args (syntax->list #'(arg ...))] [args (syntax->list #'(arg ...))]
[in-class? (or (free-identifier=? #'kind #'+) [in-class? (or (free-identifier=? #'kind #'+)
(free-identifier=? #'kind #'+a))]) (free-identifier=? #'kind #'+a)
(free-identifier=? #'kind #'+A))])
(when (null? args) (when (null? args)
(unless (identifier? id) (unless (identifier? id)
(raise-syntax-error #f (raise-syntax-error #f
@ -787,15 +790,19 @@
[_ (error "oops")]) [_ (error "oops")])
'())] '())]
[(async ...) [(async ...)
(if (eq? (syntax-e id) 'dealloc) (if (or (free-identifier=? #'kind #'+A)
;; so that objects can be destroyed in foreign threads: (free-identifier=? #'kind #'-A)
;; so that objects can be destroyed in foreign threads:
(eq? (syntax-e id) 'dealloc))
#'(#:async-apply apply-directly) #'(#:async-apply apply-directly)
#'())] #'())]
[in-cls (if in-class? [in-cls (if in-class?
#'(object-get-class cls) #'(object-get-class cls)
#'cls)] #'cls)]
[atomic? (or (free-identifier=? #'kind #'+a) [atomic? (or (free-identifier=? #'kind #'+a)
(free-identifier=? #'kind #'-a))]) (free-identifier=? #'kind #'-a)
(free-identifier=? #'kind #'+A)
(free-identifier=? #'kind #'-A))])
(quasisyntax/loc stx (quasisyntax/loc stx
(let ([rt result-type] (let ([rt result-type]
[arg-id arg-type] ...) [arg-id arg-type] ...)

8
collects/mred/private/wx/cocoa/canvas.rkt
View File

@ -65,7 +65,7 @@
(define-objc-mixin (RacketViewMixin Superclass) (define-objc-mixin (RacketViewMixin Superclass)
#:mixins (KeyMouseTextResponder CursorDisplayer FocusResponder) #:mixins (KeyMouseTextResponder CursorDisplayer FocusResponder)
[wxb] [wxb]
(-a _void (drawRect: [_NSRect r]) (-A _void (drawRect: [_NSRect r])
(when wxb (when wxb
(let ([wx (->wx wxb)]) (let ([wx (->wx wxb)])
(when wx (when wx
@ -98,7 +98,7 @@
(define-objc-class CornerlessFrameView NSView (define-objc-class CornerlessFrameView NSView
[] []
(-a _void (drawRect: [_NSRect r]) (-A _void (drawRect: [_NSRect r])
(let ([ctx (tell NSGraphicsContext currentContext)]) (let ([ctx (tell NSGraphicsContext currentContext)])
(tellv ctx saveGraphicsState) (tellv ctx saveGraphicsState)
(let ([cg (tell #:type _CGContextRef ctx graphicsPort)] (let ([cg (tell #:type _CGContextRef ctx graphicsPort)]
@ -129,7 +129,7 @@
[on?] [on?]
(-a _void (setFocusState: [_BOOL is-on?]) (-a _void (setFocusState: [_BOOL is-on?])
(set! on? is-on?)) (set! on? is-on?))
(-a _void (drawRect: [_NSRect r]) (-A _void (drawRect: [_NSRect r])
(let ([f (tell #:type _NSRect self frame)]) (let ([f (tell #:type _NSRect self frame)])
(tellv bezel-cell (tellv bezel-cell
drawWithFrame: #:type _NSRect (make-NSRect (make-NSPoint 2 2) drawWithFrame: #:type _NSRect (make-NSRect (make-NSPoint 2 2)
@ -154,7 +154,7 @@
#:mixins (FocusResponder KeyMouseTextResponder CursorDisplayer) #:mixins (FocusResponder KeyMouseTextResponder CursorDisplayer)
#:protocols (NSComboBoxDelegate) #:protocols (NSComboBoxDelegate)
[wxb] [wxb]
(-a _void (drawRect: [_NSRect r]) (-A _void (drawRect: [_NSRect r])
(super-tell #:type _void drawRect: #:type _NSRect r) (super-tell #:type _void drawRect: #:type _NSRect r)
(let ([wx (->wx wxb)]) (let ([wx (->wx wxb)])
(when wx (when wx

2
collects/mred/private/wx/cocoa/panel.rkt
View File

@ -22,7 +22,7 @@
(define-objc-class FrameView NSView (define-objc-class FrameView NSView
[] []
(-a _void (drawRect: [_NSRect r]) (-A _void (drawRect: [_NSRect r])
(let ([ctx (tell NSGraphicsContext currentContext)]) (let ([ctx (tell NSGraphicsContext currentContext)])
(tellv ctx saveGraphicsState) (tellv ctx saveGraphicsState)
(let ([cg (tell #:type _CGContextRef ctx graphicsPort)] (let ([cg (tell #:type _CGContextRef ctx graphicsPort)]

13
collects/scribblings/foreign/objc.scrbl
View File

@ -138,7 +138,7 @@ Defines each @racket[protocol-id] to the protocol (a value with FFI type
(eval:alts (import-protocol NSCoding) (void)) (eval:alts (import-protocol NSCoding) (void))
]} ]}
@defform/subs[#:literals (+ - +a -a) @defform/subs[#:literals (+ - +a -a +A -A)
(define-objc-class class-id superclass-expr (define-objc-class class-id superclass-expr
maybe-mixins maybe-mixins
maybe-protocols maybe-protocols
@ -150,7 +150,7 @@ Defines each @racket[protocol-id] to the protocol (a value with FFI type
(code:line #:protocols (protocol-expr ...))] (code:line #:protocols (protocol-expr ...))]
[method (mode result-ctype-expr (method-id) body ...+) [method (mode result-ctype-expr (method-id) body ...+)
(mode result-ctype-expr (arg ...+) body ...+)] (mode result-ctype-expr (arg ...+) body ...+)]
[mode + - +a -a] [mode + - +a -a +A -A]
[arg (code:line method-id [ctype-expr arg-id])])]{ [arg (code:line method-id [ctype-expr arg-id])])]{
Defines @racket[class-id] as a new, registered Objective-C class (of Defines @racket[class-id] as a new, registered Objective-C class (of
@ -167,12 +167,17 @@ directly when the method @racket[body]s. Outside the object, they can
be referenced and set with @racket[get-ivar] and @racket[set-ivar!]. be referenced and set with @racket[get-ivar] and @racket[set-ivar!].
Each @racket[method] adds or overrides a method to the class (when Each @racket[method] adds or overrides a method to the class (when
@racket[mode] is @racket[-] or @racket[-a]) to be called on instances, @racket[mode] is @racket[-], @racket[-a], or @racket[-A]) to be called on instances,
or it adds a method to the meta-class (when @racket[mode] is or it adds a method to the meta-class (when @racket[mode] is
@racket[+] or @racket[+a]) to be called on the class itself. All @racket[+], @racket[+a], or @racket[+A]) to be called on the class itself. All
result and argument types must be declared using FFI C types result and argument types must be declared using FFI C types
(@seeCtype). When @racket[mode] is @racket[+a] or @racket[-a], the (@seeCtype). When @racket[mode] is @racket[+a] or @racket[-a], the
method is called in atomic mode (see @racket[_cprocedure]). method is called in atomic mode (see @racket[_cprocedure]).
When @racket[mode] is @racket[+A] or @racket[-A], the
method is called in atomic mode, and it may also be triggered
as a result of a foreign call in a foreign thread
thread, in which case the foreign thread must wait until the
call completes in a Racket thread.
If a @racket[method] is declared with a single @racket[method-id] and If a @racket[method] is declared with a single @racket[method-id] and
no arguments, then @racket[method-id] must not end with no arguments, then @racket[method-id] must not end with

1
doc/release-notes/racket/HISTORY.txt
View File

@ -4,6 +4,7 @@ Changed initialization of current-directory to use PWD
racket/system: add a #:set-pwd? argument to system, etc., which racket/system: add a #:set-pwd? argument to system, etc., which
makes them set PWD by default makes them set PWD by default
net/url: add support for HTTP/1.1 connections net/url: add support for HTTP/1.1 connections
ffi/unsafe/objc: add -A and +A method modes
Version 5.3.4.2 Version 5.3.4.2
Added current-environment-variables, environment-variables-ref, Added current-environment-variables, environment-variables-ref,