steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cocoa ui compile fixes

db4
Joe Groff 2008-12-08 21:00:47 -08:00
parent 50887f0cfe
commit 02e961ac77
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/cocoa/views/views.factor
View File

@ -55,10 +55,8 @@ PRIVATE>
: with-multisample ( quot -- ) : with-multisample ( quot -- )
t +multisample+ pick with-variable ; inline t +multisample+ pick with-variable ; inline
: <PixelFormat> ( attributes -- pixelfmt ) : <PixelFormat> ( attributes -- pixelfmt )
NSOpenGLPixelFormat -> alloc [ NSOpenGLPixelFormat -> alloc swap [
% %
NSOpenGLPFAWindow , NSOpenGLPFAWindow ,
NSOpenGLPFADoubleBuffer , NSOpenGLPFADoubleBuffer ,

14
basis/ui/cocoa/cocoa.factor
View File

@ -6,7 +6,7 @@ cocoa.runtime cocoa.subclassing cocoa.pasteboard cocoa.types
cocoa.windows cocoa.classes cocoa.application sequences system cocoa.windows cocoa.classes cocoa.application sequences system
ui ui.backend ui.clipboards ui.gadgets ui.gadgets.worlds ui ui.backend ui.clipboards ui.gadgets ui.gadgets.worlds
ui.cocoa.views core-foundation threads math.geometry.rect fry ui.cocoa.views core-foundation threads math.geometry.rect fry
libc generalizations ; libc generalizations alien.c-types cocoa.views combinators ;
IN: ui.cocoa IN: ui.cocoa
TUPLE: handle ; TUPLE: handle ;
@ -16,8 +16,8 @@ TUPLE: offscreen-handle < handle context buffer ;
C: <window-handle> window-handle C: <window-handle> window-handle
C: <offscreen-handle> offscreen-handle C: <offscreen-handle> offscreen-handle
M: offscreen-handle window>> f ; M: offscreen-handle window>> drop f ;
M: offscreen-handle view>> f ; M: offscreen-handle view>> drop f ;
SINGLETON: cocoa-ui-backend SINGLETON: cocoa-ui-backend
@ -101,13 +101,13 @@ M: cocoa-ui-backend raise-window* ( world -- )
: offscreen-buffer ( world pixel-format -- alien w h pitch ) : offscreen-buffer ( world pixel-format -- alien w h pitch )
[ dim>> first2 ] [ pixel-size ] bi* [ dim>> first2 ] [ pixel-size ] bi*
{ [ * * malloc ] [ 2drop ] [ drop nip ] [ nip * ] } cleave ; { [ * * malloc ] [ 2drop ] [ drop nip ] [ nip * ] } 3cleave ;
: gadget-offscreen-context ( world -- context buffer ) : gadget-offscreen-context ( world -- context buffer )
{ NSOpenGLPFAOffscreen } <PixelFormat> { NSOpenGLPFAOffScreen } <PixelFormat>
[ NSOpenGLContext -> alloc swap f -> initWithFormat:shareContext: ] [ NSOpenGLContext -> alloc swap f -> initWithFormat:shareContext: dup ]
[ offscreen-buffer ] bi [ offscreen-buffer ] bi
4 npick [ setOffScreen:width:height:rowbytes: ] dip ; 4 npick [ -> setOffScreen:width:height:rowbytes: ] dip ;
M: cocoa-ui-backend (open-offscreen-buffer) ( world -- ) M: cocoa-ui-backend (open-offscreen-buffer) ( world -- )
dup gadget-offscreen-context <offscreen-handle> >>handle drop ; dup gadget-offscreen-context <offscreen-handle> >>handle drop ;