From 57c8f6a4668b1697090f62d9b1703f7d24ee4e5c Mon Sep 17 00:00:00 2001
From: egottlieb <none@none>
Date: Tue, 3 Aug 2010 21:56:05 -0400
Subject: [PATCH] Implemented shaped windows for Cocoa.  Still need to see if
 they actually work.

---
 include/SDL_revision.h           |  1 -
 src/video/cocoa/SDL_cocoashape.m | 28 ++++++++++++++++++++++++++--
 2 files changed, 26 insertions(+), 3 deletions(-)
 delete mode 100644 include/SDL_revision.h

diff --git a/include/SDL_revision.h b/include/SDL_revision.h
deleted file mode 100644
index 60a005bac..000000000
--- a/include/SDL_revision.h
+++ /dev/null
@@ -1 +0,0 @@
-#define SDL_REVISION "hg-4526:d532a5a114cd"
diff --git a/src/video/cocoa/SDL_cocoashape.m b/src/video/cocoa/SDL_cocoashape.m
index 30745c99b..c2baac5e3 100644
--- a/src/video/cocoa/SDL_cocoashape.m
+++ b/src/video/cocoa/SDL_cocoashape.m
@@ -49,6 +49,23 @@ SDL_WindowShaper* Cocoa_CreateShaper(SDL_Window* window) {
 	return result;
 }
 
+typedef struct {
+	NSBezierPath* clipPath;
+	SDL_Window* window;
+} SDL_PathConglomeration;
+
+NSRect convert_rect(SDL_Rect rect,SDL_Window* window) {
+	NSRect nsrect = NSMakeRect(rect.x,window->h-(rect.y+rect.h),rect.w,rect.h);
+	return [[((SDL_WindowData*)window->driverdata)->nswindow contentView] convertRectFromBase:nsrect];
+}
+
+void ConglomerateShapeTree(SDL_ShapeTree* tree,SDL_PathConglomeration cong) {
+	if(tree->kind == OpaqueShape) {
+		NSRect rect = convert_rect(tree->data.shape,cong->window);
+		[cong->clipPath appendBezierPathWithRect:rect];
+	}
+}
+
 int Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) {
 	SDL_ShapeData* data = (SDL_ShapeData*)shaper->driverdata;
 	if(data->saved == SDL_TRUE) {
@@ -59,10 +76,17 @@ int Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowS
 	[data->context saveGraphicsState];
 	data->saved = SDL_TRUE;
 	
-	[[NSColor clearColor] set];
-	NSRectFill([[((SDL_WindowData*)shaper->window->driverdata)->nswindow contentView] frame]);
+	//[[NSColor clearColor] set];
+	//NSRectFill([[((SDL_WindowData*)shaper->window->driverdata)->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. */
+	NSBezierPath* clipPath = [NSBezierPath bezierPath];
+	
+	SDL_PathConglomeration cong = {clipPath,shaper->window};
+	
+	SDL_TraverseShapeTree(data->shape,&ConglomerateShapeTree,cong);
+	
+	[clipPath addClip];
 }
 
 int Cocoa_ResizeWindowShape(SDL_Window *window) {