Mercurial > sdl-ios-xcode

comparison src/video/cocoa/SDL_cocoavideo.m @ 4862:7b1d35d98294

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged Eli's Google Summer of Code work from SDL-gsoc2010-shaped_windows
author Sam Lantinga <slouken@libsdl.org>
date Sun, 22 Aug 2010 13:45:56 -0700
parents c2ebe3e020c6 5660aac926e9
children 455bc74f7034
comparison
equal deleted inserted replaced
4764:102675835e08 4862:7b1d35d98294
20 slouken@libsdl.org 20 slouken@libsdl.org
21 */ 21 */
22 #include "SDL_config.h" 22 #include "SDL_config.h"
23 23
24 #include "SDL_cocoavideo.h" 24 #include "SDL_cocoavideo.h"
25 #include "SDL_cocoashape.h"
25 #include "SDL_assert.h" 26 #include "SDL_assert.h"
26 27
27 /* Initialization/Query functions */ 28 /* Initialization/Query functions */
28 static int Cocoa_VideoInit(_THIS); 29 static int Cocoa_VideoInit(_THIS);
29 static void Cocoa_VideoQuit(_THIS); 30 static void Cocoa_VideoQuit(_THIS);
90 device->MinimizeWindow = Cocoa_MinimizeWindow; 91 device->MinimizeWindow = Cocoa_MinimizeWindow;
91 device->RestoreWindow = Cocoa_RestoreWindow; 92 device->RestoreWindow = Cocoa_RestoreWindow;
92 device->SetWindowGrab = Cocoa_SetWindowGrab; 93 device->SetWindowGrab = Cocoa_SetWindowGrab;
93 device->DestroyWindow = Cocoa_DestroyWindow; 94 device->DestroyWindow = Cocoa_DestroyWindow;
94 device->GetWindowWMInfo = Cocoa_GetWindowWMInfo; 95 device->GetWindowWMInfo = Cocoa_GetWindowWMInfo;
96
97 device->shape_driver.CreateShaper = Cocoa_CreateShaper;
98 device->shape_driver.SetWindowShape = Cocoa_SetWindowShape;
99 device->shape_driver.ResizeWindowShape = Cocoa_ResizeWindowShape;
100
95 #ifdef SDL_VIDEO_OPENGL_CGL 101 #ifdef SDL_VIDEO_OPENGL_CGL
96 device->GL_LoadLibrary = Cocoa_GL_LoadLibrary; 102 device->GL_LoadLibrary = Cocoa_GL_LoadLibrary;
97 device->GL_GetProcAddress = Cocoa_GL_GetProcAddress; 103 device->GL_GetProcAddress = Cocoa_GL_GetProcAddress;
98 device->GL_UnloadLibrary = Cocoa_GL_UnloadLibrary; 104 device->GL_UnloadLibrary = Cocoa_GL_UnloadLibrary;
99 device->GL_CreateContext = Cocoa_GL_CreateContext; 105 device->GL_CreateContext = Cocoa_GL_CreateContext;