Mercurial > sdl-ios-xcode

comparison src/video/x11/SDL_x11video.c @ 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 c24ba2cc9583 7a602fd2121f
children 1002d074d459
comparison
equal deleted inserted replaced
4764:102675835e08 4862:7b1d35d98294
29 #include "../SDL_sysvideo.h" 29 #include "../SDL_sysvideo.h"
30 #include "../SDL_pixels_c.h" 30 #include "../SDL_pixels_c.h"
31 31
32 #include "SDL_x11video.h" 32 #include "SDL_x11video.h"
33 #include "SDL_x11render.h" 33 #include "SDL_x11render.h"
34 #include "SDL_x11shape.h"
34 35
35 #if SDL_VIDEO_DRIVER_PANDORA 36 #if SDL_VIDEO_DRIVER_PANDORA
36 #include "SDL_x11opengles.h" 37 #include "SDL_x11opengles.h"
37 #endif 38 #endif
38 39
203 device->MinimizeWindow = X11_MinimizeWindow; 204 device->MinimizeWindow = X11_MinimizeWindow;
204 device->RestoreWindow = X11_RestoreWindow; 205 device->RestoreWindow = X11_RestoreWindow;
205 device->SetWindowGrab = X11_SetWindowGrab; 206 device->SetWindowGrab = X11_SetWindowGrab;
206 device->DestroyWindow = X11_DestroyWindow; 207 device->DestroyWindow = X11_DestroyWindow;
207 device->GetWindowWMInfo = X11_GetWindowWMInfo; 208 device->GetWindowWMInfo = X11_GetWindowWMInfo;
209 device->shape_driver.CreateShaper = X11_CreateShaper;
210 device->shape_driver.SetWindowShape = X11_SetWindowShape;
211 device->shape_driver.ResizeWindowShape = X11_ResizeWindowShape;
208 #ifdef SDL_VIDEO_OPENGL_GLX 212 #ifdef SDL_VIDEO_OPENGL_GLX
209 device->GL_LoadLibrary = X11_GL_LoadLibrary; 213 device->GL_LoadLibrary = X11_GL_LoadLibrary;
210 device->GL_GetProcAddress = X11_GL_GetProcAddress; 214 device->GL_GetProcAddress = X11_GL_GetProcAddress;
211 device->GL_UnloadLibrary = X11_GL_UnloadLibrary; 215 device->GL_UnloadLibrary = X11_GL_UnloadLibrary;
212 device->GL_CreateContext = X11_GL_CreateContext; 216 device->GL_CreateContext = X11_GL_CreateContext;