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

Minor bugfixes. testshape now draws a shaped window with bizarre, pixellated gashes of transparency across it, and in doing so seems to hog a system resource and slow the rest of the video system down.

Browse source
This commit is contained in:
Eli Gottlieb 2010-07-18 23:05:40 -04:00
parent 4922edee74
commit 70ad6fd4e9
4 changed files with 23 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/video/SDL_shape.c
View file

@ -59,19 +59,30 @@ void SDL_CalculateShapeBitmap(Uint8 alphacutoff,SDL_Surface *shape,Uint8* bitmap
int x = 0;
int y = 0;
Uint8 r = 0,g = 0,b = 0,alpha = 0;
Uint8* pixel;
Uint32 bitmap_pixel;
Uint8* pixel = NULL;
Uint32 bitmap_pixel,pixel_value = 0;
if(SDL_MUSTLOCK(shape))
SDL_LockSurface(shape);
pixel = (Uint8*)shape->pixels;
for(y = 0;y<shape->h;y++) {
pixel = (Uint8 *)(shape->pixels) + y * shape->pitch;
for(x=0;x<shape->w;x++) {
alpha = 0;
SDL_GetRGBA(*(Uint32*)pixel,shape->format,&r,&g,&b,&alpha);
pixel_value = 0;
pixel = shape->pixels + y * shape->pitch + x * shape->format->BytesPerPixel;
switch(shape->format->BytesPerPixel) {
case(1):
pixel_value = *(Uint8*)pixel;
break;
case(2):
pixel_value = *(Uint16*)pixel;
break;
case(4):
pixel_value = *(Uint32*)pixel;
break;
}
SDL_GetRGBA(pixel_value,shape->format,&r,&g,&b,&alpha);
bitmap_pixel = y*shape->w + x;
bitmap[bitmap_pixel / ppb] |= (alpha >= alphacutoff ? value : 0) << ((ppb - 1) - (bitmap_pixel % ppb));
pixel += shape->format->BytesPerPixel;
}
}
if(SDL_MUSTLOCK(shape))
@ -99,7 +110,7 @@ int SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode
}
}
}
//TODO: Platform-specific implementations of SetWindowShape. X11 is finished. Win32 is in progress.
//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);
window->shaper->hasshape = SDL_TRUE;
if((window->shaper->usershownflag & SDL_WINDOW_SHOWN) == SDL_WINDOW_SHOWN) {

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

@ -339,7 +339,7 @@ int Win32_ResizeWindowShape(SDL_Window *window) {
}
}
window->shaper->usershownflag = window->flags & SDL_WINDOW_SHOWN;
window->shaper->usershownflag |= window->flags & SDL_WINDOW_SHOWN;
return 0;
}

2
src/video/x11/SDL_x11shape.c
View file

@ -66,7 +66,7 @@ int X11_ResizeWindowShape(SDL_Window* window) {
}
}
window->shaper->usershownflag = window->flags & SDL_WINDOW_SHOWN;
window->shaper->usershownflag |= window->flags & SDL_WINDOW_SHOWN;
return 0;
}

45
test/testshape.c
View file

@ -27,8 +27,8 @@ int main(int argc,char** argv) {
for(i=0;i<num_pictures;i++)
pictures[i] = NULL;
for(i=0;i<num_pictures;i++) {
SDL_Surface *original = SDL_LoadBMP(argv[i+1]);
if(original == NULL) {
pictures[i] = SDL_LoadBMP(argv[i+1]);
if(pictures[i] == NULL) {
int j = 0;
for(j=0;j<num_pictures;j++)
if(pictures[j] != NULL)
@ -38,43 +38,6 @@ int main(int argc,char** argv) {
printf("Could not load surface from named bitmap file.\n");
exit(-3);
}
//THIS CONVERSION ROUTINE IS FRAGILE! It relies in the fact that only certain portions of the format structure must be filled in to use it.
SDL_PixelFormat format = {NULL,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
int bpp = 0;
SDL_PixelFormatEnumToMasks(SDL_PIXELFORMAT_RGBA8888,&bpp,&format.Rmask,&format.Gmask,&format.Bmask,&format.Amask);
format.BitsPerPixel = bpp;
format.BytesPerPixel = format.BitsPerPixel / 8 + (format.BitsPerPixel % 8 > 0 ? 1 : 0);
pictures[i] = SDL_ConvertSurface(original,&format,0);
//We have no more need of the original now that we have our desired format.
SDL_FreeSurface(original);
if(pictures[i] == NULL) {
int j = 0;
for(j=0;j<num_pictures;j++)
if(pictures[j] != NULL)
SDL_FreeSurface(pictures[j]);
free(pictures);
SDL_VideoQuit();
printf("Could not convert bitmap surface to desired format.\n");
exit(-3);
}
if(SDL_MUSTLOCK(pictures[i]))
SDL_LockSurface(pictures[i]);
void* pixels = pictures[i]->pixels;
unsigned int pitch = pictures[i]->pitch;
int y =0,x = 0;
for(y=0;y<pictures[i]->h;y++)
for(x=0;x<pictures[i]->w;x++) {
Uint32* pixel = pixels + y * pitch + x * pictures[i]->format->BytesPerPixel;
Uint8 r = 0,g = 0,b = 0;
SDL_GetRGB(*pixel,pictures[i]->format,&r,&g,&b);
//if(r == g == b == 0xff)
// *pixel = SDL_MapRGBA(pictures[i]->format,r,g,b,0);
}
if(SDL_MUSTLOCK(pictures[i]))
SDL_UnlockSurface(pictures[i]);
}
SDL_Window *window = SDL_CreateShapedWindow("SDL_Shape test",SHAPED_WINDOW_X,SHAPED_WINDOW_Y,SHAPED_WINDOW_DIMENSION,SHAPED_WINDOW_DIMENSION,SDL_WINDOW_RESIZABLE | SDL_WINDOW_SHOWN);
@ -123,12 +86,12 @@ int main(int argc,char** argv) {
event_pending = SDL_PollEvent(&event);
unsigned int current_picture = 0;
SDL_WindowShapeMode mode = {ShapeModeDefault,1};
SDL_SetWindowShape(window,pictures[current_picture],&mode);
int mouse_down = 0;
Uint32 format,access;
Uint32 format = 0,access = 0;
SDL_Rect texture_dimensions = {0,0,0,0};
SDL_QueryTexture(textures[current_picture],&format,&access,&texture_dimensions.w,&texture_dimensions.h);
SDL_SetWindowSize(window,texture_dimensions.w,texture_dimensions.h);
SDL_SetWindowShape(window,pictures[current_picture],&mode);
while(should_exit == 0) {
event_pending = SDL_PollEvent(&event);
if(event_pending == 1) {