Skip to content

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

Reformatting code to match the rest of SDL. Variable names seem OK; replaced... 

Reformatting code to match the rest of SDL.  Variable names seem OK; replaced tabs with 4 spaces each for indentation.
parent 34bbabf0
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 401 additions and 380 deletions
src/video/SDL_shape.c
View file @ 30693e91
This diff is collapsed.
src/video/cocoa/SDL_cocoashape.m
View file @ 30693e91
...@@ -24,48 +24,51 @@ ...@@ -24,48 +24,51 @@
#include "SDL_shape.h" #include "SDL_shape.h"
#include "SDL_cocoashape.h" #include "SDL_cocoashape.h"
SDL_WindowShaper* Cocoa_CreateShaper(SDL_Window* window) { SDL_WindowShaper*
SDL_WindowData* data = (SDL_WindowData*)window->driverdata; Cocoa_CreateShaper(SDL_Window* window) {
[data->nswindow setAlpha:1.0]; SDL_WindowData* data = (SDL_WindowData*)window->driverdata;
[data->nswindow setOpaque:YES]; [data->nswindow setAlpha:1.0];
[data->nswindow setStyleMask:NSBorderlessWindowMask]; [data->nswindow setOpaque:YES];
SDL_Shaper* result = result = malloc(sizeof(SDL_WindowShaper)); [data->nswindow setStyleMask:NSBorderlessWindowMask];
result->window = window; SDL_Shaper* result = result = malloc(sizeof(SDL_WindowShaper));
result->mode.mode = ShapeModeDefault; result->window = window;
result->mode.parameters.binarizationCutoff = 1; result->mode.mode = ShapeModeDefault;
result->usershownflag = 0; result->mode.parameters.binarizationCutoff = 1;
window->shaper = result; result->usershownflag = 0;
window->shaper = result;
SDL_ShapeData* data = malloc(sizeof(SDL_ShapeData));
result->driverdata = data; SDL_ShapeData* data = malloc(sizeof(SDL_ShapeData));
data->context = [data->nswindow graphicsContext]; result->driverdata = data;
data->saved = SDL_False; data->context = [data->nswindow graphicsContext];
data->rects = NULL; data->saved = SDL_False;
data->count = 0; data->rects = NULL;
data->count = 0;
int resized_properly = Cocoa_ResizeWindowShape(window);
assert(resized_properly == 0); int resized_properly = Cocoa_ResizeWindowShape(window);
return result; assert(resized_properly == 0);
return result;
} }
int Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) { int
SDL_WindowData* data = (SDL_WindowData*)shaper->window->driverdata; Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) {
if(data->saved == SDL_True) { SDL_WindowData* data = (SDL_WindowData*)shaper->window->driverdata;
[data->context restoreGraphicsState]; if(data->saved == SDL_True) {
data->saved = SDL_False; [data->context restoreGraphicsState];
} data->saved = SDL_False;
}
[data->context saveGraphicsState];
data->saved = SDL_True; [data->context saveGraphicsState];
data->saved = SDL_True;
[[NSColor clearColor] set];
NSRectFill([[data->nswindow contentView] frame]); [[NSColor clearColor] set];
/* TODO: It looks like Cocoa can set a clipping path based on a list of rectangles. That's what we get from the NSRectFill([[data->nswindow contentView] frame]);
/* TODO: It looks like Cocoa can set a clipping path based on a list of rectangles. That's what we get from the
Windoze shape-calculation code: a list of rectangles. This will work... I think. */ Windoze shape-calculation code: a list of rectangles. This will work... I think. */
} }
int Cocoa_ResizeWindowShape(SDL_Window *window) { int
SDL_ShapeData* data = window->shaper->driverdata; Cocoa_ResizeWindowShape(SDL_Window *window) {
assert(data != NULL); SDL_ShapeData* data = window->shaper->driverdata;
return 0; assert(data != NULL);
return 0;
} }
src/video/win32/SDL_win32shape.c
View file @ 30693e91
...@@ -23,79 +23,83 @@ ...@@ -23,79 +23,83 @@
#include "SDL_win32shape.h" #include "SDL_win32shape.h"
#include "SDL_win32video.h" #include "SDL_win32video.h"
SDL_WindowShaper* Win32_CreateShaper(SDL_Window * window) { SDL_WindowShaper*
int resized_properly; Win32_CreateShaper(SDL_Window * window) {
SDL_WindowShaper* result = (SDL_WindowShaper *)SDL_malloc(sizeof(SDL_WindowShaper)); int resized_properly;
result->window = window; SDL_WindowShaper* result = (SDL_WindowShaper *)SDL_malloc(sizeof(SDL_WindowShaper));
result->mode.mode = ShapeModeDefault; result->window = window;
result->mode.parameters.binarizationCutoff = 1; result->mode.mode = ShapeModeDefault;
result->usershownflag = 0; result->mode.parameters.binarizationCutoff = 1;
result->driverdata = (SDL_ShapeData*)SDL_malloc(sizeof(SDL_ShapeData)); result->usershownflag = 0;
((SDL_ShapeData*)result->driverdata)->mask_tree = NULL; result->driverdata = (SDL_ShapeData*)SDL_malloc(sizeof(SDL_ShapeData));
//Put some driver-data here. ((SDL_ShapeData*)result->driverdata)->mask_tree = NULL;
window->shaper = result; //Put some driver-data here.
resized_properly = Win32_ResizeWindowShape(window); window->shaper = result;
if (resized_properly != 0) resized_properly = Win32_ResizeWindowShape(window);
return NULL; if (resized_properly != 0)
return NULL;
return result; return result;
} }
void CombineRectRegions(SDL_ShapeTree* node, void* closure) { void
HRGN* mask_region = (HRGN *)closure; CombineRectRegions(SDL_ShapeTree* node, void* closure) {
if(node->kind == OpaqueShape) { HRGN* mask_region = (HRGN *)closure;
HRGN temp_region = CreateRectRgn(node->data.shape.x,node->data.shape.y,node->data.shape.w,node->data.shape.h); if(node->kind == OpaqueShape) {
CombineRgn(*mask_region,*mask_region,temp_region, RGN_OR); HRGN temp_region = CreateRectRgn(node->data.shape.x,node->data.shape.y,node->data.shape.w,node->data.shape.h);
DeleteObject(temp_region); CombineRgn(*mask_region,*mask_region,temp_region, RGN_OR);
} DeleteObject(temp_region);
}
} }
int Win32_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) { int
SDL_ShapeData *data; Win32_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) {
HRGN mask_region; SDL_ShapeData *data;
HRGN mask_region;
SDL_WindowData *windowdata; SDL_WindowData *windowdata;
HWND hwnd; HWND hwnd;
if (shaper == NULL || shape == NULL) if (shaper == NULL || shape == NULL)
return SDL_INVALID_SHAPE_ARGUMENT; return SDL_INVALID_SHAPE_ARGUMENT;
if(shape->format->Amask == 0 && shapeMode->mode != ShapeModeColorKey || shape->w != shaper->window->w || shape->h != shaper->window->h) if(shape->format->Amask == 0 && shapeMode->mode != ShapeModeColorKey || shape->w != shaper->window->w || shape->h != shaper->window->h)
return SDL_INVALID_SHAPE_ARGUMENT; return SDL_INVALID_SHAPE_ARGUMENT;
data = (SDL_ShapeData*)shaper->driverdata; data = (SDL_ShapeData*)shaper->driverdata;
if(data->mask_tree != NULL) if(data->mask_tree != NULL)
SDL_FreeShapeTree(&data->mask_tree); SDL_FreeShapeTree(&data->mask_tree);
data->mask_tree = SDL_CalculateShapeTree(*shapeMode,shape,SDL_FALSE); data->mask_tree = SDL_CalculateShapeTree(*shapeMode,shape,SDL_FALSE);
/* /*
* Start with empty region * Start with empty region
*/ */
mask_region = CreateRectRgn(0, 0, 0, 0); mask_region = CreateRectRgn(0, 0, 0, 0);
SDL_TraverseShapeTree(data->mask_tree,&CombineRectRegions,&mask_region); SDL_TraverseShapeTree(data->mask_tree,&CombineRectRegions,&mask_region);
/* /*
* Set the new region mask for the window * Set the new region mask for the window
*/ */
windowdata=(SDL_WindowData *)(shaper->window->driverdata); windowdata=(SDL_WindowData *)(shaper->window->driverdata);
hwnd = windowdata->hwnd; hwnd = windowdata->hwnd;
SetWindowRgn(hwnd, mask_region, TRUE); SetWindowRgn(hwnd, mask_region, TRUE);
return 0; return 0;
} }
int Win32_ResizeWindowShape(SDL_Window *window) { int
SDL_ShapeData* data; Win32_ResizeWindowShape(SDL_Window *window) {
SDL_ShapeData* data;
if (window == NULL) if (window == NULL)
return -1; return -1;
data = (SDL_ShapeData *)window->shaper->driverdata; data = (SDL_ShapeData *)window->shaper->driverdata;
if (data == NULL) if (data == NULL)
return -1; return -1;
if(data->mask_tree != NULL) if(data->mask_tree != NULL)
SDL_FreeShapeTree(&data->mask_tree); SDL_FreeShapeTree(&data->mask_tree);
window->shaper->usershownflag |= window->flags & SDL_WINDOW_SHOWN; window->shaper->usershownflag |= window->flags & SDL_WINDOW_SHOWN;
return 0; return 0;
} }
src/video/x11/SDL_x11shape.c
View file @ 30693e91
...@@ -25,80 +25,84 @@ ...@@ -25,80 +25,84 @@
#include "SDL_x11shape.h" #include "SDL_x11shape.h"
#include "SDL_x11window.h" #include "SDL_x11window.h"
SDL_Window* X11_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags) { SDL_Window*
return SDL_CreateWindow(title,x,y,w,h,flags); X11_CreateShapedWindow(const char *title,unsigned int x,unsigned int y,unsigned int w,unsigned int h,Uint32 flags) {
return SDL_CreateWindow(title,x,y,w,h,flags);
} }
SDL_WindowShaper* X11_CreateShaper(SDL_Window* window) { SDL_WindowShaper*
SDL_WindowShaper* result = NULL; X11_CreateShaper(SDL_Window* window) {
SDL_WindowShaper* result = NULL;
#if SDL_VIDEO_DRIVER_X11_XSHAPE #if SDL_VIDEO_DRIVER_X11_XSHAPE
if (SDL_X11_HAVE_XSHAPE) { /* Make sure X server supports it. */ if (SDL_X11_HAVE_XSHAPE) { /* Make sure X server supports it. */
result = malloc(sizeof(SDL_WindowShaper)); result = malloc(sizeof(SDL_WindowShaper));
result->window = window; result->window = window;
result->mode.mode = ShapeModeDefault; result->mode.mode = ShapeModeDefault;
result->mode.parameters.binarizationCutoff = 1; result->mode.parameters.binarizationCutoff = 1;
result->usershownflag = 0; result->usershownflag = 0;
SDL_ShapeData* data = malloc(sizeof(SDL_ShapeData)); SDL_ShapeData* data = malloc(sizeof(SDL_ShapeData));
result->driverdata = data; result->driverdata = data;
data->bitmapsize = 0; data->bitmapsize = 0;
data->bitmap = NULL; data->bitmap = NULL;
window->shaper = result; window->shaper = result;
int resized_properly = X11_ResizeWindowShape(window); int resized_properly = X11_ResizeWindowShape(window);
assert(resized_properly == 0); assert(resized_properly == 0);
} }
#endif #endif
return result; return result;
} }
int X11_ResizeWindowShape(SDL_Window* window) { int
SDL_ShapeData* data = window->shaper->driverdata; X11_ResizeWindowShape(SDL_Window* window) {
assert(data != NULL); SDL_ShapeData* data = window->shaper->driverdata;
assert(data != NULL);
unsigned int bitmapsize = window->w / 8;
if(window->w % 8 > 0) unsigned int bitmapsize = window->w / 8;
bitmapsize += 1; if(window->w % 8 > 0)
bitmapsize *= window->h; bitmapsize += 1;
if(data->bitmapsize != bitmapsize || data->bitmap == NULL) { bitmapsize *= window->h;
data->bitmapsize = bitmapsize; if(data->bitmapsize != bitmapsize || data->bitmap == NULL) {
if(data->bitmap != NULL) data->bitmapsize = bitmapsize;
free(data->bitmap); if(data->bitmap != NULL)
data->bitmap = malloc(data->bitmapsize); free(data->bitmap);
if(data->bitmap == NULL) { data->bitmap = malloc(data->bitmapsize);
SDL_SetError("Could not allocate memory for shaped-window bitmap."); if(data->bitmap == NULL) {
return -1; SDL_SetError("Could not allocate memory for shaped-window bitmap.");
} return -1;
} }
memset(data->bitmap,0,data->bitmapsize); }
memset(data->bitmap,0,data->bitmapsize);
window->shaper->usershownflag |= window->flags & SDL_WINDOW_SHOWN;
window->shaper->usershownflag |= window->flags & SDL_WINDOW_SHOWN;
return 0;
return 0;
} }
int X11_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) { int
if(shaper == NULL || shape == NULL || shaper->driverdata == NULL) X11_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) {
return -1; if(shaper == NULL || shape == NULL || shaper->driverdata == NULL)
return -1;
#if SDL_VIDEO_DRIVER_X11_XSHAPE #if SDL_VIDEO_DRIVER_X11_XSHAPE
if(!SDL_ISPIXELFORMAT_ALPHA(SDL_MasksToPixelFormatEnum(shape->format->BitsPerPixel,shape->format->Rmask,shape->format->Gmask,shape->format->Bmask,shape->format->Amask))) if(!SDL_ISPIXELFORMAT_ALPHA(SDL_MasksToPixelFormatEnum(shape->format->BitsPerPixel,shape->format->Rmask,shape->format->Gmask,shape->format->Bmask,shape->format->Amask)))
return -2; return -2;
if(shape->w != shaper->window->w || shape->h != shaper->window->h) if(shape->w != shaper->window->w || shape->h != shaper->window->h)
return -3; return -3;
SDL_ShapeData *data = shaper->driverdata; SDL_ShapeData *data = shaper->driverdata;
/* Assume that shaper->alphacutoff already has a value, because SDL_SetWindowShape() should have given it one. */ /* Assume that shaper->alphacutoff already has a value, because SDL_SetWindowShape() should have given it one. */
SDL_CalculateShapeBitmap(shaper->mode,shape,data->bitmap,8); SDL_CalculateShapeBitmap(shaper->mode,shape,data->bitmap,8);
SDL_WindowData *windowdata = (SDL_WindowData*)(shaper->window->driverdata); SDL_WindowData *windowdata = (SDL_WindowData*)(shaper->window->driverdata);
Pixmap shapemask = XCreateBitmapFromData(windowdata->videodata->display,windowdata->xwindow,data->bitmap,shaper->window->w,shaper->window->h); Pixmap shapemask = XCreateBitmapFromData(windowdata->videodata->display,windowdata->xwindow,data->bitmap,shaper->window->w,shaper->window->h);
XShapeCombineMask(windowdata->videodata->display,windowdata->xwindow, ShapeBounding, 0, 0,shapemask, ShapeSet); XShapeCombineMask(windowdata->videodata->display,windowdata->xwindow, ShapeBounding, 0, 0,shapemask, ShapeSet);
XSync(windowdata->videodata->display,False); XSync(windowdata->videodata->display,False);
XFreePixmap(windowdata->videodata->display,shapemask); XFreePixmap(windowdata->videodata->display,shapemask);
#endif #endif
return 0; return 0;
} }
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