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.

src/video/cocoa/SDL_cocoashape.m

@@ -24,48 +24,51 @@
 #include "SDL_shape.h"
 #include "SDL_cocoashape.h"
 
-SDL_WindowShaper* Cocoa_CreateShaper(SDL_Window* window) {
-	SDL_WindowData* data = (SDL_WindowData*)window->driverdata;
-	[data->nswindow setAlpha:1.0];
-	[data->nswindow setOpaque:YES];
-	[data->nswindow setStyleMask:NSBorderlessWindowMask];
-	SDL_Shaper* result = result = malloc(sizeof(SDL_WindowShaper));
-	result->window = window;
-	result->mode.mode = ShapeModeDefault;
-	result->mode.parameters.binarizationCutoff = 1;
-	result->usershownflag = 0;
-	window->shaper = result;
-	
-	SDL_ShapeData* data = malloc(sizeof(SDL_ShapeData));
-	result->driverdata = data;
-	data->context = [data->nswindow graphicsContext];
-	data->saved = SDL_False;
-	data->rects = NULL;
-	data->count = 0;
-	
-	int resized_properly = Cocoa_ResizeWindowShape(window);
-	assert(resized_properly == 0);
-	return result;
+SDL_WindowShaper*
+Cocoa_CreateShaper(SDL_Window* window) {
+    SDL_WindowData* data = (SDL_WindowData*)window->driverdata;
+    [data->nswindow setAlpha:1.0];
+    [data->nswindow setOpaque:YES];
+    [data->nswindow setStyleMask:NSBorderlessWindowMask];
+    SDL_Shaper* result = result = malloc(sizeof(SDL_WindowShaper));
+    result->window = window;
+    result->mode.mode = ShapeModeDefault;
+    result->mode.parameters.binarizationCutoff = 1;
+    result->usershownflag = 0;
+    window->shaper = result;
+    
+    SDL_ShapeData* data = malloc(sizeof(SDL_ShapeData));
+    result->driverdata = data;
+    data->context = [data->nswindow graphicsContext];
+    data->saved = SDL_False;
+    data->rects = NULL;
+    data->count = 0;
+    
+    int resized_properly = Cocoa_ResizeWindowShape(window);
+    assert(resized_properly == 0);
+    return result;
 }
 
-int Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) {
-	SDL_WindowData* data = (SDL_WindowData*)shaper->window->driverdata;
-	if(data->saved == SDL_True) {
-		[data->context restoreGraphicsState];
-		data->saved = SDL_False;
-	}
-		
-	[data->context saveGraphicsState];
-	data->saved = SDL_True;
-	
-	[[NSColor clearColor] set];
-	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
+int
+Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) {
+    SDL_WindowData* data = (SDL_WindowData*)shaper->window->driverdata;
+    if(data->saved == SDL_True) {
+        [data->context restoreGraphicsState];
+        data->saved = SDL_False;
+    }
+        
+    [data->context saveGraphicsState];
+    data->saved = SDL_True;
+    
+    [[NSColor clearColor] set];
+    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. */
 }
 
-int Cocoa_ResizeWindowShape(SDL_Window *window) {
-	SDL_ShapeData* data = window->shaper->driverdata;
-	assert(data != NULL);
-	return 0;
+int
+Cocoa_ResizeWindowShape(SDL_Window *window) {
+    SDL_ShapeData* data = window->shaper->driverdata;
+    assert(data != NULL);
+    return 0;
 }

src/video/win32/SDL_win32shape.c

@@ -23,79 +23,83 @@
 #include "SDL_win32shape.h"
 #include "SDL_win32video.h"
 
-SDL_WindowShaper* Win32_CreateShaper(SDL_Window * window) {
-	int resized_properly;
-	SDL_WindowShaper* result = (SDL_WindowShaper *)SDL_malloc(sizeof(SDL_WindowShaper));
-	result->window = window;
-	result->mode.mode = ShapeModeDefault;
-	result->mode.parameters.binarizationCutoff = 1;
-	result->usershownflag = 0;
-	result->driverdata = (SDL_ShapeData*)SDL_malloc(sizeof(SDL_ShapeData));
-	((SDL_ShapeData*)result->driverdata)->mask_tree = NULL;
-	//Put some driver-data here.
-	window->shaper = result;
-	resized_properly = Win32_ResizeWindowShape(window);
-	if (resized_properly != 0)
-			return NULL;
+SDL_WindowShaper*
+Win32_CreateShaper(SDL_Window * window) {
+    int resized_properly;
+    SDL_WindowShaper* result = (SDL_WindowShaper *)SDL_malloc(sizeof(SDL_WindowShaper));
+    result->window = window;
+    result->mode.mode = ShapeModeDefault;
+    result->mode.parameters.binarizationCutoff = 1;
+    result->usershownflag = 0;
+    result->driverdata = (SDL_ShapeData*)SDL_malloc(sizeof(SDL_ShapeData));
+    ((SDL_ShapeData*)result->driverdata)->mask_tree = NULL;
+    //Put some driver-data here.
+    window->shaper = result;
+    resized_properly = Win32_ResizeWindowShape(window);
+    if (resized_properly != 0)
+            return NULL;
 
-	return result;
+    return result;
 }
 
-void CombineRectRegions(SDL_ShapeTree* node, void* closure) {
-	HRGN* mask_region = (HRGN *)closure;
-	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);
-		DeleteObject(temp_region);
-	}
+void
+CombineRectRegions(SDL_ShapeTree* node, void* closure) {
+    HRGN* mask_region = (HRGN *)closure;
+    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);
+        DeleteObject(temp_region);
+    }
 }
 
-int Win32_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) {
-	SDL_ShapeData *data;
-	HRGN mask_region;
+int
+Win32_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) {
+    SDL_ShapeData *data;
+    HRGN mask_region;
     SDL_WindowData *windowdata;
     HWND hwnd;
 
-	if (shaper == NULL || shape == NULL)
-		return SDL_INVALID_SHAPE_ARGUMENT;
-	if(shape->format->Amask == 0 && shapeMode->mode != ShapeModeColorKey || shape->w != shaper->window->w || shape->h != shaper->window->h)
-		return SDL_INVALID_SHAPE_ARGUMENT;
-	
-	data = (SDL_ShapeData*)shaper->driverdata;
-	if(data->mask_tree != NULL)
-		SDL_FreeShapeTree(&data->mask_tree);
-	data->mask_tree = SDL_CalculateShapeTree(*shapeMode,shape,SDL_FALSE);
-	
-	/*
-	 * Start with empty region 
-	 */
-	mask_region = CreateRectRgn(0, 0, 0, 0);
-	
-	SDL_TraverseShapeTree(data->mask_tree,&CombineRectRegions,&mask_region);
-	
-	/*
-	 * Set the new region mask for the window 
-	 */
-	windowdata=(SDL_WindowData *)(shaper->window->driverdata);
-	hwnd = windowdata->hwnd;
-	SetWindowRgn(hwnd, mask_region, TRUE);
-	
-	return 0;
+    if (shaper == NULL || shape == NULL)
+        return SDL_INVALID_SHAPE_ARGUMENT;
+    if(shape->format->Amask == 0 && shapeMode->mode != ShapeModeColorKey || shape->w != shaper->window->w || shape->h != shaper->window->h)
+        return SDL_INVALID_SHAPE_ARGUMENT;
+    
+    data = (SDL_ShapeData*)shaper->driverdata;
+    if(data->mask_tree != NULL)
+        SDL_FreeShapeTree(&data->mask_tree);
+    data->mask_tree = SDL_CalculateShapeTree(*shapeMode,shape,SDL_FALSE);
+    
+    /*
+     * Start with empty region 
+     */
+    mask_region = CreateRectRgn(0, 0, 0, 0);
+    
+    SDL_TraverseShapeTree(data->mask_tree,&CombineRectRegions,&mask_region);
+    
+    /*
+     * Set the new region mask for the window 
+     */
+    windowdata=(SDL_WindowData *)(shaper->window->driverdata);
+    hwnd = windowdata->hwnd;
+    SetWindowRgn(hwnd, mask_region, TRUE);
+    
+    return 0;
 }
 
-int Win32_ResizeWindowShape(SDL_Window *window) {
-	SDL_ShapeData* data;
+int
+Win32_ResizeWindowShape(SDL_Window *window) {
+    SDL_ShapeData* data;
 
-	if (window == NULL)
-		return -1;
-	data = (SDL_ShapeData *)window->shaper->driverdata;
-	if (data == NULL)
-		return -1;
-	
-	if(data->mask_tree != NULL)
-		SDL_FreeShapeTree(&data->mask_tree);
-	
-	window->shaper->usershownflag |= window->flags & SDL_WINDOW_SHOWN;
-	
-	return 0;
+    if (window == NULL)
+        return -1;
+    data = (SDL_ShapeData *)window->shaper->driverdata;
+    if (data == NULL)
+        return -1;
+    
+    if(data->mask_tree != NULL)
+        SDL_FreeShapeTree(&data->mask_tree);
+    
+    window->shaper->usershownflag |= window->flags & SDL_WINDOW_SHOWN;
+    
+    return 0;
 }

src/video/x11/SDL_x11shape.c

@@ -25,80 +25,84 @@
 #include "SDL_x11shape.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) {
-	return SDL_CreateWindow(title,x,y,w,h,flags);
+SDL_Window*
+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* result = NULL;
+SDL_WindowShaper* 
+X11_CreateShaper(SDL_Window* window) {
+    SDL_WindowShaper* result = NULL;
 
 #if SDL_VIDEO_DRIVER_X11_XSHAPE
-	if (SDL_X11_HAVE_XSHAPE) {  /* Make sure X server supports it. */
-		result = malloc(sizeof(SDL_WindowShaper));
-		result->window = window;
-		result->mode.mode = ShapeModeDefault;
-		result->mode.parameters.binarizationCutoff = 1;
-		result->usershownflag = 0;
-		SDL_ShapeData* data = malloc(sizeof(SDL_ShapeData));
-		result->driverdata = data;
-		data->bitmapsize = 0;
-		data->bitmap = NULL;
-		window->shaper = result;
-		int resized_properly = X11_ResizeWindowShape(window);
-		assert(resized_properly == 0);
-	}
+    if (SDL_X11_HAVE_XSHAPE) {  /* Make sure X server supports it. */
+        result = malloc(sizeof(SDL_WindowShaper));
+        result->window = window;
+        result->mode.mode = ShapeModeDefault;
+        result->mode.parameters.binarizationCutoff = 1;
+        result->usershownflag = 0;
+        SDL_ShapeData* data = malloc(sizeof(SDL_ShapeData));
+        result->driverdata = data;
+        data->bitmapsize = 0;
+        data->bitmap = NULL;
+        window->shaper = result;
+        int resized_properly = X11_ResizeWindowShape(window);
+        assert(resized_properly == 0);
+    }
 #endif
 
-	return result;
+    return result;
 }
 
-int X11_ResizeWindowShape(SDL_Window* window) {
-	SDL_ShapeData* data = window->shaper->driverdata;
-	assert(data != NULL);
-	
-	unsigned int bitmapsize = window->w / 8;
-	if(window->w % 8 > 0)
-		bitmapsize += 1;
-	bitmapsize *= window->h;
-	if(data->bitmapsize != bitmapsize || data->bitmap == NULL) {
-		data->bitmapsize = bitmapsize;
-		if(data->bitmap != NULL)
-			free(data->bitmap);
-		data->bitmap = malloc(data->bitmapsize);
-		if(data->bitmap == NULL) {
-			SDL_SetError("Could not allocate memory for shaped-window bitmap.");
-			return -1;
-		}
-	}
-	memset(data->bitmap,0,data->bitmapsize);
-	
-	window->shaper->usershownflag |= window->flags & SDL_WINDOW_SHOWN;
-	
-	return 0;
+int 
+X11_ResizeWindowShape(SDL_Window* window) {
+    SDL_ShapeData* data = window->shaper->driverdata;
+    assert(data != NULL);
+    
+    unsigned int bitmapsize = window->w / 8;
+    if(window->w % 8 > 0)
+        bitmapsize += 1;
+    bitmapsize *= window->h;
+    if(data->bitmapsize != bitmapsize || data->bitmap == NULL) {
+        data->bitmapsize = bitmapsize;
+        if(data->bitmap != NULL)
+            free(data->bitmap);
+        data->bitmap = malloc(data->bitmapsize);
+        if(data->bitmap == NULL) {
+            SDL_SetError("Could not allocate memory for shaped-window bitmap.");
+            return -1;
+        }
+    }
+    memset(data->bitmap,0,data->bitmapsize);
+    
+    window->shaper->usershownflag |= window->flags & SDL_WINDOW_SHOWN;
+    
+    return 0;
 }
-	
-int X11_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) {
-	if(shaper == NULL || shape == NULL || shaper->driverdata == NULL)
-		return -1;
+    
+int 
+X11_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) {
+    if(shaper == NULL || shape == NULL || shaper->driverdata == NULL)
+        return -1;
 
 #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)))
-		return -2;
-	if(shape->w != shaper->window->w || shape->h != shaper->window->h)
-		return -3;
-	SDL_ShapeData *data = shaper->driverdata;
-	
-	/* 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_WindowData *windowdata = (SDL_WindowData*)(shaper->window->driverdata);
-	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);
-	XSync(windowdata->videodata->display,False);
+    if(!SDL_ISPIXELFORMAT_ALPHA(SDL_MasksToPixelFormatEnum(shape->format->BitsPerPixel,shape->format->Rmask,shape->format->Gmask,shape->format->Bmask,shape->format->Amask)))
+        return -2;
+    if(shape->w != shaper->window->w || shape->h != shaper->window->h)
+        return -3;
+    SDL_ShapeData *data = shaper->driverdata;
+    
+    /* 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_WindowData *windowdata = (SDL_WindowData*)(shaper->window->driverdata);
+    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);
+    XSync(windowdata->videodata->display,False);
 
-	XFreePixmap(windowdata->videodata->display,shapemask);
+    XFreePixmap(windowdata->videodata->display,shapemask);
 #endif
 
-	return 0;
+    return 0;
 }