X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fgraphics%2Fcocoa%2Fcocoadisplay.m;h=9c7711e01d2c551323d9d7cb879e27613ed4d67c;hb=ed2ada6539882e02e1054a3394bb62a182bf007b;hp=5b7b064b1969563bbac01977e8b12a8095e4c922;hpb=ad7b7bd9c61fc61e5ae5b8434d0d687b63a755c7;p=libs%2Fgui.git diff --git a/source/graphics/cocoa/cocoadisplay.m b/source/graphics/cocoa/cocoadisplay.m index 5b7b064..9c7711e 100644 --- a/source/graphics/cocoa/cocoadisplay.m +++ b/source/graphics/cocoa/cocoadisplay.m @@ -1,4 +1,5 @@ #import +#import #import #include "cocoadisplay.h" @@ -7,6 +8,7 @@ void convert_event(NSEvent *, CocoaEvent *); struct _CocoaDisplay { NSApplication *app; + NSAutoreleasePool *arp; CFMutableArrayRef event_queue; }; @@ -16,9 +18,11 @@ void free_event(CFAllocatorRef, const void *); CocoaDisplay *create_display() { CocoaDisplay *display = (CocoaDisplay *)malloc(sizeof(CocoaDisplay)); + display->arp = [[NSAutoreleasePool alloc] init]; display->app = [NSApplication sharedApplication]; - // Since OS X 10.6 - //[display->app setActivationPolicy:NSApplicationActivationPolicyRegular]; + // This makes windows appear when run from terminal + if([display->app respondsToSelector:@selector(setActivationPolicy:)]) + [display->app setActivationPolicy:NSApplicationActivationPolicyRegular]; [display->app finishLaunching]; CFArrayCallBacks callbacks; @@ -35,6 +39,7 @@ CocoaDisplay *create_display() void destroy_display(CocoaDisplay *display) { CFRelease(display->event_queue); + [display->arp release]; free(display); } @@ -55,8 +60,10 @@ bool get_event(CocoaDisplay *display, CocoaEvent *buf) NSEvent *event = [display->app nextEventMatchingMask:NSAnyEventMask untilDate:nil inMode:NSDefaultRunLoopMode dequeue:YES]; if(event) { + [event retain]; [display->app sendEvent:event]; convert_event(event, buf); + [event release]; return true; }