pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added hiding-as-positioning trick and finally fixed flags.

Browse source
This commit is contained in:
egottlieb 2010-08-15 21:46:04 -04:00
parent b3840496be
commit affaf98f34
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/video/SDL_shape.c
View file

@ -32,7 +32,7 @@
SDL_Window* SDL_Window*
SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags) { SDL_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags) {
SDL_Window *result = SDL_CreateWindow(title,x,y,w,h,flags | SDL_WINDOW_BORDERLESS & !SDL_WINDOW_FULLSCREEN & !SDL_WINDOW_RESIZABLE); SDL_Window *result = SDL_CreateWindow(title,x,y,w,h,flags | SDL_WINDOW_BORDERLESS & ~SDL_WINDOW_FULLSCREEN & ~SDL_WINDOW_RESIZABLE);
if(result != NULL) { if(result != NULL) {
result->shaper = result->display->device->shape_driver.CreateShaper(result); result->shaper = result->display->device->shape_driver.CreateShaper(result);
if(result->shaper != NULL) { if(result->shaper != NULL) {
@ -126,7 +126,7 @@ RecursivelyCalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* mask,SDL_Rec
SDL_Color key; SDL_Color key;
SDL_ShapeTree* result = (SDL_ShapeTree*)SDL_malloc(sizeof(SDL_ShapeTree)); SDL_ShapeTree* result = (SDL_ShapeTree*)SDL_malloc(sizeof(SDL_ShapeTree));
SDL_Rect next = {0,0,0,0}; SDL_Rect next = {0,0,0,0};
for(y=dimensions.y;y<dimensions.y + dimensions.h;y++) for(y=dimensions.y;y<dimensions.y + dimensions.h;y++) {
for(x=dimensions.x;x<dimensions.x + dimensions.w;x++) { for(x=dimensions.x;x<dimensions.x + dimensions.w;x++) {
pixel_value = 0; pixel_value = 0;
pixel = (Uint8 *)(mask->pixels) + (y*mask->pitch) + (x*mask->format->BytesPerPixel); pixel = (Uint8 *)(mask->pixels) + (y*mask->pitch) + (x*mask->format->BytesPerPixel);
@ -183,6 +183,7 @@ RecursivelyCalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* mask,SDL_Rec
return result; return result;
} }
} }
}
//If we never recursed, all the pixels in this quadrant have the same "value". //If we never recursed, all the pixels in this quadrant have the same "value".
result->kind = (last_opaque == SDL_TRUE ? OpaqueShape : TransparentShape); result->kind = (last_opaque == SDL_TRUE ? OpaqueShape : TransparentShape);
result->data.shape = dimensions; result->data.shape = dimensions;
@ -240,7 +241,7 @@ SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *sh
window->shaper->mode = *shape_mode; window->shaper->mode = *shape_mode;
result = window->display->device->shape_driver.SetWindowShape(window->shaper,shape,shape_mode); result = window->display->device->shape_driver.SetWindowShape(window->shaper,shape,shape_mode);
window->shaper->hasshape = SDL_TRUE; window->shaper->hasshape = SDL_TRUE;
if(window->shaper->userx == 0 && window->shaper->usery == 0) { if(window->shaper->userx != 0 && window->shaper->usery != 0) {
SDL_SetWindowPosition(window,window->shaper->userx,window->shaper->usery); SDL_SetWindowPosition(window,window->shaper->userx,window->shaper->usery);
window->shaper->userx = 0; window->shaper->userx = 0;
window->shaper->usery = 0; window->shaper->usery = 0;

16
src/video/win32/SDL_win32shape.c
View file

@ -50,11 +50,10 @@ CombineRectRegions(SDL_ShapeTree* node,void* closure) {
HRGN mask_region = *((HRGN*)closure),temp_region = NULL; HRGN mask_region = *((HRGN*)closure),temp_region = NULL;
if(node->kind == OpaqueShape) { if(node->kind == OpaqueShape) {
//Win32 API regions exclude their outline, so we widen the region by one pixel in each direction to include the real outline. //Win32 API regions exclude their outline, so we widen the region by one pixel in each direction to include the real outline.
sprintf_s(&debug_str[0],200,"x: %u y: %u, x+w: %u, y+h: %u\n", /* sprintf_s(&debug_str[0],200,"x: %u y: %u, x+w: %u, y+h: %u\n",
node->data.shape.x,node->data.shape.y, node->data.shape.x,node->data.shape.y,
node->data.shape.x + node->data.shape.w,node->data.shape.y + node->data.shape.h); node->data.shape.x + node->data.shape.w,node->data.shape.y + node->data.shape.h);*/
OutputDebugStringA(debug_str); //OutputDebugStringA(debug_str);
OutputDebugStringA("Converting SDL_ShapeTree opaque node to Windows rectangle.\n");
temp_region = CreateRectRgn(node->data.shape.x - 1,node->data.shape.y - 1,node->data.shape.x + node->data.shape.w + 1,node->data.shape.y + node->data.shape.h + 1); temp_region = CreateRectRgn(node->data.shape.x - 1,node->data.shape.y - 1,node->data.shape.x + node->data.shape.w + 1,node->data.shape.y + node->data.shape.h + 1);
if(mask_region != NULL) { if(mask_region != NULL) {
CombineRgn(mask_region,mask_region,temp_region,RGN_OR); CombineRgn(mask_region,mask_region,temp_region,RGN_OR);
@ -100,10 +99,11 @@ Win32_ResizeWindowShape(SDL_Window *window) {
if(data->mask_tree != NULL) if(data->mask_tree != NULL)
SDL_FreeShapeTree(&data->mask_tree); SDL_FreeShapeTree(&data->mask_tree);
if(window->shaper->hasshape == SDL_TRUE) {
window->shaper->userx = window->x; window->shaper->userx = window->x;
window->shaper->usery = window->y; window->shaper->usery = window->y;
SDL_SetWindowPosition(window,-1000,-1000); SDL_SetWindowPosition(window,-1000,-1000);
}
return 0; return 0;
} }