Mercurial > sdl-ios-xcode
changeset 4791:e07cd9e86d7a
Make sure we have XShape symbols before we allow a shaped window.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Tue, 13 Jul 2010 02:26:50 -0400 |
| parents | f0b0bdc07916 |
| children | aece2b6fb985 |
| files | src/video/x11/SDL_x11shape.c |
| diffstat | 1 files changed, 12 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/src/video/x11/SDL_x11shape.c Tue Jul 13 02:12:14 2010 -0400 +++ b/src/video/x11/SDL_x11shape.c Tue Jul 13 02:26:50 2010 -0400 @@ -27,14 +27,18 @@ #include "SDL_x11video.h" SDL_WindowShaper* X11_CreateShaper(SDL_Window* window) { - SDL_WindowShaper* result = malloc(sizeof(SDL_WindowShaper)); - result->window = window; - result->alphacutoff = 0; - result->usershownflag = 0; - result->driverdata = malloc(sizeof(SDL_ShapeData)); - window->shaper = result; - int resized_properly = X11_ResizeWindowShape(window); - assert(resized_properly == 0); + SDL_WindowShaper* result = NULL; + if (SDL_X11_HAVE_XSHAPE) { /* Make sure X server supports it. */ + result = malloc(sizeof(SDL_WindowShaper)); + result->window = window; + result->alphacutoff = 0; + result->usershownflag = 0; + result->driverdata = malloc(sizeof(SDL_ShapeData)); + window->shaper = result; + int resized_properly = X11_ResizeWindowShape(window); + assert(resized_properly == 0); + } + return result; }