Skip to content

L
libSDL
Commit f4b4b47a authored by Eli Gottlieb's avatar Eli Gottlieb
Browse files
Options

Fixed overwriting of SDL_shape.c in merge.

parent 56d94ad5
Hide whitespace changes
Inline Side-by-side
Showing with 216 additions and 226 deletions
src/video/SDL_shape.c
View file @ f4b4b47a
...@@ -22,255 +22,245 @@ ...@@ -22,255 +22,245 @@
#include "SDL_config.h" #include "SDL_config.h"
#include "SDL.h" #include "SDL.h"
#include "SDL_assert.h"
#include "SDL_video.h" #include "SDL_video.h"
#include "SDL_sysvideo.h" #include "SDL_sysvideo.h"
#include "SDL_pixels.h" #include "SDL_pixels.h"
#include "SDL_surface.h" #include "SDL_surface.h"
#include "SDL_shape.h" #include "SDL_shape.h"
#include "../src/video/SDL_shape_internals.h" #include "SDL_shape_internals.h"
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,SDL_WINDOW_BORDERLESS | flags & !SDL_WINDOW_FULLSCREEN & !SDL_WINDOW_SHOWN);
SDL_Window *result = SDL_CreateWindow(title,x,y,w,h,SDL_WINDOW_BORDERLESS | flags & !SDL_WINDOW_FULLSCREEN & !SDL_WINDOW_SHOWN); 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) { result->shaper->usershownflag = flags & SDL_WINDOW_SHOWN;
result->shaper->usershownflag = flags & SDL_WINDOW_SHOWN; result->shaper->mode.mode = ShapeModeDefault;
result->shaper->mode.mode = ShapeModeDefault; result->shaper->mode.parameters.binarizationCutoff = 1;
result->shaper->mode.parameters.binarizationCutoff = 1; result->shaper->hasshape = SDL_FALSE;
result->shaper->hasshape = SDL_FALSE; return result;
return result; }
} else {
else { SDL_DestroyWindow(result);
SDL_DestroyWindow(result); return NULL;
return NULL; }
} }
} else
else return NULL;
return NULL;
} }
SDL_bool SDL_bool SDL_IsShapedWindow(const SDL_Window *window) {
SDL_IsShapedWindow(const SDL_Window *window) { if(window == NULL)
if(window == NULL) return SDL_FALSE;
return SDL_FALSE; else
else return (SDL_bool)(window->shaper != NULL);
return (SDL_bool)(window->shaper != NULL);
} }
/* REQUIRES that bitmap point to a w-by-h bitmap with ppb pixels-per-byte. */ /* REQUIRES that bitmap point to a w-by-h bitmap with ppb pixels-per-byte. */
void void SDL_CalculateShapeBitmap(SDL_WindowShapeMode mode,SDL_Surface *shape,Uint8* bitmap,Uint8 ppb) {
SDL_CalculateShapeBitmap(SDL_WindowShapeMode mode,SDL_Surface *shape,Uint8* bitmap,Uint8 ppb) { int x = 0;
int x = 0; int y = 0;
int y = 0; Uint8 r = 0,g = 0,b = 0,alpha = 0;
Uint8 r = 0,g = 0,b = 0,alpha = 0; Uint8* pixel = NULL;
Uint8* pixel = NULL; Uint32 bitmap_pixel,pixel_value = 0,mask_value = 0;
Uint32 bitmap_pixel,pixel_value = 0,mask_value = 0; SDL_Color key;
SDL_Color key; if(SDL_MUSTLOCK(shape))
if(SDL_MUSTLOCK(shape)) SDL_LockSurface(shape);
SDL_LockSurface(shape); pixel = (Uint8*)shape->pixels;
pixel = (Uint8*)shape->pixels; for(y = 0;y<shape->h;y++) {
for(y = 0;y<shape->h;y++) { for(x=0;x<shape->w;x++) {
for(x=0;x<shape->w;x++) { alpha = 0;
alpha = 0; pixel_value = 0;
pixel_value = 0; pixel = (Uint8 *)(shape->pixels) + (y*shape->pitch) + (x*shape->format->BytesPerPixel);
pixel = (Uint8 *)(shape->pixels) + (y*shape->pitch) + (x*shape->format->BytesPerPixel); switch(shape->format->BytesPerPixel) {
switch(shape->format->BytesPerPixel) { case(1):
case(1): pixel_value = *(Uint8*)pixel;
pixel_value = *(Uint8*)pixel; break;
break; case(2):
case(2): pixel_value = *(Uint16*)pixel;
pixel_value = *(Uint16*)pixel; break;
break; case(3):
case(3): pixel_value = *(Uint32*)pixel & (~shape->format->Amask);
pixel_value = *(Uint32*)pixel & (~shape->format->Amask); break;
break; case(4):
case(4): pixel_value = *(Uint32*)pixel;
pixel_value = *(Uint32*)pixel; break;
break; }
} SDL_GetRGBA(pixel_value,shape->format,&r,&g,&b,&alpha);
SDL_GetRGBA(pixel_value,shape->format,&r,&g,&b,&alpha); bitmap_pixel = y*shape->w + x;
bitmap_pixel = y*shape->w + x; switch(mode.mode) {
switch(mode.mode) { case(ShapeModeDefault):
case(ShapeModeDefault): mask_value = (alpha >= 1 ? 1 : 0);
mask_value = (alpha >= 1 ? 1 : 0); break;
break; case(ShapeModeBinarizeAlpha):
case(ShapeModeBinarizeAlpha): mask_value = (alpha >= mode.parameters.binarizationCutoff ? 1 : 0);
mask_value = (alpha >= mode.parameters.binarizationCutoff ? 1 : 0); break;
break; case(ShapeModeReverseBinarizeAlpha):
case(ShapeModeReverseBinarizeAlpha): mask_value = (alpha <= mode.parameters.binarizationCutoff ? 1 : 0);
mask_value = (alpha <= mode.parameters.binarizationCutoff ? 1 : 0); break;
break; case(ShapeModeColorKey):
case(ShapeModeColorKey): key = mode.parameters.colorKey;
key = mode.parameters.colorKey; mask_value = ((key.r != r && key.g != g && key.b != b) ? 1 : 0);
mask_value = ((key.r != r && key.g != g && key.b != b) ? 1 : 0); break;
break; }
} bitmap[bitmap_pixel / ppb] |= mask_value << (7 - ((ppb - 1) - (bitmap_pixel % ppb)));
bitmap[bitmap_pixel / ppb] |= mask_value << (7 - ((ppb - 1) - (bitmap_pixel % ppb))); }
} }
} if(SDL_MUSTLOCK(shape))
if(SDL_MUSTLOCK(shape)) SDL_UnlockSurface(shape);
SDL_UnlockSurface(shape);
} }
SDL_ShapeTree* SDL_ShapeTree* RecursivelyCalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* mask,SDL_Rect dimensions) {
RecursivelyCalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* mask,SDL_bool invert,SDL_Rect dimensions) { int x = 0,y = 0;
int x = 0,y = 0; Uint8* pixel = NULL;
Uint8* pixel = NULL; Uint32 pixel_value = 0;
Uint32 pixel_value = 0; Uint8 r = 0,g = 0,b = 0,a = 0;
Uint8 r = 0,g = 0,b = 0,a = 0; SDL_bool pixel_opaque = SDL_FALSE;
SDL_bool pixel_transparent = SDL_FALSE; int last_opaque = -1;
int last_transparent = -1; 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.h;y++) for(x=dimensions.x;x<dimensions.x + dimensions.w;x++) {
for(x=dimensions.x;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); switch(mask->format->BytesPerPixel) {
switch(mask->format->BytesPerPixel) { case(1):
case(1): pixel_value = *(Uint8*)pixel;
pixel_value = *(Uint8*)pixel; break;
break; case(2):
case(2): pixel_value = *(Uint16*)pixel;
pixel_value = *(Uint16*)pixel; break;
break; case(3):
case(3): pixel_value = *(Uint32*)pixel & (~mask->format->Amask);
pixel_value = *(Uint32*)pixel & (~mask->format->Amask); break;
break; case(4):
case(4): pixel_value = *(Uint32*)pixel;
pixel_value = *(Uint32*)pixel; break;
break; }
} SDL_GetRGBA(pixel_value,mask->format,&r,&g,&b,&a);
SDL_GetRGBA(pixel_value,mask->format,&r,&g,&b,&a); switch(mode.mode) {
switch(mode.mode) { case(ShapeModeDefault):
case(ShapeModeDefault): pixel_opaque = (a >= 1 ? SDL_TRUE : SDL_FALSE);
pixel_transparent = (SDL_bool)(a >= 1 ? !invert : invert); break;
break; case(ShapeModeBinarizeAlpha):
case(ShapeModeBinarizeAlpha): pixel_opaque = (a >= mode.parameters.binarizationCutoff ? SDL_TRUE : SDL_FALSE);
pixel_transparent = (SDL_bool)(a >= mode.parameters.binarizationCutoff ? !invert : invert); break;
break; case(ShapeModeReverseBinarizeAlpha):
case(ShapeModeReverseBinarizeAlpha): pixel_opaque = (a <= mode.parameters.binarizationCutoff ? SDL_TRUE : SDL_FALSE);
pixel_transparent = (SDL_bool)(a <= mode.parameters.binarizationCutoff ? !invert : invert); break;
break; case(ShapeModeColorKey):
case(ShapeModeColorKey): key = mode.parameters.colorKey;
key = mode.parameters.colorKey; pixel_opaque = ((key.r == r && key.g == g && key.b == b) ? SDL_TRUE : SDL_FALSE);
pixel_transparent = (SDL_bool)((key.r == r && key.g == g && key.b == b) ? !invert : invert); break;
break; }
} if(last_opaque == -1)
if(last_transparent == -1) { last_opaque = pixel_opaque;
last_transparent = pixel_transparent; if(last_opaque != pixel_opaque) {
break; result->kind = QuadShape;
} //These will stay the same.
if(last_transparent != pixel_transparent) { next.w = dimensions.w / 2;
result->kind = QuadShape; next.h = dimensions.h / 2;
//These will stay the same. //These will change from recursion to recursion.
next.w = dimensions.w / 2; next.x = dimensions.x;
next.h = dimensions.h / 2; next.y = dimensions.y;
//These will change from recursion to recursion. result->data.children.upleft = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next);
next.x = dimensions.x; next.x = dimensions.w / 2;
next.y = dimensions.y; //Unneeded: next.y = dimensions.y;
result->data.children.upleft = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,invert,next); result->data.children.upright = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next);
next.x = dimensions.w / 2 + 1; next.x = dimensions.x;
//Unneeded: next.y = dimensions.y; next.y = dimensions.h / 2;
result->data.children.upright = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,invert,next); result->data.children.downleft = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next);
next.x = dimensions.x; next.x = dimensions.w / 2;
next.y = dimensions.h / 2 + 1; //Unneeded: next.y = dimensions.h / 2 + 1;
result->data.children.downleft = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,invert,next); result->data.children.downright = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,next);
next.x = dimensions.w / 2 + 1; return result;
//Unneeded: next.y = dimensions.h / 2 + 1; }
result->data.children.downright = (struct SDL_ShapeTree *)RecursivelyCalculateShapeTree(mode,mask,invert,next); }
return result; //If we never recursed, all the pixels in this quadrant have the same "value".
} result->kind = (last_opaque == SDL_TRUE ? OpaqueShape : TransparentShape);
} result->data.shape = dimensions;
//If we never recursed, all the pixels in this quadrant have the same "value". return result;
result->kind = (last_transparent == SDL_FALSE ? OpaqueShape : TransparentShape);
result->data.shape = dimensions;
return result;
} }
SDL_ShapeTree* SDL_ShapeTree* SDL_CalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* shape) {
SDL_CalculateShapeTree(SDL_WindowShapeMode mode,SDL_Surface* shape,SDL_bool invert) { SDL_Rect dimensions = {0,0,shape->w,shape->h};
SDL_Rect dimensions = {0,0,shape->w,shape->h}; SDL_ShapeTree* result = NULL;
SDL_ShapeTree* result = NULL; if(SDL_MUSTLOCK(shape))
if(SDL_MUSTLOCK(shape)) SDL_LockSurface(shape);
SDL_LockSurface(shape); result = RecursivelyCalculateShapeTree(mode,shape,dimensions);
result = RecursivelyCalculateShapeTree(mode,shape,invert,dimensions); if(SDL_MUSTLOCK(shape))
if(SDL_MUSTLOCK(shape)) SDL_UnlockSurface(shape);
SDL_UnlockSurface(shape); return result;
return result;
} }
void void SDL_TraverseShapeTree(SDL_ShapeTree *tree,SDL_TraversalFunction function,void* closure) {
SDL_TraverseShapeTree(SDL_ShapeTree *tree,void(*function)(SDL_ShapeTree*,void*),void* closure) { SDL_assert(tree != NULL);
if(tree->kind == QuadShape) { if(tree->kind == QuadShape) {
SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.upleft,function,closure); SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.upleft,function,closure);
SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.upright,function,closure); SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.upright,function,closure);
SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.downleft,function,closure); SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.downleft,function,closure);
SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.downright,function,closure); SDL_TraverseShapeTree((SDL_ShapeTree *)tree->data.children.downright,function,closure);
} }
else else
function(tree,closure); function(tree,closure);
} }
void void SDL_FreeShapeTree(SDL_ShapeTree** shapeTree) {
SDL_FreeShapeTree(SDL_ShapeTree** shapeTree) { if((*shapeTree)->kind == QuadShape) {
if((*shapeTree)->kind == QuadShape) { SDL_FreeShapeTree((SDL_ShapeTree **)&(*shapeTree)->data.children.upleft);
SDL_FreeShapeTree((SDL_ShapeTree **)&(*shapeTree)->data.children.upleft); SDL_FreeShapeTree((SDL_ShapeTree **)&(*shapeTree)->data.children.upright);
SDL_FreeShapeTree((SDL_ShapeTree **)&(*shapeTree)->data.children.upright); SDL_FreeShapeTree((SDL_ShapeTree **)&(*shapeTree)->data.children.downleft);
SDL_FreeShapeTree((SDL_ShapeTree **)&(*shapeTree)->data.children.downleft); SDL_FreeShapeTree((SDL_ShapeTree **)&(*shapeTree)->data.children.downright);
SDL_FreeShapeTree((SDL_ShapeTree **)&(*shapeTree)->data.children.downright); }
} SDL_free(*shapeTree);
SDL_free(*shapeTree); *shapeTree = NULL;
*shapeTree = NULL;
} }
int int SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) {
SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) { int result;
int result; if(window == NULL || !SDL_IsShapedWindow(window))
if(window == NULL || !SDL_IsShapedWindow(window)) //The window given was not a shapeable window.
//The window given was not a shapeable window. return SDL_NONSHAPEABLE_WINDOW;
return SDL_NONSHAPEABLE_WINDOW; if(shape == NULL)
if(shape == NULL) //Invalid shape argument.
//Invalid shape argument. return SDL_INVALID_SHAPE_ARGUMENT;
return SDL_INVALID_SHAPE_ARGUMENT;
if(shapeMode != NULL)
if(shapeMode != NULL) window->shaper->mode = *shapeMode;
window->shaper->mode = *shapeMode; //TODO: Platform-specific implementations of SetWindowShape. X11 is finished. Win32 is finished. Debugging is in progress on both.
//TODO: Platform-specific implementations of SetWindowShape. X11 is finished. Win32 is finished. Debugging is in progress on both. result = window->display->device->shape_driver.SetWindowShape(window->shaper,shape,shapeMode);
result = window->display->device->shape_driver.SetWindowShape(window->shaper,shape,shapeMode); window->shaper->hasshape = SDL_TRUE;
window->shaper->hasshape = SDL_TRUE; if((window->shaper->usershownflag & SDL_WINDOW_SHOWN) == SDL_WINDOW_SHOWN) {
if((window->shaper->usershownflag & SDL_WINDOW_SHOWN) == SDL_WINDOW_SHOWN) { SDL_ShowWindow(window);
SDL_ShowWindow(window); window->shaper->usershownflag &= !SDL_WINDOW_SHOWN;
window->shaper->usershownflag &= !SDL_WINDOW_SHOWN; }
} return result;
return result;
} }
SDL_bool SDL_bool SDL_WindowHasAShape(SDL_Window *window) {
SDL_WindowHasAShape(SDL_Window *window) { if (window == NULL || !SDL_IsShapedWindow(window))
if (window == NULL && !SDL_IsShapedWindow(window)) return SDL_FALSE;
return SDL_FALSE; return window->shaper->hasshape;
return window->shaper->hasshape;
} }
int int SDL_GetShapedWindowMode(SDL_Window *window,SDL_WindowShapeMode *shapeMode) {
SDL_GetShapedWindowMode(SDL_Window *window,SDL_WindowShapeMode *shapeMode) { if(window != NULL && SDL_IsShapedWindow(window)) {
if(window != NULL && SDL_IsShapedWindow(window)) { if(shapeMode == NULL) {
if(shapeMode == NULL) { if(SDL_WindowHasAShape(window))
if(SDL_WindowHasAShape(window)) //The window given has a shape.
//The window given has a shape. return 0;
return 0; else
else //The window given is shapeable but lacks a shape.
//The window given is shapeable but lacks a shape. return SDL_WINDOW_LACKS_SHAPE;
return SDL_WINDOW_LACKS_SHAPE; }
} else {
else { *shapeMode = window->shaper->mode;
*shapeMode = window->shaper->mode; return 0;
return 0; }
} }
} else
else //The window given is not a valid shapeable window.
//The window given is not a valid shapeable window. return SDL_NONSHAPEABLE_WINDOW;
return SDL_NONSHAPEABLE_WINDOW;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment