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

Implemented SDL_SetWindowIcon(), with translucent icon support under X11.

Browse source 
--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403429
This commit is contained in:
Sam Lantinga 2009-01-02 17:39:48 +00:00
parent 3c555c8843
commit fea6781d86
11 changed files with 105 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/video/SDL_pixels.c
View file

@ -347,16 +347,25 @@ SDL_AllocFormat(int bpp,
Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask)
{
SDL_PixelFormat *format;
Uint32 mask;
/* Allocate an empty pixel format structure */
format = SDL_calloc(1, sizeof(*format));
format = SDL_malloc(sizeof(*format));
if (format == NULL) {
SDL_OutOfMemory();
return (NULL);
}
/* Set up the format */
return SDL_InitFormat(format, bpp, Rmask, Gmask, Bmask, Amask);
}
SDL_PixelFormat *
SDL_InitFormat(SDL_PixelFormat *format, int bpp, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask)
{
Uint32 mask;
/* Set up the format */
SDL_zerop(format);
format->BitsPerPixel = bpp;
format->BytesPerPixel = (bpp + 7) / 8;
if (Rmask || Bmask || Gmask) { /* Packed pixels with custom mask */
@ -426,7 +435,7 @@ SDL_AllocFormat(int bpp,
}
format->palette = NULL;
return (format);
return format;
}
/*