Skip to content

L
libSDL
Commit 645cd1b2 authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

Fixed Cocoa and OpenGL builds 

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%404441
parent 5392fa23
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 40 deletions
src/video/SDL_renderer_gles.c
View file @ 645cd1b2
...@@ -255,7 +255,7 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags) ...@@ -255,7 +255,7 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags)
renderer->DestroyTexture = GLES_DestroyTexture; renderer->DestroyTexture = GLES_DestroyTexture;
renderer->DestroyRenderer = GLES_DestroyRenderer; renderer->DestroyRenderer = GLES_DestroyRenderer;
renderer->info = GL_ES_RenderDriver.info; renderer->info = GL_ES_RenderDriver.info;
renderer->window = window->id; renderer->window = window;
renderer->driverdata = data; renderer->driverdata = data;
renderer->info.flags = renderer->info.flags =
...@@ -276,12 +276,12 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags) ...@@ -276,12 +276,12 @@ GLES_CreateRenderer(SDL_Window * window, Uint32 flags)
return NULL; return NULL;
} }
data->context = SDL_GL_CreateContext(window->id); data->context = SDL_GL_CreateContext(window);
if (!data->context) { if (!data->context) {
GLES_DestroyRenderer(renderer); GLES_DestroyRenderer(renderer);
return NULL; return NULL;
} }
if (SDL_GL_MakeCurrent(window->id, data->context) < 0) { if (SDL_GL_MakeCurrent(window, data->context) < 0) {
GLES_DestroyRenderer(renderer); GLES_DestroyRenderer(renderer);
return NULL; return NULL;
} }
...@@ -334,7 +334,7 @@ GLES_ActivateRenderer(SDL_Renderer * renderer) ...@@ -334,7 +334,7 @@ GLES_ActivateRenderer(SDL_Renderer * renderer)
GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata; GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
SDL_Window *window = renderer->window; SDL_Window *window = renderer->window;
if (SDL_GL_MakeCurrent(window->id, data->context) < 0) { if (SDL_GL_MakeCurrent(window, data->context) < 0) {
return -1; return -1;
} }
if (data->updateSize) { if (data->updateSize) {
......
src/video/cocoa/SDL_cocoaopengl.m
View file @ 645cd1b2
...@@ -212,7 +212,7 @@ Cocoa_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context) ...@@ -212,7 +212,7 @@ Cocoa_GL_MakeCurrent(_THIS, SDL_Window * window, SDL_GLContext context)
if (window->flags & SDL_WINDOW_FULLSCREEN) { if (window->flags & SDL_WINDOW_FULLSCREEN) {
[nscontext setFullScreen]; [nscontext setFullScreen];
} else { } else {
[nscontext setView:[windowdata->window contentView]]; [nscontext setView:[windowdata->nswindow contentView]];
[nscontext update]; [nscontext update];
} }
[nscontext makeCurrentContext]; [nscontext makeCurrentContext];
......
src/video/cocoa/SDL_cocoawindow.m
View file @ 645cd1b2
...@@ -44,22 +44,22 @@ static __inline__ void ConvertNSRect(NSRect *r) ...@@ -44,22 +44,22 @@ static __inline__ void ConvertNSRect(NSRect *r)
center = [NSNotificationCenter defaultCenter]; center = [NSNotificationCenter defaultCenter];
[_data->window setNextResponder:self]; [_data->nswindow setNextResponder:self];
if ([_data->window delegate] != nil) { if ([_data->nswindow delegate] != nil) {
[center addObserver:self selector:@selector(windowDisExpose:) name:NSWindowDidExposeNotification object:_data->window]; [center addObserver:self selector:@selector(windowDisExpose:) name:NSWindowDidExposeNotification object:_data->nswindow];
[center addObserver:self selector:@selector(windowDidMove:) name:NSWindowDidMoveNotification object:_data->window]; [center addObserver:self selector:@selector(windowDidMove:) name:NSWindowDidMoveNotification object:_data->nswindow];
[center addObserver:self selector:@selector(windowDidResize:) name:NSWindowDidResizeNotification object:_data->window]; [center addObserver:self selector:@selector(windowDidResize:) name:NSWindowDidResizeNotification object:_data->nswindow];
[center addObserver:self selector:@selector(windowDidMiniaturize:) name:NSWindowDidMiniaturizeNotification object:_data->window]; [center addObserver:self selector:@selector(windowDidMiniaturize:) name:NSWindowDidMiniaturizeNotification object:_data->nswindow];
[center addObserver:self selector:@selector(windowDidDeminiaturize:) name:NSWindowDidDeminiaturizeNotification object:_data->window]; [center addObserver:self selector:@selector(windowDidDeminiaturize:) name:NSWindowDidDeminiaturizeNotification object:_data->nswindow];
[center addObserver:self selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object:_data->window]; [center addObserver:self selector:@selector(windowDidBecomeKey:) name:NSWindowDidBecomeKeyNotification object:_data->nswindow];
[center addObserver:self selector:@selector(windowDidResignKey:) name:NSWindowDidResignKeyNotification object:_data->window]; [center addObserver:self selector:@selector(windowDidResignKey:) name:NSWindowDidResignKeyNotification object:_data->nswindow];
} else { } else {
[_data->window setDelegate:self]; [_data->nswindow setDelegate:self];
} }
[center addObserver:self selector:@selector(windowDidHide:) name:NSApplicationDidHideNotification object:NSApp]; [center addObserver:self selector:@selector(windowDidHide:) name:NSApplicationDidHideNotification object:NSApp];
[center addObserver:self selector:@selector(windowDidUnhide:) name:NSApplicationDidUnhideNotification object:NSApp]; [center addObserver:self selector:@selector(windowDidUnhide:) name:NSApplicationDidUnhideNotification object:NSApp];
[_data->window setAcceptsMouseMovedEvents:YES]; [_data->nswindow setAcceptsMouseMovedEvents:YES];
} }
- (void)close - (void)close
...@@ -68,17 +68,17 @@ static __inline__ void ConvertNSRect(NSRect *r) ...@@ -68,17 +68,17 @@ static __inline__ void ConvertNSRect(NSRect *r)
center = [NSNotificationCenter defaultCenter]; center = [NSNotificationCenter defaultCenter];
[_data->window setNextResponder:nil]; [_data->nswindow setNextResponder:nil];
if ([_data->window delegate] != self) { if ([_data->nswindow delegate] != self) {
[center removeObserver:self name:NSWindowDidExposeNotification object:_data->window]; [center removeObserver:self name:NSWindowDidExposeNotification object:_data->nswindow];
[center removeObserver:self name:NSWindowDidMoveNotification object:_data->window]; [center removeObserver:self name:NSWindowDidMoveNotification object:_data->nswindow];
[center removeObserver:self name:NSWindowDidResizeNotification object:_data->window]; [center removeObserver:self name:NSWindowDidResizeNotification object:_data->nswindow];
[center removeObserver:self name:NSWindowDidMiniaturizeNotification object:_data->window]; [center removeObserver:self name:NSWindowDidMiniaturizeNotification object:_data->nswindow];
[center removeObserver:self name:NSWindowDidDeminiaturizeNotification object:_data->window]; [center removeObserver:self name:NSWindowDidDeminiaturizeNotification object:_data->nswindow];
[center removeObserver:self name:NSWindowDidBecomeKeyNotification object:_data->window]; [center removeObserver:self name:NSWindowDidBecomeKeyNotification object:_data->nswindow];
[center removeObserver:self name:NSWindowDidResignKeyNotification object:_data->window]; [center removeObserver:self name:NSWindowDidResignKeyNotification object:_data->nswindow];
} else { } else {
[_data->window setDelegate:nil]; [_data->nswindow setDelegate:nil];
} }
[center removeObserver:self name:NSApplicationDidHideNotification object:NSApp]; [center removeObserver:self name:NSApplicationDidHideNotification object:NSApp];
[center removeObserver:self name:NSApplicationDidUnhideNotification object:NSApp]; [center removeObserver:self name:NSApplicationDidUnhideNotification object:NSApp];
...@@ -98,7 +98,7 @@ static __inline__ void ConvertNSRect(NSRect *r) ...@@ -98,7 +98,7 @@ static __inline__ void ConvertNSRect(NSRect *r)
- (void)windowDidMove:(NSNotification *)aNotification - (void)windowDidMove:(NSNotification *)aNotification
{ {
int x, y; int x, y;
NSRect rect = [_data->window contentRectForFrameRect:[_data->window frame]]; NSRect rect = [_data->nswindow contentRectForFrameRect:[_data->nswindow frame]];
ConvertNSRect(&rect); ConvertNSRect(&rect);
x = (int)rect.origin.x; x = (int)rect.origin.x;
y = (int)rect.origin.y; y = (int)rect.origin.y;
...@@ -108,7 +108,7 @@ static __inline__ void ConvertNSRect(NSRect *r) ...@@ -108,7 +108,7 @@ static __inline__ void ConvertNSRect(NSRect *r)
- (void)windowDidResize:(NSNotification *)aNotification - (void)windowDidResize:(NSNotification *)aNotification
{ {
int w, h; int w, h;
NSRect rect = [_data->window contentRectForFrameRect:[_data->window frame]]; NSRect rect = [_data->nswindow contentRectForFrameRect:[_data->nswindow frame]];
w = (int)rect.size.width; w = (int)rect.size.width;
h = (int)rect.size.height; h = (int)rect.size.height;
SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_RESIZED, w, h); SDL_SendWindowEvent(_data->window, SDL_WINDOWEVENT_RESIZED, w, h);
...@@ -309,7 +309,7 @@ SetupWindowData(_THIS, SDL_Window * window, NSWindow *nswindow, SDL_bool created ...@@ -309,7 +309,7 @@ SetupWindowData(_THIS, SDL_Window * window, NSWindow *nswindow, SDL_bool created
return -1; return -1;
} }
data->window = window; data->window = window;
data->window = nswindow; data->nswindow = nswindow;
data->created = created; data->created = created;
data->display = displaydata->display; data->display = displaydata->display;
data->videodata = videodata; data->videodata = videodata;
...@@ -471,7 +471,7 @@ void ...@@ -471,7 +471,7 @@ void
Cocoa_SetWindowTitle(_THIS, SDL_Window * window) Cocoa_SetWindowTitle(_THIS, SDL_Window * window)
{ {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->window; NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
NSString *string; NSString *string;
if(window->title) { if(window->title) {
...@@ -489,7 +489,7 @@ void ...@@ -489,7 +489,7 @@ void
Cocoa_SetWindowPosition(_THIS, SDL_Window * window) Cocoa_SetWindowPosition(_THIS, SDL_Window * window)
{ {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->window; NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
SDL_VideoDisplay *display = window->display; SDL_VideoDisplay *display = window->display;
NSRect rect; NSRect rect;
SDL_Rect bounds; SDL_Rect bounds;
...@@ -519,7 +519,7 @@ void ...@@ -519,7 +519,7 @@ void
Cocoa_SetWindowSize(_THIS, SDL_Window * window) Cocoa_SetWindowSize(_THIS, SDL_Window * window)
{ {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->window; NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
NSSize size; NSSize size;
size.width = window->w; size.width = window->w;
...@@ -532,7 +532,7 @@ void ...@@ -532,7 +532,7 @@ void
Cocoa_ShowWindow(_THIS, SDL_Window * window) Cocoa_ShowWindow(_THIS, SDL_Window * window)
{ {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->window; NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
if (![nswindow isMiniaturized]) { if (![nswindow isMiniaturized]) {
[nswindow makeKeyAndOrderFront:nil]; [nswindow makeKeyAndOrderFront:nil];
...@@ -544,7 +544,7 @@ void ...@@ -544,7 +544,7 @@ void
Cocoa_HideWindow(_THIS, SDL_Window * window) Cocoa_HideWindow(_THIS, SDL_Window * window)
{ {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->window; NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
[nswindow orderOut:nil]; [nswindow orderOut:nil];
[pool release]; [pool release];
...@@ -554,7 +554,7 @@ void ...@@ -554,7 +554,7 @@ void
Cocoa_RaiseWindow(_THIS, SDL_Window * window) Cocoa_RaiseWindow(_THIS, SDL_Window * window)
{ {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->window; NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
[nswindow makeKeyAndOrderFront:nil]; [nswindow makeKeyAndOrderFront:nil];
[pool release]; [pool release];
...@@ -564,7 +564,7 @@ void ...@@ -564,7 +564,7 @@ void
Cocoa_MaximizeWindow(_THIS, SDL_Window * window) Cocoa_MaximizeWindow(_THIS, SDL_Window * window)
{ {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->window; NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
[nswindow zoom:nil]; [nswindow zoom:nil];
[pool release]; [pool release];
...@@ -574,7 +574,7 @@ void ...@@ -574,7 +574,7 @@ void
Cocoa_MinimizeWindow(_THIS, SDL_Window * window) Cocoa_MinimizeWindow(_THIS, SDL_Window * window)
{ {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->window; NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
[nswindow miniaturize:nil]; [nswindow miniaturize:nil];
[pool release]; [pool release];
...@@ -584,7 +584,7 @@ void ...@@ -584,7 +584,7 @@ void
Cocoa_RestoreWindow(_THIS, SDL_Window * window) Cocoa_RestoreWindow(_THIS, SDL_Window * window)
{ {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->window; NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
if ([nswindow isMiniaturized]) { if ([nswindow isMiniaturized]) {
[nswindow deminiaturize:nil]; [nswindow deminiaturize:nil];
...@@ -615,7 +615,7 @@ Cocoa_DestroyWindow(_THIS, SDL_Window * window) ...@@ -615,7 +615,7 @@ Cocoa_DestroyWindow(_THIS, SDL_Window * window)
[data->listener close]; [data->listener close];
[data->listener release]; [data->listener release];
if (data->created) { if (data->created) {
[data->window close]; [data->nswindow close];
} }
SDL_free(data); SDL_free(data);
} }
...@@ -625,7 +625,7 @@ Cocoa_DestroyWindow(_THIS, SDL_Window * window) ...@@ -625,7 +625,7 @@ Cocoa_DestroyWindow(_THIS, SDL_Window * window)
SDL_bool SDL_bool
Cocoa_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info) Cocoa_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
{ {
NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->window; NSWindow *nswindow = ((SDL_WindowData *) window->driverdata)->nswindow;
if (info->version.major <= SDL_MAJOR_VERSION) { if (info->version.major <= SDL_MAJOR_VERSION) {
//info->window = nswindow; //info->window = nswindow;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment