From 115247741a009fa5473fcec87086fa4d1d0eba0c Mon Sep 17 00:00:00 2001 From: egottlieb Date: Fri, 6 Aug 2010 20:22:14 -0400 Subject: [PATCH] Fixed lots of little bugs in Win32 shaping and in SDL_CalculateShapeTree(). Still not actually showing anything on Windows, though there's no crashes and everything compiles fine. Bugger. --- src/video/SDL_shape.c | 40 +++++++++++++++----------------- src/video/SDL_shape_internals.h | 2 +- src/video/win32/SDL_win32shape.c | 10 +++++--- test/testshape.c | 1 - 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/src/video/SDL_shape.c b/src/video/SDL_shape.c index d53f6a38f..519e87ef1 100644 --- a/src/video/SDL_shape.c +++ b/src/video/SDL_shape.c @@ -111,18 +111,18 @@ void SDL_CalculateShapeBitmap(SDL_WindowShapeMode mode,SDL_Surface *shape,Uint8* SDL_UnlockSurface(shape); } -SDL_ShapeTree* RecursivelyCalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* mask,SDL_bool invert,SDL_Rect dimensions) { +SDL_ShapeTree* RecursivelyCalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* mask,SDL_Rect dimensions) { int x = 0,y = 0; Uint8* pixel = NULL; Uint32 pixel_value = 0; Uint8 r = 0,g = 0,b = 0,a = 0; - SDL_bool pixel_transparent = SDL_FALSE; - int last_transparent = -1; + SDL_bool pixel_opaque = SDL_FALSE; + int last_opaque = -1; SDL_Color key; SDL_ShapeTree* result = (SDL_ShapeTree*)SDL_malloc(sizeof(SDL_ShapeTree)); SDL_Rect next = {0,0,0,0}; - for(y=dimensions.y;ypixels) + (y*mask->pitch) + (x*mask->format->BytesPerPixel); switch(mask->format->BytesPerPixel) { @@ -142,24 +142,22 @@ SDL_ShapeTree* RecursivelyCalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surfac SDL_GetRGBA(pixel_value,mask->format,&r,&g,&b,&a); switch(mode.mode) { case(ShapeModeDefault): - pixel_transparent = (SDL_bool)(a >= 1 ? !invert : invert); + pixel_opaque = (a >= 1 ? SDL_TRUE : SDL_FALSE); break; case(ShapeModeBinarizeAlpha): - pixel_transparent = (SDL_bool)(a >= mode.parameters.binarizationCutoff ? !invert : invert); + pixel_opaque = (a >= mode.parameters.binarizationCutoff ? SDL_TRUE : SDL_FALSE); break; case(ShapeModeReverseBinarizeAlpha): - pixel_transparent = (SDL_bool)(a <= mode.parameters.binarizationCutoff ? !invert : invert); + pixel_opaque = (a <= mode.parameters.binarizationCutoff ? SDL_TRUE : SDL_FALSE); break; case(ShapeModeColorKey): key = mode.parameters.colorKey; - pixel_transparent = (SDL_bool)((key.r == r && key.g == g && key.b == b) ? !invert : invert); + pixel_opaque = ((key.r == r && key.g == g && key.b == b) ? SDL_TRUE : SDL_FALSE); break; } - if(last_transparent == -1) { - last_transparent = pixel_transparent; - break; - } - if(last_transparent != pixel_transparent) { + if(last_opaque == -1) + last_opaque = pixel_opaque; + if(last_opaque != pixel_opaque) { result->kind = QuadShape; //These will stay the same. next.w = dimensions.w / 2; @@ -167,31 +165,31 @@ SDL_ShapeTree* RecursivelyCalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surfac //These will change from recursion to recursion. next.x = dimensions.x; next.y = dimensions.y; - result->data.children.upleft = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,invert,next); + result->data.children.upleft = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next); next.x = dimensions.w / 2; //Unneeded: next.y = dimensions.y; - result->data.children.upright = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,invert,next); + result->data.children.upright = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next); next.x = dimensions.x; next.y = dimensions.h / 2; - result->data.children.downleft = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,invert,next); + result->data.children.downleft = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next); next.x = dimensions.w / 2; //Unneeded: next.y = dimensions.h / 2 + 1; - result->data.children.downright = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,invert,next); + result->data.children.downright = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next); return result; } } //If we never recursed, all the pixels in this quadrant have the same "value". - result->kind = (last_transparent == SDL_FALSE ? OpaqueShape : TransparentShape); + result->kind = (last_opaque == SDL_TRUE ? OpaqueShape : TransparentShape); result->data.shape = dimensions; return result; } -SDL_ShapeTree* SDL_CalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* shape,SDL_bool invert) { +SDL_ShapeTree* SDL_CalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* shape) { SDL_Rect dimensions = {0,0,shape->w,shape->h}; SDL_ShapeTree* result = NULL; if(SDL_MUSTLOCK(shape)) SDL_LockSurface(shape); - result = RecursivelyCalculateShapeTree(mode,shape,invert,dimensions); + result = RecursivelyCalculateShapeTree(mode,shape,dimensions); if(SDL_MUSTLOCK(shape)) SDL_UnlockSurface(shape); return result; diff --git a/src/video/SDL_shape_internals.h b/src/video/SDL_shape_internals.h index 18763f922..ff8835af0 100644 --- a/src/video/SDL_shape_internals.h +++ b/src/video/SDL_shape_internals.h @@ -55,7 +55,7 @@ typedef struct { typedef void(*SDL_TraversalFunction)(SDL_ShapeTree*,void*); extern void SDL_CalculateShapeBitmap(SDL_WindowShapeMode mode,SDL_Surface *shape,Uint8* bitmap,Uint8 ppb); -extern SDL_ShapeTree* SDL_CalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* shape,SDL_bool invert); +extern SDL_ShapeTree* SDL_CalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* shape); extern void SDL_TraverseShapeTree(SDL_ShapeTree *tree,SDL_TraversalFunction function,void* closure); extern void SDL_FreeShapeTree(SDL_ShapeTree** shapeTree); diff --git a/src/video/win32/SDL_win32shape.c b/src/video/win32/SDL_win32shape.c index 98140afc5..7e4f4f77e 100644 --- a/src/video/win32/SDL_win32shape.c +++ b/src/video/win32/SDL_win32shape.c @@ -20,6 +20,7 @@ eligottlieb@gmail.com */ +#include "SDL_assert.h" #include "SDL_win32shape.h" #include "SDL_win32video.h" @@ -43,9 +44,12 @@ SDL_WindowShaper* Win32_CreateShaper(SDL_Window * window) { void CombineRectRegions(SDL_ShapeTree* node, void* closure) { HRGN* mask_region = (HRGN *)closure; + int combined = -1; if(node->kind == OpaqueShape) { HRGN temp_region = CreateRectRgn(node->data.shape.x,node->data.shape.y,node->data.shape.w,node->data.shape.h); - CombineRgn(*mask_region,*mask_region,temp_region, RGN_OR); + SDL_assert(temp_region != NULL); + combined = CombineRgn(*mask_region,*mask_region,temp_region, RGN_OR); + SDL_assert(combined == SIMPLEREGION || combined == COMPLEXREGION); DeleteObject(temp_region); } } @@ -64,7 +68,7 @@ int Win32_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowS data = (SDL_ShapeData*)shaper->driverdata; if(data->mask_tree != NULL) SDL_FreeShapeTree(&data->mask_tree); - data->mask_tree = SDL_CalculateShapeTree(*shapeMode,shape,SDL_FALSE); + data->mask_tree = SDL_CalculateShapeTree(*shapeMode,shape); /* * Start with empty region @@ -78,7 +82,7 @@ int Win32_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowS */ windowdata=(SDL_WindowData *)(shaper->window->driverdata); hwnd = windowdata->hwnd; - SetWindowRgn(hwnd, mask_region, TRUE); + SDL_assert(SetWindowRgn(hwnd, mask_region, TRUE) != 0); return 0; } diff --git a/test/testshape.c b/test/testshape.c index 81c499e43..b2c4a18a5 100644 --- a/test/testshape.c +++ b/test/testshape.c @@ -44,7 +44,6 @@ int main(int argc,char** argv) { LoadedPicture* pictures; int i, j; SDL_PixelFormat* format = NULL; - Uint32 format_enum; SDL_Window *window; SDL_Color black = {0,0,0,0xff}; SDL_Event event;