Improving Cocoa implementation and fixed a small bug in SDL_shape.c.

libsdl-org · Aug 5, 2010 · 55566a8 · 55566a8
1 parent 2be3ec9
commit 55566a8
Show file tree

Hide file tree

Showing 62 changed files with 19 additions and 12 deletions.
diff --git a/VisualC/SDL_VS2010.sdf b/VisualC/SDL_VS2010.sdf
diff --git a/src/video/SDL_shape.c b/src/video/SDL_shape.c
@@ -242,7 +242,7 @@ int SDL_SetWindowShape(SDL_Window *window,SDL_Surface *shape,SDL_WindowShapeMode
 }
 
 SDL_bool SDL_WindowHasAShape(SDL_Window *window) {
-	if (window == NULL && !SDL_IsShapedWindow(window))
+	if (window == NULL || !SDL_IsShapedWindow(window))
 		return SDL_FALSE;
 	return window->shaper->hasshape;
 }

diff --git a/src/video/cocoa/SDL_cocoashape.m b/src/video/cocoa/SDL_cocoashape.m
@@ -29,8 +29,8 @@
 
 SDL_WindowShaper* Cocoa_CreateShaper(SDL_Window* window) {
 	SDL_WindowData* data = (SDL_WindowData*)window->driverdata;
-	[data->nswindow setAlphaValue:1.0];
-	[data->nswindow setOpaque:YES];
+	[data->nswindow setOpaque:NO];
+	[data->nswindow setBackgroundColor:[NSColor clearColor]];
 	[data->nswindow setStyleMask:NSBorderlessWindowMask];
 	SDL_WindowShaper* result = SDL_malloc(sizeof(SDL_WindowShaper));
 	result->window = window;
@@ -42,6 +42,7 @@
 	SDL_ShapeData* shape_data = SDL_malloc(sizeof(SDL_ShapeData));
 	result->driverdata = shape_data;
 	shape_data->context = [data->nswindow graphicsContext];
+	SDL_assert(shape_data->context != NULL);
 	shape_data->saved = SDL_FALSE;
 	shape_data->shape = NULL;
 
@@ -70,26 +71,32 @@ void ConglomerateShapeTree(SDL_ShapeTree* tree,SDL_PathConglomeration* cong) {
 
 int Cocoa_SetWindowShape(SDL_WindowShaper *shaper,SDL_Surface *shape,SDL_WindowShapeMode *shapeMode) {
 	SDL_ShapeData* data = (SDL_ShapeData*)shaper->driverdata;
-	if(data->saved == SDL_TRUE) {
+	/* if(data->saved == SDL_TRUE) {
 		[data->context restoreGraphicsState];
 		data->saved = SDL_FALSE;
-	}
+	}*/
 
-	[data->context saveGraphicsState];
-	data->saved = SDL_TRUE;
+	/*[data->context saveGraphicsState];
+	data->saved = SDL_TRUE;*/
+
+	[NSGraphicsContext saveGraphicsState];
+
+	[NSGraphicsContext setCurrentContext:data->context];
+	SDL_WindowData* window_data = (SDL_WindowData*)shaper->window->driverdata;
 
-	//[[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. */
 	data->shape = SDL_CalculateShapeTree(*shapeMode,shape,SDL_FALSE);
-	NSBezierPath* clipPath = [NSBezierPath bezierPath];
+	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+	NSBezierPath* clipPath = [[NSBezierPath bezierPath] autorelease];
 
 	SDL_PathConglomeration cong = {clipPath,shaper->window};
 
 	SDL_TraverseShapeTree(data->shape,(SDL_TraversalFunction)&ConglomerateShapeTree,(void*)&cong);
 
+	SDL_assert([NSGraphicsContext currentContext] != NULL);
 	[clipPath addClip];
+
+	[NSGraphicsContext restoreGraphicsState];
+	[pool release];
 }
 
 int Cocoa_ResizeWindowShape(SDL_Window *window) {

diff --git a/test/shapes/p01_shape24.png b/test/shapes/p01_shape24.png
diff --git a/test/shapes/p01_shape32alpha.png b/test/shapes/p01_shape32alpha.png
diff --git a/test/shapes/p01_shape8.png b/test/shapes/p01_shape8.png
diff --git a/test/shapes/p01_shape8alpha.png b/test/shapes/p01_shape8alpha.png
diff --git a/test/shapes/p02_shape24.png b/test/shapes/p02_shape24.png
diff --git a/test/shapes/p02_shape32alpha.png b/test/shapes/p02_shape32alpha.png
diff --git a/test/shapes/p02_shape8.png b/test/shapes/p02_shape8.png
diff --git a/test/shapes/p02_shape8alpha.png b/test/shapes/p02_shape8alpha.png
diff --git a/test/shapes/p03_shape24.png b/test/shapes/p03_shape24.png
diff --git a/test/shapes/p03_shape8.png b/test/shapes/p03_shape8.png
diff --git a/test/shapes/p04_shape1.png b/test/shapes/p04_shape1.png
diff --git a/test/shapes/p04_shape24.png b/test/shapes/p04_shape24.png
diff --git a/test/shapes/p04_shape32alpha.png b/test/shapes/p04_shape32alpha.png
diff --git a/test/shapes/p04_shape8.png b/test/shapes/p04_shape8.png
diff --git a/test/shapes/p05_shape8.png b/test/shapes/p05_shape8.png
diff --git a/test/shapes/p06_shape1alpha.png b/test/shapes/p06_shape1alpha.png
diff --git a/test/shapes/p06_shape24.png b/test/shapes/p06_shape24.png
diff --git a/test/shapes/p06_shape32alpha.png b/test/shapes/p06_shape32alpha.png
diff --git a/test/shapes/p06_shape8.png b/test/shapes/p06_shape8.png
diff --git a/test/shapes/p06_shape8alpha.png b/test/shapes/p06_shape8alpha.png
diff --git a/test/shapes/p07_shape1alpha.png b/test/shapes/p07_shape1alpha.png
diff --git a/test/shapes/p07_shape24.png b/test/shapes/p07_shape24.png
diff --git a/test/shapes/p07_shape32alpha.png b/test/shapes/p07_shape32alpha.png
diff --git a/test/shapes/p07_shape8.png b/test/shapes/p07_shape8.png
diff --git a/test/shapes/p07_shape8alpha.png b/test/shapes/p07_shape8alpha.png
diff --git a/test/shapes/p08_shape1alpha.png b/test/shapes/p08_shape1alpha.png
diff --git a/test/shapes/p08_shape24.png b/test/shapes/p08_shape24.png
diff --git a/test/shapes/p08_shape32alpha.png b/test/shapes/p08_shape32alpha.png
diff --git a/test/shapes/p08_shape8.png b/test/shapes/p08_shape8.png
diff --git a/test/shapes/p08_shape8alpha.png b/test/shapes/p08_shape8alpha.png
diff --git a/test/shapes/p09_shape24.png b/test/shapes/p09_shape24.png
diff --git a/test/shapes/p09_shape32alpha.png b/test/shapes/p09_shape32alpha.png
diff --git a/test/shapes/p09_shape8.png b/test/shapes/p09_shape8.png
diff --git a/test/shapes/p09_shape8alpha.png b/test/shapes/p09_shape8alpha.png
diff --git a/test/shapes/p10_shape1.png b/test/shapes/p10_shape1.png
diff --git a/test/shapes/p10_shape1alpha.png b/test/shapes/p10_shape1alpha.png
diff --git a/test/shapes/p10_shape24.png b/test/shapes/p10_shape24.png
diff --git a/test/shapes/p10_shape32alpha.png b/test/shapes/p10_shape32alpha.png
diff --git a/test/shapes/p10_shape8.png b/test/shapes/p10_shape8.png
diff --git a/test/shapes/p10_shape8alpha.png b/test/shapes/p10_shape8alpha.png
diff --git a/test/shapes/p11_shape24.png b/test/shapes/p11_shape24.png
diff --git a/test/shapes/p11_shape32alpha.png b/test/shapes/p11_shape32alpha.png
diff --git a/test/shapes/p11_shape8.png b/test/shapes/p11_shape8.png
diff --git a/test/shapes/p11_shape8alpha.png b/test/shapes/p11_shape8alpha.png
diff --git a/test/shapes/p12_shape24.png b/test/shapes/p12_shape24.png
diff --git a/test/shapes/p12_shape8.png b/test/shapes/p12_shape8.png
diff --git a/test/shapes/p13_shape24.png b/test/shapes/p13_shape24.png
diff --git a/test/shapes/p13_shape32alpha.png b/test/shapes/p13_shape32alpha.png
diff --git a/test/shapes/p13_shape8.png b/test/shapes/p13_shape8.png
diff --git a/test/shapes/p13_shape8alpha.png b/test/shapes/p13_shape8alpha.png
diff --git a/test/shapes/p14_shape24.png b/test/shapes/p14_shape24.png
diff --git a/test/shapes/p14_shape8.png b/test/shapes/p14_shape8.png
diff --git a/test/shapes/p15_shape24.png b/test/shapes/p15_shape24.png
diff --git a/test/shapes/p15_shape32alpha.png b/test/shapes/p15_shape32alpha.png
diff --git a/test/shapes/p15_shape8.png b/test/shapes/p15_shape8.png
diff --git a/test/shapes/p15_shape8alpha.png b/test/shapes/p15_shape8alpha.png
diff --git a/test/shapes/p16_shape1.png b/test/shapes/p16_shape1.png
diff --git a/test/shapes/p16_shape24.png b/test/shapes/p16_shape24.png
diff --git a/test/shapes/p16_shape8.png b/test/shapes/p16_shape8.png