1 files changed, 235 insertions, 233 deletions

diff --git a/frontends/cocoa/plotter.m b/frontends/cocoa/plotter.m
index e4659ef80..f02f7727b 100644
--- a/frontends/cocoa/plotter.m
+++ b/frontends/cocoa/plotter.m
@@ -28,304 +28,306 @@
 #import "cocoa/plotter.h"
 #import "cocoa/bitmap.h"
 
-static void cocoa_plot_render_path(NSBezierPath *path,const plot_style_t *pstyle);
-static void cocoa_plot_path_set_stroke_pattern(NSBezierPath *path,const plot_style_t *pstyle);
-static inline void cocoa_center_pixel( bool x, bool y );
+static void cocoa_plot_render_path(NSBezierPath *path, const plot_style_t *pstyle);
+static void cocoa_plot_path_set_stroke_pattern(NSBezierPath *path, const plot_style_t *pstyle);
+static inline void cocoa_center_pixel(bool x, bool y);
 
 static NSRect cocoa_plot_clip_rect;
 
-#define colour_red_component( c )		(((c) >>  0) & 0xFF)
-#define colour_green_component( c )		(((c) >>  8) & 0xFF)
-#define colour_blue_component( c )		(((c) >> 16) & 0xFF)
-#define colour_alpha_component( c )		(((c) >> 24) & 0xFF)
-#define colour_from_rgba( r, g, b, a)	((((colour)(r)) <<  0) | \
-										 (((colour)(g)) <<  8) | \
-										 (((colour)(b)) << 16) | \
-										 (((colour)(a)) << 24))
-#define colour_from_rgb( r, g, b ) colour_from_rgba( (r), (g), (b), 0xFF )
-
-NSColor *cocoa_convert_colour( colour clr )
+#define colour_red_component(c) (((c) >> 0) & 0xFF)
+#define colour_green_component(c) (((c) >> 8) & 0xFF)
+#define colour_blue_component(c) (((c) >> 16) & 0xFF)
+#define colour_alpha_component(c) (((c) >> 24) & 0xFF)
+#define colour_from_rgba(r, g, b, a) ((((colour)(r)) << 0) | (((colour)(g)) << 8) | (((colour)(b)) << 16) | (((colour)(a)) << 24))
+#define colour_from_rgb(r, g, b) colour_from_rgba((r), (g), (b), 0xFF)
+
+NSColor *cocoa_convert_colour(colour clr)
 {
-	return [NSColor colorWithDeviceRed: (float)colour_red_component( clr ) / 0xFF 
-								 green: (float)colour_green_component( clr ) / 0xFF 
-								  blue: (float)colour_blue_component( clr ) / 0xFF 
-								 alpha: 1.0];
+    return [NSColor colorWithDeviceRed:(float)colour_red_component(clr) / 0xFF
+                                 green:(float)colour_green_component(clr) / 0xFF
+                                  blue:(float)colour_blue_component(clr) / 0xFF
+                                 alpha:1.0];
 }
 
-static void cocoa_plot_path_set_stroke_pattern(NSBezierPath *path,const plot_style_t *pstyle) 
+static void cocoa_plot_path_set_stroke_pattern(NSBezierPath *path, const plot_style_t *pstyle)
 {
-	static const CGFloat dashed_pattern[2] = { 5.0, 2.0 };
-	static const CGFloat dotted_pattern[2] = { 2.0, 2.0 };
-	
-	switch (pstyle->stroke_type) {
-		case PLOT_OP_TYPE_DASH: 
-			[path setLineDash: dashed_pattern count: 2 phase: 0];
-			break;
-			
-		case PLOT_OP_TYPE_DOT: 
-			[path setLineDash: dotted_pattern count: 2 phase: 0];
-			break;
-			
-		default:
-			// ignore
-			break;
-	}
-
-	[path setLineWidth: cocoa_px_to_pt( pstyle->stroke_width > 0 ? pstyle->stroke_width : 1 )];
+    static const CGFloat dashed_pattern[2] = { 5.0, 2.0 };
+    static const CGFloat dotted_pattern[2] = { 2.0, 2.0 };
+
+    switch (pstyle->stroke_type) {
+    case PLOT_OP_TYPE_DASH:
+        [path setLineDash:dashed_pattern count:2 phase:0];
+        break;
+
+    case PLOT_OP_TYPE_DOT:
+        [path setLineDash:dotted_pattern count:2 phase:0];
+        break;
+
+    default:
+        // ignore
+        break;
+    }
+
+    [path setLineWidth:cocoa_px_to_pt(pstyle->stroke_width > 0 ? pstyle->stroke_width : 1)];
 }
 
 static nserror plot_line(const struct redraw_context *ctx, const plot_style_t *pstyle, const struct rect *line)
 {
-	if (pstyle->stroke_type == PLOT_OP_TYPE_NONE) return true;
-	
-	[NSGraphicsContext saveGraphicsState];
-	[NSBezierPath clipRect: cocoa_plot_clip_rect];
-	
-	NSBezierPath *path = [NSBezierPath bezierPath];
-	[path moveToPoint: cocoa_point( line->x0, line->y0 )];
-	[path lineToPoint: cocoa_point( line->x1, line->y1 )];
-	cocoa_plot_path_set_stroke_pattern( path, pstyle );
-	
-	const bool horizontal = y0 == y1;
-	const bool vertical = line->x0 == line->x1;
-	const bool oddThickness = pstyle->stroke_width != 0 ? (pstyle->stroke_width % 2) != 0 : true;
-	
-	if (oddThickness) cocoa_center_pixel( !horizontal, !vertical );
-	
-	[cocoa_convert_colour( pstyle->stroke_colour ) set];
-	[path stroke];
-	
-	[NSGraphicsContext restoreGraphicsState];
-	
-	return NSERROR_OK;
+    if (pstyle->stroke_type == PLOT_OP_TYPE_NONE)
+        return true;
+
+    [NSGraphicsContext saveGraphicsState];
+    [NSBezierPath clipRect:cocoa_plot_clip_rect];
+
+    NSBezierPath *path = [NSBezierPath bezierPath];
+    [path moveToPoint:cocoa_point(line->x0, line->y0)];
+    [path lineToPoint:cocoa_point(line->x1, line->y1)];
+    cocoa_plot_path_set_stroke_pattern(path, pstyle);
+
+    const bool horizontal = y0 == y1;
+    const bool vertical = line->x0 == line->x1;
+    const bool oddThickness = pstyle->stroke_width != 0 ? (pstyle->stroke_width % 2) != 0 : true;
+
+    if (oddThickness)
+        cocoa_center_pixel(!horizontal, !vertical);
+
+    [cocoa_convert_colour(pstyle->stroke_colour) set];
+    [path stroke];
+
+    [NSGraphicsContext restoreGraphicsState];
+
+    return NSERROR_OK;
 }
 
 static nserror plot_rectangle(const struct redraw_context *ctx, const plot_style_t *pstyle, const struct rect *r)
 {
-	NSRect rect = cocoa_rect( r->x0, r->y0, r->x1, r->y1 );
-	NSBezierPath *path = [NSBezierPath bezierPathWithRect: rect];
-	cocoa_plot_render_path( path, pstyle );
-	
-	return NSERROR_OK;
+    NSRect rect = cocoa_rect(r->x0, r->y0, r->x1, r->y1);
+    NSBezierPath *path = [NSBezierPath bezierPathWithRect:rect];
+    cocoa_plot_render_path(path, pstyle);
+
+    return NSERROR_OK;
 }
 
 static nserror plot_text(const struct redraw_context *ctx, const plot_font_style_t *fstyle, int x, int y, const char *text, size_t length)
 {
-	[NSGraphicsContext saveGraphicsState];
-	[NSBezierPath clipRect: cocoa_plot_clip_rect];
-	
-	cocoa_draw_string( cocoa_px_to_pt( x ), cocoa_px_to_pt( y ), text, length, fstyle );
-	
-	[NSGraphicsContext restoreGraphicsState];
-	
-	return NSERROR_OK;
+    [NSGraphicsContext saveGraphicsState];
+    [NSBezierPath clipRect:cocoa_plot_clip_rect];
+
+    cocoa_draw_string(cocoa_px_to_pt(x), cocoa_px_to_pt(y), text, length, fstyle);
+
+    [NSGraphicsContext restoreGraphicsState];
+
+    return NSERROR_OK;
 }
 
-void cocoa_set_clip( NSRect rect )
+void cocoa_set_clip(NSRect rect)
 {
-	cocoa_plot_clip_rect = rect;
+    cocoa_plot_clip_rect = rect;
 }
 
 static nserror plot_clip(const struct redraw_context *ctx, const struct rect *clip)
 {
-	cocoa_plot_clip_rect = cocoa_rect( clip->x0, clip->y0, clip->x1, clip->y1 );
-	return NSERROR_OK;
+    cocoa_plot_clip_rect = cocoa_rect(clip->x0, clip->y0, clip->x1, clip->y1);
+    return NSERROR_OK;
 }
 
-void cocoa_plot_render_path(NSBezierPath *path,const plot_style_t *pstyle) 
+void cocoa_plot_render_path(NSBezierPath *path, const plot_style_t *pstyle)
 {
-	[NSGraphicsContext saveGraphicsState];
-	[NSBezierPath clipRect: cocoa_plot_clip_rect];
-	
-	if (pstyle->fill_type != PLOT_OP_TYPE_NONE) {
-		[cocoa_convert_colour( pstyle->fill_colour ) setFill];
-		[path fill];
-	}
-	
-	if (pstyle->stroke_type != PLOT_OP_TYPE_NONE) {
-		if (pstyle->stroke_width == 0 || pstyle->stroke_width % 2 != 0) cocoa_center_pixel( true, true );
-		
-		cocoa_plot_path_set_stroke_pattern(path,pstyle);
-		
-		[cocoa_convert_colour( pstyle->stroke_colour ) set];
-		
-		[path stroke];
-	}
-	
-	[NSGraphicsContext restoreGraphicsState];
+    [NSGraphicsContext saveGraphicsState];
+    [NSBezierPath clipRect:cocoa_plot_clip_rect];
+
+    if (pstyle->fill_type != PLOT_OP_TYPE_NONE) {
+        [cocoa_convert_colour(pstyle->fill_colour) setFill];
+        [path fill];
+    }
+
+    if (pstyle->stroke_type != PLOT_OP_TYPE_NONE) {
+        if (pstyle->stroke_width == 0 || pstyle->stroke_width % 2 != 0)
+            cocoa_center_pixel(true, true);
+
+        cocoa_plot_path_set_stroke_pattern(path, pstyle);
+
+        [cocoa_convert_colour(pstyle->stroke_colour) set];
+
+        [path stroke];
+    }
+
+    [NSGraphicsContext restoreGraphicsState];
 }
 
 static nserror plot_arc(const struct redraw_context *ctx, const plot_style_t *pstyle, int x, int y, int radius, int angle1, int angle2)
 {
-	NSBezierPath *path = [NSBezierPath bezierPath];
-	[path appendBezierPathWithArcWithCenter: NSMakePoint( x, y ) radius: radius 
-								 startAngle: angle1 endAngle: angle2 
-								  clockwise: NO];
-	
-	cocoa_plot_render_path( path, pstyle);
-	
-	return NSERROR_OK;
+    NSBezierPath *path = [NSBezierPath bezierPath];
+    [path appendBezierPathWithArcWithCenter:NSMakePoint(x, y)
+                                     radius:radius
+                                 startAngle:angle1
+                                   endAngle:angle2
+                                  clockwise:NO];
+
+    cocoa_plot_render_path(path, pstyle);
+
+    return NSERROR_OK;
 }
 
 static nserror plot_disc(const struct redraw_context *ctx, const plot_style_t *pstyle, int x, int y, int radius)
 {
-	NSBezierPath *path  = [NSBezierPath bezierPathWithOvalInRect: 
-						   NSMakeRect( x - radius, y-radius, 2*radius, 2*radius )];
-	
-	cocoa_plot_render_path( path, pstyle );
-	
-	return NSERROR_OK;
+    NSBezierPath *path = [NSBezierPath bezierPathWithOvalInRect:
+                                           NSMakeRect(x - radius, y - radius, 2 * radius, 2 * radius)];
+
+    cocoa_plot_render_path(path, pstyle);
+
+    return NSERROR_OK;
 }
 
 static nserror plot_polygon(const struct redraw_context *ctx, const plot_style_t *pstyle, const int *p, unsigned int n)
 {
-	if (n <= 1) return NSERROR_OK;
-	
-	NSBezierPath *path = [NSBezierPath bezierPath];
-	[path moveToPoint: cocoa_point( p[0], p[1] )];
-	for (unsigned i = 1; i < n; i++) {
-		[path lineToPoint: cocoa_point( p[2*i], p[2*i+1] )];
-	}
-	[path closePath];
-	
-	cocoa_plot_render_path( path, pstyle );
-	
-	return NSERROR_OK;
+    if (n <= 1)
+        return NSERROR_OK;
+
+    NSBezierPath *path = [NSBezierPath bezierPath];
+    [path moveToPoint:cocoa_point(p[0], p[1])];
+    for (unsigned i = 1; i < n; i++) {
+        [path lineToPoint:cocoa_point(p[2 * i], p[2 * i + 1])];
+    }
+    [path closePath];
+
+    cocoa_plot_render_path(path, pstyle);
+
+    return NSERROR_OK;
 }
 
 /* complex path (for SVG) */
 static nserror plot_path(const struct redraw_context *ctx, const plot_style_t *pstyle, const float *p, unsigned int n, float width, const float transform[6])
 {
-	if (n == 0) return NSERROR_OK;
-	
-	if (*p != PLOTTER_PATH_MOVE) {
-		LOG("Path does not start with move");
-		return NSERROR_INVALID;
-	}
-	
-	NSBezierPath *path = [NSBezierPath bezierPath];
+    if (n == 0)
+        return NSERROR_OK;
+
+    if (*p != PLOTTER_PATH_MOVE) {
+        LOG("Path does not start with move");
+        return NSERROR_INVALID;
+    }
+
+    NSBezierPath *path = [NSBezierPath bezierPath];
 
 #define NEXT_POINT() ({ const float *c = p; p += 2; NSMakePoint( c[0], c[1] ); })
-	
-	while (n--) {
-		switch ((int)*p++) {
-			case PLOTTER_PATH_MOVE: {
-				const NSPoint pt = NEXT_POINT();
-				[path moveToPoint: pt];
-				break;
-			}
-				
-			case PLOTTER_PATH_LINE: {
-				const NSPoint pt = NEXT_POINT();
-				[path lineToPoint: pt];
-				break;
-			}
-				
-			case PLOTTER_PATH_BEZIER: {
-				const NSPoint cp1 = NEXT_POINT();
-				const NSPoint cp2 = NEXT_POINT();
-				const NSPoint ep = NEXT_POINT();
-				[path curveToPoint: ep controlPoint1: cp1 controlPoint2: cp2];
-				break;
-			}
-				
-			case PLOTTER_PATH_CLOSE:
-				[path closePath];
-				break;
-				
-			default:
-				LOG("Invalid path");
-				return NSERROR_INVALID;
-		}
-	}
-	
+
+    while (n--) {
+        switch ((int)*p++) {
+        case PLOTTER_PATH_MOVE: {
+            const NSPoint pt = NEXT_POINT();
+            [path moveToPoint:pt];
+            break;
+        }
+
+        case PLOTTER_PATH_LINE: {
+            const NSPoint pt = NEXT_POINT();
+            [path lineToPoint:pt];
+            break;
+        }
+
+        case PLOTTER_PATH_BEZIER: {
+            const NSPoint cp1 = NEXT_POINT();
+            const NSPoint cp2 = NEXT_POINT();
+            const NSPoint ep = NEXT_POINT();
+            [path curveToPoint:ep controlPoint1:cp1 controlPoint2:cp2];
+            break;
+        }
+
+        case PLOTTER_PATH_CLOSE:
+            [path closePath];
+            break;
+
+        default:
+            LOG("Invalid path");
+            return NSERROR_INVALID;
+        }
+    }
+
 #undef NEXT_POINT
-	
-	[path setLineWidth: width];
-
-	CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort];
-	CGContextSaveGState( context );
-	
-	CGContextClipToRect( context, NSRectToCGRect( cocoa_plot_clip_rect ) );
-	
-	CGContextConcatCTM( context, CGAffineTransformMake( transform[0], transform[1], transform[2], 
-													    transform[3], transform[4], transform[5] ) );
-	
-	if (pstyle->fill_colour != NS_TRANSPARENT) {
-		[cocoa_convert_colour(pstyle->fill_colour) setFill];
-		[path fill];
-	}
-
-	if (pstyle->stroke_colour != NS_TRANSPARENT) {
-		cocoa_center_pixel( true, true );
-		[cocoa_convert_colour( pstyle->stroke_colour ) set];
-		[path stroke];
-	}
-	
-	CGContextRestoreGState( context );
-
-	return true;
+
+    [path setLineWidth:width];
+
+    CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort];
+    CGContextSaveGState(context);
+
+    CGContextClipToRect(context, NSRectToCGRect(cocoa_plot_clip_rect));
+
+    CGContextConcatCTM(context, CGAffineTransformMake(transform[0], transform[1], transform[2], transform[3], transform[4], transform[5]));
+
+    if (pstyle->fill_colour != NS_TRANSPARENT) {
+        [cocoa_convert_colour(pstyle->fill_colour) setFill];
+        [path fill];
+    }
+
+    if (pstyle->stroke_colour != NS_TRANSPARENT) {
+        cocoa_center_pixel(true, true);
+        [cocoa_convert_colour(pstyle->stroke_colour) set];
+        [path stroke];
+    }
+
+    CGContextRestoreGState(context);
+
+    return true;
 }
 
 /* Image */
 static nserror plot_bitmap(const struct redraw_context *ctx, struct bitmap *bitmap, int x, int y, int width, int height, colour bg, bitmap_flags_t flags)
 {
-	CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort];
-	CGContextSaveGState( context );
-
-	CGContextClipToRect( context, NSRectToCGRect( cocoa_plot_clip_rect ) );
-	
-	const bool tileX = flags & BITMAPF_REPEAT_X;
-	const bool tileY = flags & BITMAPF_REPEAT_Y;
-
-	CGImageRef img = cocoa_get_cgimage( bitmap );
-
-	CGRect rect = NSRectToCGRect( cocoa_rect_wh( x, y, width, height ) );
-	
-	if (tileX || tileY) {
-		CGContextDrawTiledImage( context, rect, img );
-	} else {
-		CGContextDrawImage( context, rect, img );
-	}
-	
-	CGContextRestoreGState( context );
-	
-	return NSERROR_OK;
+    CGContextRef context = [[NSGraphicsContext currentContext] graphicsPort];
+    CGContextSaveGState(context);
+
+    CGContextClipToRect(context, NSRectToCGRect(cocoa_plot_clip_rect));
+
+    const bool tileX = flags & BITMAPF_REPEAT_X;
+    const bool tileY = flags & BITMAPF_REPEAT_Y;
+
+    CGImageRef img = cocoa_get_cgimage(bitmap);
+
+    CGRect rect = NSRectToCGRect(cocoa_rect_wh(x, y, width, height));
+
+    if (tileX || tileY) {
+        CGContextDrawTiledImage(context, rect, img);
+    } else {
+        CGContextDrawImage(context, rect, img);
+    }
+
+    CGContextRestoreGState(context);
+
+    return NSERROR_OK;
 }
 
 const struct plotter_table cocoa_plotters = {
-	.clip = plot_clip,
-	.arc = plot_arc,
-	.disc = plot_disc,
-	.rectangle = plot_rectangle,
-	.line = plot_line,
-	.polygon = plot_polygon,
-	
-	.path = plot_path,
-	
-	.bitmap = plot_bitmap,
-	
-	.text = plot_text,
-
-	.option_knockout = true
-};
+    .clip = plot_clip,
+    .arc = plot_arc,
+    .disc = plot_disc,
+    .rectangle = plot_rectangle,
+    .line = plot_line,
+    .polygon = plot_polygon,
+
+    .path = plot_path,
 
+    .bitmap = plot_bitmap,
+
+    .text = plot_text,
+
+    .option_knockout = true
+};
 
 CGFloat cocoa_scale_factor;
 static const CGFloat points_per_inch = 72.0;
 static CGFloat cocoa_half_pixel;
 
-void cocoa_update_scale_factor( void )
+void cocoa_update_scale_factor(void)
 {
-	const CGFloat scale = [[NSScreen mainScreen] backingScaleFactor];
-	cocoa_scale_factor = scale == 1.0 ? 1.0 : 1.0 / scale;
-	cocoa_half_pixel = 0.5 * cocoa_scale_factor;
-        browser_set_dpi( points_per_inch * scale );
+    const CGFloat scale = [[NSScreen mainScreen] backingScaleFactor];
+    cocoa_scale_factor = scale == 1.0 ? 1.0 : 1.0 / scale;
+    cocoa_half_pixel = 0.5 * cocoa_scale_factor;
+    browser_set_dpi(points_per_inch * scale);
 }
 
-static inline void cocoa_center_pixel( bool x, bool y ) 
+static inline void cocoa_center_pixel(bool x, bool y)
 {
-	NSAffineTransform *transform = [NSAffineTransform transform];
-	[transform translateXBy: x ? cocoa_half_pixel : 0.0 yBy: y ? cocoa_half_pixel : 0.0];
-	[transform concat];
+    NSAffineTransform *transform = [NSAffineTransform transform];
+    [transform translateXBy:x ? cocoa_half_pixel : 0.0 yBy:y ? cocoa_half_pixel : 0.0];
+    [transform concat];
 }