From dc87e643870e70f3563d0830c77796a60cfacdce Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Fri, 11 Apr 2008 13:20:03 -0500 Subject: [PATCH] Move function --- extra/core-foundation/core-foundation.factor | 2 -- extra/core-foundation/run-loop/run-loop.factor | 14 +++++++++++--- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/extra/core-foundation/core-foundation.factor b/extra/core-foundation/core-foundation.factor index 5025ab39a7..77ad30ad8f 100644 --- a/extra/core-foundation/core-foundation.factor +++ b/extra/core-foundation/core-foundation.factor @@ -85,5 +85,3 @@ FUNCTION: void CFRelease ( void* cf ) ; ] [ "Cannot load bundled named " prepend throw ] ?if ; - -FUNCTION: CFRunLoopRef CFRunLoopGetMain ( ) ; diff --git a/extra/core-foundation/run-loop/run-loop.factor b/extra/core-foundation/run-loop/run-loop.factor index 7cd148e022..7594766635 100644 --- a/extra/core-foundation/run-loop/run-loop.factor +++ b/extra/core-foundation/run-loop/run-loop.factor @@ -1,7 +1,7 @@ ! Copyright (C) 2008 Slava Pestov ! See http://factorcode.org/license.txt for BSD license. -USING: alien.syntax kernel threads init -cocoa.application core-foundation ; +USING: alien.syntax kernel threads init namespaces alien +core-foundation ; IN: core-foundation.run-loop : kCFRunLoopRunFinished 1 ; inline @@ -11,13 +11,21 @@ IN: core-foundation.run-loop TYPEDEF: void* CFRunLoopRef +FUNCTION: CFRunLoopRef CFRunLoopGetMain ( ) ; + FUNCTION: SInt32 CFRunLoopRunInMode ( CFStringRef mode, CFTimeInterval seconds, Boolean returnAfterSourceHandled ) ; -: CFRunLoopDefaultMode "kCFRunLoopDefaultMode" ; +: CFRunLoopDefaultMode ( -- alien ) + #! Ugly, but we don't have static NSStrings + \ CFRunLoopDefaultMode get-global dup expired? [ + drop + "kCFRunLoopDefaultMode" + dup \ CFRunLoopDefaultMode set-global + ] when ; : run-loop-thread ( -- ) CFRunLoopDefaultMode 0 f CFRunLoopRunInMode