Mercurial > sdl-ios-xcode

comparison src/video/x11/SDL_x11window.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 fad859023468 b6930aefd008
children 50d0bff24d81
comparison
equal deleted inserted replaced
4764:102675835e08 4862:7b1d35d98294
27 #include "../../events/SDL_mouse_c.h" 27 #include "../../events/SDL_mouse_c.h"
28 28
29 #include "SDL_x11video.h" 29 #include "SDL_x11video.h"
30 #include "SDL_x11mouse.h" 30 #include "SDL_x11mouse.h"
31 #include "SDL_x11gamma.h" 31 #include "SDL_x11gamma.h"
32 #include "SDL_x11shape.h"
32 #include "../Xext/extensions/StdCmap.h" 33 #include "../Xext/extensions/StdCmap.h"
33 34
34 #ifdef SDL_VIDEO_DRIVER_PANDORA 35 #ifdef SDL_VIDEO_DRIVER_PANDORA
35 #include "SDL_x11opengles.h" 36 #include "SDL_x11opengles.h"
36 #endif 37 #endif
939 X11_SetWindowSize(_THIS, SDL_Window * window) 940 X11_SetWindowSize(_THIS, SDL_Window * window)
940 { 941 {
941 SDL_WindowData *data = (SDL_WindowData *) window->driverdata; 942 SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
942 Display *display = data->videodata->display; 943 Display *display = data->videodata->display;
943 944
945 if(SDL_IsShapedWindow(window))
946 X11_ResizeWindowShape(window);
944 XResizeWindow(display, data->xwindow, window->w, window->h); 947 XResizeWindow(display, data->xwindow, window->w, window->h);
945 } 948 }
946 949
947 void 950 void
948 X11_ShowWindow(_THIS, SDL_Window * window) 951 X11_ShowWindow(_THIS, SDL_Window * window)