Commit 0a4085a048ab896ea834bc72090b0545dd1c7fda
2016-05-21T12:09:23
Mac: Fix a crash when SDL is compiled with SDL_MAC_NO_SANDBOX enabled, by increasing the stack size of the mouse tap thread back to OS X' default of 512 KB.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
diff --git a/src/video/cocoa/SDL_cocoaclipboard.m b/src/video/cocoa/SDL_cocoaclipboard.m
index f97dd28..fd86809 100644
--- a/src/video/cocoa/SDL_cocoaclipboard.m
+++ b/src/video/cocoa/SDL_cocoaclipboard.m
@@ -50,7 +50,7 @@ Cocoa_GetClipboardText(_THIS)
char *text;
pasteboard = [NSPasteboard generalPasteboard];
- available = [pasteboard availableTypeFromArray: [NSArray arrayWithObject:format]];
+ available = [pasteboard availableTypeFromArray:[NSArray arrayWithObject:format]];
if ([available isEqualToString:format]) {
NSString* string;
const char *utf8;
diff --git a/src/video/cocoa/SDL_cocoakeyboard.m b/src/video/cocoa/SDL_cocoakeyboard.m
index 8c6f177..520aac1 100644
--- a/src/video/cocoa/SDL_cocoakeyboard.m
+++ b/src/video/cocoa/SDL_cocoakeyboard.m
@@ -94,7 +94,7 @@
- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange;
{
- if ([aString isKindOfClass: [NSAttributedString class]]) {
+ if ([aString isKindOfClass:[NSAttributedString class]]) {
aString = [aString string];
}
@@ -142,10 +142,10 @@
aRange.location, aRange.length, windowHeight,
NSStringFromRect(rect));
- if ([[self window] respondsToSelector:@selector(convertRectToScreen:)]) {
- rect = [[self window] convertRectToScreen:rect];
+ if ([window respondsToSelector:@selector(convertRectToScreen:)]) {
+ rect = [window convertRectToScreen:rect];
} else {
- rect.origin = [[self window] convertBaseToScreen:rect.origin];
+ rect.origin = [window convertBaseToScreen:rect.origin];
}
return rect;
diff --git a/src/video/cocoa/SDL_cocoamousetap.m b/src/video/cocoa/SDL_cocoamousetap.m
index 2075e2c..48abbca 100644
--- a/src/video/cocoa/SDL_cocoamousetap.m
+++ b/src/video/cocoa/SDL_cocoamousetap.m
@@ -202,7 +202,7 @@ Cocoa_InitMouseEventTap(SDL_MouseData* driverdata)
tapdata->runloopStartedSemaphore = SDL_CreateSemaphore(0);
if (tapdata->runloopStartedSemaphore) {
- tapdata->thread = SDL_CreateThreadInternal(&Cocoa_MouseTapThread, "Event Tap Loop", 64 * 1024, tapdata);
+ tapdata->thread = SDL_CreateThreadInternal(&Cocoa_MouseTapThread, "Event Tap Loop", 512 * 1024, tapdata);
if (!tapdata->thread) {
SDL_DestroySemaphore(tapdata->runloopStartedSemaphore);
}