projects/dwt-mac: dwt/graphics/GC.d comparison

comparison dwt/graphics/GC.d @ 45:d8635bb48c7c

Merge with SWT 3.5

author	Jacob Carlborg <doob@me.com>
date	Mon, 01 Dec 2008 17:07:00 +0100
parents	642f460a0908
children	cfa563df4fdd

comparison

equal deleted inserted replaced

-:ca5e494f2bbf
+:d8635bb48c7c
 /*******************************************************************************
-* Copyright (c) 2000, 2007 IBM Corporation and others.
+* Copyright (c) 2000, 2008 IBM Corporation and others.
 * All rights reserved. This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *
 * Port to the D programming language:
-*     Jacob Carlborg <jacob.carlborg@gmail.com>
+*     Jacob Carlborg <doob@me.com>
 *******************************************************************************/
 module dwt.graphics.GC;
 import dwt.DWT;
 import dwt.DWTError;
 import dwt.DWTException;
 import dwt.internal.cocoa.NSAffineTransform;
 import dwt.internal.cocoa.NSAffineTransformStruct;
+import dwt.internal.cocoa.NSArray;
 import dwt.internal.cocoa.NSAttributedString;
+import dwt.internal.cocoa.NSAutoreleasePool;
 import dwt.internal.cocoa.NSBezierPath;
 import dwt.internal.cocoa.NSColor;
 import dwt.internal.cocoa.NSFont;
 import dwt.internal.cocoa.NSGradient;
 import dwt.internal.cocoa.NSGraphicsContext;
 import dwt.internal.cocoa.NSImage;
 import dwt.internal.cocoa.NSInteger;
 import dwt.internal.cocoa.NSMutableDictionary;
+import dwt.internal.cocoa.NSMutableParagraphStyle;
 import dwt.internal.cocoa.NSPoint;
 import dwt.internal.cocoa.NSRect;
 import dwt.internal.cocoa.NSSize;
 import dwt.internal.cocoa.NSString;
+import dwt.internal.cocoa.NSThread;
+import dwt.internal.cocoa.NSView;
 import dwt.internal.cocoa.OS;
 import tango.text.convert.Format;
 import dwt.dwthelper.utils;
 * <p>
 * Note: Only one of LEFT_TO_RIGHT and RIGHT_TO_LEFT may be specified.
 * </p>
 *
 * @see dwt.events.PaintEvent
+* @see <a href="http://www.eclipse.org/swt/snippets/#gc">GC snippets</a>
+* @see <a href="http://www.eclipse.org/swt/examples.php">DWT Examples: GraphicsExample, PaintExample</a>
+* @see <a href="http://www.eclipse.org/swt/">Sample code and further information</a>
 */
 public final class GC : Resource {
 alias Resource.init_ init_;
 gc.device = data.device;
 gc.init_(drawable, data, context);
 return gc;
 }
-/**
+NSAutoreleasePool checkGC (int mask) {
-* Invokes platform specific functionality to wrap a graphics context.
+NSAutoreleasePool pool = null;
-* <p>
+if (!NSThread.isMainThread()) pool = (NSAutoreleasePool) new NSAutoreleasePool().alloc().init();
-* <b>IMPORTANT:</b> This method is <em>not</em> part of the public
+if ((mask & (CLIPPING | TRANSFORM)) !is 0) {
-* API for <code>GC</code>. It is marked public only so that it
+NSGraphicsContext.setCurrentContext(handle);
-* can be shared within the packages provided by DWT. It is not
+NSView view = data.view;
-* available on all platforms, and should never be called from
+if (view !is null && data.paintRect is null) {
-* application code.
+NSRect rect = view.convertRect_toView_(view.bounds(), null);
-* </p>
+NSRect visibleRect = view.visibleRect();
-*
+if (data.windowRect is null || rect.x !is data.windowRect.x || rect.y !is data.windowRect.y ||
-* @param context the Quartz context.
+rect.width !is data.windowRect.width || rect.height !is data.windowRect.height ||
-* @param data the data for the receiver.
+visibleRect.x !is data.visibleRect.x || visibleRect.y !is data.visibleRect.y ||
-*
+visibleRect.width !is data.visibleRect.width || visibleRect.height !is data.visibleRect.height)
-* @return a new <code>GC</code>
+{
-*/
+data.state &= ~CLIPPING;
-public static GC carbon_new(objc.id context, GCData data) {
+data.windowRect = rect;
-GC gc = new GC();
+data.visibleRect = visibleRect;
-gc.device = data.device;
+}
-gc.init_(null, data, context);
+}
-return gc;
+if ((data.state & CLIPPING) is 0 || (data.state & TRANSFORM) is 0) {
-}
+handle.restoreGraphicsState();
+handle.saveGraphicsState();
-void checkGC (int mask) {
+if (view !is null && data.paintRect is null) {
-if ((data.state & CLIPPING) is 0 || (data.state & TRANSFORM) is 0) {
+NSAffineTransform transform = NSAffineTransform.transform();
-handle.restoreGraphicsState();
+NSRect rect = data.windowRect;
-handle.saveGraphicsState();
+transform.translateXBy(rect.x, rect.y + rect.height);
-if (data.clipPath !is null) data.clipPath.addClip();
+transform.scaleXBy(1, -1);
-if (data.transform !is null) data.transform.concat();
+transform.concat();
-mask &= ~(TRANSFORM | CLIPPING);
+NSBezierPath.bezierPathWithRect(data.visibleRect).addClip();
-data.state |= TRANSFORM | CLIPPING;
+}
-data.state &= ~(BACKGROUND | FOREGROUND);
+if (data.clipPath !is null) data.clipPath.addClip();
+if (data.transform !is null) data.transform.concat();
+mask &= ~(TRANSFORM | CLIPPING);
+data.state |= TRANSFORM | CLIPPING;
+data.state &= ~(BACKGROUND | FOREGROUND);
+}
 }
 int state = data.state;
-if ((state & mask) is mask) return;
+if ((state & mask) is mask) return pool;
 state = (state ^ mask) & mask;
 data.state |= mask;
 if ((state & FOREGROUND) !is 0) {
 Pattern pattern = data.foregroundPattern;
 strokeWidth = data.lineWidth * scaling;
 if (strokeWidth is 0 || (cast(size_t)strokeWidth % 2) is 1) {
 data.drawYOffset = 0.5f / scaling;
 }
 }
+return pool;
 }
 /**
 * Copies a rectangular area of the receiver at the specified
 * position into the image, which must be of type <code>DWT.BITMAP</code>.
 NSAttributedString createString(String string, int flags) {
 NSMutableDictionary dict = NSMutableDictionary.dictionaryWithCapacity(4);
 CGFloat[] foreground = data.foreground;
 NSColor color = NSColor.colorWithDeviceRed(foreground[0], foreground[1], foreground[2], data.alpha / 255f);
-dict.setObject(color, OS.NSForegroundColorAttributeName());
+dict.setObject(color, OS.NSForegroundColorAttributeName);
-dict.setObject(data.font.handle, OS.NSFontAttributeName());
+dict.setObject(data.font.handle, OS.NSFontAttributeName);
 if ((flags & DWT.DRAW_TRANSPARENT) is 0) {
 CGFloat[] background = data.background;
 color = NSColor.colorWithDeviceRed(background[0], background[1], background[2], data.alpha / 255f);
 dict.setObject(color, OS.FuncNSBackgroundColorAttributeName());
 }
+if ((flags & DWT.DRAW_TAB) is 0) {
+NSMutableParagraphStyle paragraph = (NSMutableParagraphStyle)new NSMutableParagraphStyle().alloc().init();
+paragraph.setAlignment(OS.NSLeftTextAlignment);
+paragraph.setLineBreakMode(OS.NSLineBreakByClipping);
+paragraph.setTabStops(NSArray.array());
+dict.setObject(paragraph, OS.NSParagraphStyleAttributeName);
+paragraph.release();
+}
 size_t length = string.length();
 char[] chars = new char[length];
 string.getChars(0, length, chars, 0);
-//  int breakCount = 0;
+int breakCount = 0;
-//  int[] breaks = null;
+int[] breaks = null;
-//  if ((flags & (DWT.DRAW_MNEMONIC | DWT.DRAW_DELIMITER)) !is 0) {
+if ((flags & DWT.DRAW_MNEMONIC) !is 0 || (flags & DWT.DRAW_DELIMITER) is 0) {
-//      int i=0, j=0;
+int i=0, j=0;
-//      while (i < chars.length) {
+while (i < chars.length) {
-//          char c = chars [j++] = chars [i++];
+char c = chars [j++] = chars [i++];
-//          switch (c) {
+switch (c) {
-//              case '&': {
+case '&': {
-//                  if ((flags & DWT.DRAW_MNEMONIC) !is 0) {
+if ((flags & DWT.DRAW_MNEMONIC) !is 0) {
-//                      if (i is chars.length) {continue;}
+if (i is chars.length) {continue;}
-//                      if (chars [i] is '&') {i++; continue;}
+if (chars [i] is '&') {i++; continue;}
-//                      j--;
+j--;
-//                  }
+}
-//                  break;
+break;
-//              }
+}
-//              case '\r':
+case '\r':
-//              case '\n': {
+case '\n': {
-//                  if ((flags & DWT.DRAW_DELIMITER) !is 0) {
+if ((flags & DWT.DRAW_DELIMITER) is 0) {
-//                      if (c is '\r' && i !is chars.length && chars[i] is '\n') i++;
+if (c is '\r' && i !is chars.length && chars[i] is '\n') i++;
-//                      j--;
+j--;
-//                      if (breaks is null) {
+if (breaks is null) {
-//                          breaks = new int[4];
+breaks = new int[4];
-//                      } else if (breakCount is breaks.length) {
+} else if (breakCount is breaks.length) {
-//                          int[] newBreaks = new int[breaks.length + 4];
+int[] newBreaks = new int[breaks.length + 4];
-//                          System.arraycopy(breaks, 0, newBreaks, 0, breaks.length);
+System.arraycopy(breaks, 0, newBreaks, 0, breaks.length);
-//                          breaks = newBreaks;
+breaks = newBreaks;
-//                      }
+}
-//                      breaks[breakCount++] = j;
+breaks[breakCount++] = j;
-//                  }
+}
-//                  break;
+break;
-//              }
+}
-//          }
+}
-//      }
+}
-//      length = j;
+length = j;
-//  }
+}
 NSString str = NSString.stringWithCharacters(chars.toCharArray().ptr, length);
-return (cast(NSAttributedString)(new NSAttributedString()).alloc()).initWithString_attributes_(str, dict);
+return (cast(NSAttributedString)(new NSAttributedString()).alloc()).initWithString(str, dict);
 }
 void destroy() {
 /* Free resources */
 Image image = data.image;
 if (image !is null) {
 image.memGC = null;
 image.createAlpha();
 }
+if (data.path !is null) data.path.release();
 if (data.clipPath !is null) data.clipPath.release();
 if (data.transform !is null) data.transform.release();
 if (data.inverseTransform !is null) data.inverseTransform.release();
 data.path = data.clipPath = null;
 data.transform = data.inverseTransform = null;
 *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
 * </ul>
 */
 public void drawArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
-NSGraphicsContext.setCurrentContext(handle);
-checkGC(DRAW);
 if (width < 0) {
 x = x + width;
 width = -width;
 }
 if (height < 0) {
 y = y + height;
 height = -height;
 }
 if (width is 0 || height is 0 || arcAngle is 0) return;
-handle.saveGraphicsState();
+NSAutoreleasePool pool = checkGC(DRAW);
-NSAffineTransform transform = NSAffineTransform.transform();
+try {
+handle.saveGraphicsState();
+NSAffineTransform transform = NSAffineTransform.transform();
 CGFloat xOffset = data.drawXOffset, yOffset = data.drawYOffset;
 transform.translateXBy(x + xOffset + width / 2f, y + yOffset + height / 2f);
 transform.scaleXBy(width / 2f, height / 2f);
 NSBezierPath path = data.path;
 NSPoint center = NSPoint();
 CGFloat sAngle = -startAngle;
 CGFloat eAngle = -(startAngle + arcAngle);
-path.appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_clockwise_(center, 1, sAngle,  eAngle, arcAngle>0);
+path.appendBezierPathWithArcWithCenter(center, 1, sAngle,  eAngle, arcAngle>0);
 path.transformUsingAffineTransform(transform);
 path.stroke();
 path.removeAllPoints();
 handle.restoreGraphicsState();
-NSGraphicsContext.setCurrentContext(context);
+} finally {
+uncheckGC(pool);
+}
 }
 /**
 * Draws a rectangle, based on the specified arguments, which has
 * the appearance of the platform's <em>focus rectangle</em> if the
 *
 * @see #drawRectangle(int, int, int, int)
 */
 public void drawFocus(int x, int y, int width, int height) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
+NSAutoreleasePool pool = checkGC(CLIPPING | TRANSFORM);
-NSGraphicsContext.setCurrentContext(handle);
+try {
-checkGC(CLIPPING | TRANSFORM);
+//  int[] metric = new int[1];
-//  int[] metric = new int[1];
+//  OS.GetThemeMetric(OS.kThemeMetricFocusRectOutset, metric);
-//  OS.GetThemeMetric(OS.kThemeMetricFocusRectOutset, metric);
+//  CGRect rect = new CGRect ();
-//  CGRect rect = new CGRect ();
+//  rect.x = x + metric[0];
-//  rect.x = x + metric[0];
+//  rect.y = y + metric[0];
-//  rect.y = y + metric[0];
+//  rect.width = width - metric[0] * 2;
-//  rect.width = width - metric[0] * 2;
+//  rect.height = height - metric[0] * 2;
-//  rect.height = height - metric[0] * 2;
+//  OS.HIThemeDrawFocusRect(rect, true, handle, OS.kHIThemeOrientationNormal);
-//  OS.HIThemeDrawFocusRect(rect, true, handle, OS.kHIThemeOrientationNormal);
+} finally {
-//  flush();
+uncheckGC(pool);
-NSGraphicsContext.setCurrentContext(context);
+}
 }
 /**
 * Draws the given image in the receiver at the specified
 * coordinates.
 if (image.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
 drawImage(image, srcX, srcY, srcWidth, srcHeight, destX, destY, destWidth, destHeight, false);
 }
 void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, bool simple) {
-NSGraphicsContext context = NSGraphicsContext.currentContext();
-NSGraphicsContext.setCurrentContext(handle);
-checkGC(CLIPPING | TRANSFORM);
 NSImage imageHandle = srcImage.handle;
 NSSize size = imageHandle.size();
 int imgWidth = cast(int)size.width;
 int imgHeight = cast(int)size.height;
 if (simple) {
 } else {
 simple = srcX is 0 && srcY is 0 &&
 srcWidth is destWidth && destWidth is imgWidth &&
 srcHeight is destHeight && destHeight is imgHeight;
 if (srcX + srcWidth > imgWidth || srcY + srcHeight > imgHeight) {
-NSGraphicsContext.setCurrentContext(context);
 DWT.error(DWT.ERROR_INVALID_ARGUMENT);
 }
 }
-if (srcImage.memGC !is null) srcImage.createAlpha();
+NSAutoreleasePool pool = checkGC(CLIPPING | TRANSFORM);
-handle.saveGraphicsState();
+try {
-NSAffineTransform transform = NSAffineTransform.transform();
+if (srcImage.memGC !is null) {
-transform.scaleXBy(1, -1);
+srcImage.createAlpha();
-transform.translateXBy(0, -(destHeight + 2 * destY));
+}
-transform.concat();
+handle.saveGraphicsState();
+NSAffineTransform transform = NSAffineTransform.transform();
+transform.scaleXBy(1, -1);
+transform.translateXBy(0, -(destHeight + 2 * destY));
+transform.concat();
 NSRect srcRect = NSRect();
 srcRect.x = srcX;
-srcRect.y = srcY;
+srcRect.y = imgHeight - (srcY + srcHeight);
 srcRect.width = srcWidth;
 srcRect.height = srcHeight;
 NSRect destRect = NSRect();
 destRect.x = destX;
 destRect.y = destY;
 destRect.width = destWidth;
 destRect.height = destHeight;
 imageHandle.drawInRect(destRect, srcRect, NSCompositeSourceOver, 1);
 handle.restoreGraphicsState();
-NSGraphicsContext.setCurrentContext(context);
+} finally {
+uncheckGC(pool);
+}
 }
 /**
 * Draws a line, using the foreground color, between the points
 * (<code>x1</code>, <code>y1</code>) and (<code>x2</code>, <code>y2</code>).
 *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
 * </ul>
 */
 public void drawLine(int x1, int y1, int x2, int y2) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
+NSAutoreleasePool pool = checkGC(DRAW);
-NSGraphicsContext.setCurrentContext(handle);
+try {
-checkGC(DRAW);
+NSBezierPath path = data.path;
-NSBezierPath path = data.path;
 NSPoint pt = NSPoint();
 pt.x = x1 + data.drawXOffset;
 pt.y = y1 + data.drawYOffset;
 path.moveToPoint(pt);
 pt.x = x2 + data.drawXOffset;
 pt.y = y2 + data.drawYOffset;
 path.lineToPoint(pt);
 path.stroke();
 path.removeAllPoints();
-NSGraphicsContext.setCurrentContext(context);
+} finally {
+uncheckGC(pool);
+}
 }
 /**
 * Draws the outline of an oval, using the foreground color,
 * within the specified rectangular area.
 *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
 * </ul>
 */
 public void drawOval(int x, int y, int width, int height) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
+NSAutoreleasePool pool = checkGC(DRAW);
-NSGraphicsContext.setCurrentContext(handle);
+try {
-checkGC(DRAW);
+if (width < 0) {
-if (width < 0) {
+x = x + width;
-x = x + width;
+width = -width;
-width = -width;
+}
-}
+if (height < 0) {
-if (height < 0) {
+y = y + height;
-y = y + height;
+height = -height;
-height = -height;
+}
-}
+NSBezierPath path = data.path;
-NSBezierPath path = data.path;
 NSRect rect = NSRect();
 rect.x = x + data.drawXOffset;
 rect.y = y + data.drawXOffset;
 rect.width = width;
 rect.height = height;
 path.appendBezierPathWithOvalInRect(rect);
 path.stroke();
 path.removeAllPoints();
-NSGraphicsContext.setCurrentContext(context);
+} finally {
+uncheckGC(pool);
+}
 }
 /**
 * Draws the path described by the parameter.
 * <p>
 */
 public void drawPath(Path path) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
 if (path is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
 if (path.handle is null) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
+NSAutoreleasePool pool = checkGC(DRAW);
-NSGraphicsContext.setCurrentContext(handle);
+try {
-checkGC(DRAW);
+handle.saveGraphicsState();
-handle.saveGraphicsState();
+NSAffineTransform transform = NSAffineTransform.transform();
-NSAffineTransform transform = NSAffineTransform.transform();
+transform.translateXBy(data.drawXOffset, data.drawYOffset);
-transform.translateXBy(data.drawXOffset, data.drawYOffset);
+transform.concat();
-transform.concat();
+NSBezierPath drawPath = data.path;
-NSBezierPath drawPath = data.path;
+drawPath.appendBezierPath(path.handle);
-drawPath.appendBezierPath(path.handle);
+drawPath.stroke();
-drawPath.stroke();
+drawPath.removeAllPoints();
-drawPath.removeAllPoints();
+handle.restoreGraphicsState();
-handle.restoreGraphicsState();
+} finally {
-NSGraphicsContext.setCurrentContext(context);
+uncheckGC(pool);
+}
 }
 /**
 * Draws a pixel, using the foreground color, at the specified
 * point (<code>x</code>, <code>y</code>).
 *
 * @since 3.0
 */
 public void drawPoint(int x, int y) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
+NSAutoreleasePool pool = checkGC(FOREGROUND_FILL | CLIPPING | TRANSFORM);
-NSGraphicsContext.setCurrentContext(handle);
+try {
-checkGC(FOREGROUND_FILL);
 NSRect rect = NSRect();
 rect.x = x;
 rect.y = y;
 rect.width = 1;
 rect.height = 1;
 NSBezierPath path = data.path;
 path.appendBezierPathWithRect(rect);
 path.fill();
 path.removeAllPoints();
-NSGraphicsContext.setCurrentContext(context);
+} finally {
+uncheckGC(pool);
+}
 }
 /**
 * Draws the closed polygon which is defined by the specified array
 * of integer coordinates, using the receiver's foreground color. The array
 * </ul>
 */
 public void drawPolygon(int[] pointArray) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
 if (pointArray is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
-NSGraphicsContext.setCurrentContext(handle);
-checkGC(DRAW);
 if (pointArray.length < 4) return;
-CGFloat xOffset = data.drawXOffset, yOffset = data.drawYOffset;
+NSAutoreleasePool pool = checkGC(DRAW);
-NSBezierPath path = data.path;
+try {
+float /*double*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset;
+NSBezierPath path = data.path;
 NSPoint pt = NSPoint();
 pt.x = pointArray[0] + xOffset;
 pt.y = pointArray[1] + yOffset;
 path.moveToPoint(pt);
 int end = pointArray.length / 2 * 2;
 for (int i = 2; i < end; i+=2) {
 pt.x = pointArray[i] + xOffset;
 pt.y = pointArray[i+1] + yOffset;
 path.lineToPoint(pt);
 }
 path.closePath();
 path.stroke();
 path.removeAllPoints();
-NSGraphicsContext.setCurrentContext(context);
+} finally {
+uncheckGC(pool);
+}
 }
 /**
 * Draws the polyline which is defined by the specified array
 * of integer coordinates, using the receiver's foreground color. The array
 * </ul>
 */
 public void drawPolyline(int[] pointArray) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
 if (pointArray is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
-NSGraphicsContext.setCurrentContext(handle);
-checkGC(DRAW);
 if (pointArray.length < 4) return;
-CGFloat xOffset = data.drawXOffset, yOffset = data.drawYOffset;
+NSAutoreleasePool pool = checkGC(DRAW);
-NSBezierPath path = data.path;
+try {
+float /*double*/ xOffset = data.drawXOffset, yOffset = data.drawYOffset;
+NSBezierPath path = data.path;
 NSPoint pt = NSPoint();
 pt.x = pointArray[0] + xOffset;
 pt.y = pointArray[1] + yOffset;
 path.moveToPoint(pt);
 int end = pointArray.length / 2 * 2;
 for (int i = 2; i < end; i+=2) {
 pt.x = pointArray[i] + xOffset;
 pt.y = pointArray[i+1] + yOffset;
 path.lineToPoint(pt);
 }
 path.stroke();
 path.removeAllPoints();
-NSGraphicsContext.setCurrentContext(context);
+} finally {
+uncheckGC(pool);
+}
 }
 /**
 * Draws the outline of the rectangle specified by the arguments,
 * using the receiver's foreground color. The left and right edges
 *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
 * </ul>
 */
 public void drawRectangle(int x, int y, int width, int height) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
+NSAutoreleasePool pool = checkGC(DRAW);
-NSGraphicsContext.setCurrentContext(handle);
+try {
-checkGC(DRAW);
+if (width < 0) {
-if (width < 0) {
+x = x + width;
-x = x + width;
+width = -width;
-width = -width;
+}
-}
+if (height < 0) {
-if (height < 0) {
+y = y + height;
-y = y + height;
+height = -height;
-height = -height;
+}
-}
 NSRect rect = NSRect();
 rect.x = x + data.drawXOffset;
 rect.y = y + data.drawYOffset;
 rect.width = width;
 rect.height = height;
 NSBezierPath path = data.path;
 path.appendBezierPathWithRect(rect);
 path.stroke();
 path.removeAllPoints();
-NSGraphicsContext.setCurrentContext(context);
+} finally {
+uncheckGC(pool);
+}
 }
 /**
 * Draws the outline of the specified rectangle, using the receiver's
 * foreground color. The left and right edges of the rectangle are at
 *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
 * </ul>
 */
 public void drawRoundRectangle(int x, int y, int width, int height, int arcWidth, int arcHeight) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
-NSGraphicsContext.setCurrentContext(handle);
-checkGC(DRAW);
 if (arcWidth is 0 || arcHeight is 0) {
 drawRectangle(x, y, width, height);
-NSGraphicsContext.setCurrentContext(context);
 return;
 }
-NSBezierPath path = data.path;
+NSAutoreleasePool pool = checkGC(DRAW);
+try {
+NSBezierPath path = data.path;
 NSRect rect = NSRect();
 rect.x = x + data.drawXOffset;
 rect.y = y + data.drawYOffset;
 rect.width = width;
 rect.height = height;
 path.appendBezierPathWithRoundedRect(rect, arcWidth, arcHeight);
 path.stroke();
 path.removeAllPoints();
-NSGraphicsContext.setCurrentContext(context);
+} finally {
+uncheckGC(pool);
+}
 }
 /**
 * Draws the given string, using the receiver's current font and
 * foreground color. No tab expansion or carriage return processing
 * </ul>
 */
 public void drawText (String string, int x, int y, int flags) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
 if (string is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
+NSAutoreleasePool pool = checkGC(CLIPPING | TRANSFORM | FONT | FOREGROUND_FILL);
-NSGraphicsContext.setCurrentContext(handle);
+try {
-checkGC(CLIPPING | TRANSFORM | FONT | FOREGROUND_FILL);
+NSAttributedString str = createString(string, flags);
-NSAttributedString str = createString(string, flags);
+if (data.paintRect is null) {
-if (data.paintRect is null) {
+handle.saveGraphicsState();
-handle.saveGraphicsState();
+NSAffineTransform transform = NSAffineTransform.transform();
-NSAffineTransform transform = NSAffineTransform.transform();
+transform.scaleXBy(1, -1);
-transform.scaleXBy(1, -1);
+transform.translateXBy(0, -(str.size().height + 2 * y));
-transform.translateXBy(0, -(str.size().height + 2 * y));
+transform.concat();
-transform.concat();
+}
-}
 NSPoint pt = NSPoint();
 pt.x = x;
 pt.y = y;
 str.drawAtPoint(pt);
 str.release();
 if (data.paintRect is null) {
 handle.restoreGraphicsState();
 }
-NSGraphicsContext.setCurrentContext(context);
+} finally {
+uncheckGC(pool);
+}
 }
 /**
 * Compares the argument to the receiver, and returns true
 * if they represent the <em>same</em> object using a class
 *
 * @see #drawArc
 */
 public void fillArc(int x, int y, int width, int height, int startAngle, int arcAngle) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
-NSGraphicsContext.setCurrentContext(handle);
-checkGC(FILL);
 if (width < 0) {
 x = x + width;
 width = -width;
 }
 if (height < 0) {
 y = y + height;
 height = -height;
 }
 if (width is 0 || height is 0 || arcAngle is 0) return;
-handle.saveGraphicsState();
+NSAutoreleasePool pool = checkGC(FILL);
-NSAffineTransform transform = NSAffineTransform.transform();
+try {
+handle.saveGraphicsState();
+NSAffineTransform transform = NSAffineTransform.transform();
 CGFloat xOffset = data.drawXOffset, yOffset = data.drawYOffset;
 transform.translateXBy(x + xOffset + width / 2f, y + yOffset + height / 2f);
 transform.scaleXBy(width / 2f, height / 2f);
 NSBezierPath path = data.path;
 NSPoint center = NSPoint();
 path.moveToPoint(center);
 CGFloat sAngle = -startAngle;
 CGFloat eAngle = -(startAngle + arcAngle);
-path.appendBezierPathWithArcWithCenter_radius_startAngle_endAngle_clockwise_(center, 1, sAngle,  eAngle, arcAngle>0);
+path.appendBezierPathWithArcWithCenter(center, 1, sAngle,  eAngle, arcAngle>0);
 path.closePath();
 path.transformUsingAffineTransform(transform);
 path.fill();
 path.removeAllPoints();
 handle.restoreGraphicsState();
-NSGraphicsContext.setCurrentContext(context);
+} finally {
+uncheckGC(pool);
+}
 }
 /**
 * Fills the interior of the specified rectangle with a gradient
 * sweeping from left to right or top to bottom progressing
 *
 * @see #drawRectangle(int, int, int, int)
 */
 public void fillGradientRectangle(int x, int y, int width, int height, bool vertical) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
-NSGraphicsContext.setCurrentContext(handle);
-checkGC(CLIPPING | TRANSFORM);
 if ((width is 0) || (height is 0)) return;
+NSAutoreleasePool pool = checkGC(CLIPPING | TRANSFORM);
-RGB backgroundRGB, foregroundRGB;
+try {
-backgroundRGB = getBackground().getRGB();
+RGB backgroundRGB, foregroundRGB;
-foregroundRGB = getForeground().getRGB();
+backgroundRGB = getBackground().getRGB();
+foregroundRGB = getForeground().getRGB();
-RGB fromRGB, toRGB;
-fromRGB = foregroundRGB;
+RGB fromRGB, toRGB;
-toRGB   = backgroundRGB;
+fromRGB = foregroundRGB;
-bool swapColors = false;
+toRGB   = backgroundRGB;
-if (width < 0) {
+bool swapColors = false;
-x += width; width = -width;
+if (width < 0) {
-if (! vertical) swapColors = true;
+x += width; width = -width;
-}
+if (! vertical) swapColors = true;
-if (height < 0) {
+}
-y += height; height = -height;
+if (height < 0) {
-if (vertical) swapColors = true;
+y += height; height = -height;
-}
+if (vertical) swapColors = true;
-if (swapColors) {
+}
-fromRGB = backgroundRGB;
+if (swapColors) {
-toRGB   = foregroundRGB;
+fromRGB = backgroundRGB;
-}
+toRGB   = foregroundRGB;
-if (fromRGB.equals(toRGB)) {
+}
-fillRectangle(x, y, width, height);
+if (fromRGB.equals(toRGB)) {
-} else {
+fillRectangle(x, y, width, height);
-NSColor startingColor = NSColor.colorWithDeviceRed(fromRGB.red / 255f, fromRGB.green / 255f, fromRGB.blue / 255f, data.alpha / 255f);
+} else {
-NSColor endingColor = NSColor.colorWithDeviceRed(toRGB.red / 255f, toRGB.green / 255f, toRGB.blue / 255f, data.alpha / 255f);
+NSColor startingColor = NSColor.colorWithDeviceRed(fromRGB.red / 255f, fromRGB.green / 255f, fromRGB.blue / 255f, data.alpha / 255f);
+NSColor endingColor = NSColor.colorWithDeviceRed(toRGB.red / 255f, toRGB.green / 255f, toRGB.blue / 255f, data.alpha / 255f);
 NSGradient gradient = (cast(NSGradient)(new NSGradient()).alloc()).initWithStartingColor(startingColor, endingColor);
 NSRect rect = NSRect();
+rect.x = x;
+rect.y = y;
+rect.width = width;
+rect.height = height;
+gradient.drawInRect(rect, vertical ? 90 : 0);
+gradient.release();
+}
+} finally {
+uncheckGC(pool);
+}
+}
+/**
+* Fills the interior of an oval, within the specified
+* rectangular area, with the receiver's background
+* color.
+*
+* @param x the x coordinate of the upper left corner of the oval to be filled
+* @param y the y coordinate of the upper left corner of the oval to be filled
+* @param width the width of the oval to be filled
+* @param height the height of the oval to be filled
+*
+* @exception DWTException <ul>
+*    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
+* </ul>
+*
+* @see #drawOval
+*/
+public void fillOval(int x, int y, int width, int height) {
+if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
+NSAutoreleasePool pool = checkGC(FILL);
+try {
+if (width < 0) {
+x = x + width;
+width = -width;
+}
+if (height < 0) {
+y = y + height;
+height = -height;
+}
+NSBezierPath path = data.path;
+NSRect rect = NSRect();
 rect.x = x;
 rect.y = y;
 rect.width = width;
 rect.height = height;
-gradient.drawInRect_angle_(rect, vertical ? 90 : 0);
+path.appendBezierPathWithOvalInRect(rect);
-gradient.release();
+Pattern pattern = data.backgroundPattern;
-}
+if (pattern !is null && pattern.gradient !is null) {
-NSGraphicsContext.setCurrentContext(context);
+fillPattern(path, pattern);
-}
+} else {
+path.fill();
-/**
+}
-* Fills the interior of an oval, within the specified
+path.removeAllPoints();
-* rectangular area, with the receiver's background
+} finally {
-* color.
+uncheckGC(pool);
-*
+}
-* @param x the x coordinate of the upper left corner of the oval to be filled
-* @param y the y coordinate of the upper left corner of the oval to be filled
-* @param width the width of the oval to be filled
-* @param height the height of the oval to be filled
-*
-* @exception DWTException <ul>
-*    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
-* </ul>
-*
-* @see #drawOval
-*/
-public void fillOval(int x, int y, int width, int height) {
-if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
-NSGraphicsContext.setCurrentContext(handle);
-checkGC(FILL);
-if (width < 0) {
-x = x + width;
-width = -width;
-}
-if (height < 0) {
-y = y + height;
-height = -height;
-}
-NSBezierPath path = data.path;
-NSRect rect = NSRect();
-rect.x = x;
-rect.y = y;
-rect.width = width;
-rect.height = height;
-path.appendBezierPathWithOvalInRect(rect);
-Pattern pattern = data.backgroundPattern;
-if (pattern !is null && pattern.gradient !is null) {
-fillPattern(path, pattern);
-} else {
-path.fill();
-}
-path.removeAllPoints();
-NSGraphicsContext.setCurrentContext(context);
 }
 void fillPattern(NSBezierPath path, Pattern pattern) {
-NSGraphicsContext context = NSGraphicsContext.currentContext();
+handle.saveGraphicsState();
-NSGraphicsContext.setCurrentContext(handle);
 path.addClip();
 pattern.gradient.drawFromPoint(pattern.pt1, pattern.pt2, OS.NSGradientDrawsAfterEndingLocation | OS.NSGradientDrawsBeforeStartingLocation);
-NSGraphicsContext.setCurrentContext(context);
+handle.restoreGraphicsState();
 }
 /**
 * Fills the path described by the parameter.
 * <p>
 */
 public void fillPath(Path path) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
 if (path is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
 if (path.handle is null) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
+NSAutoreleasePool pool = checkGC(FILL);
-NSGraphicsContext.setCurrentContext(handle);
+try {
-checkGC(FILL);
+NSBezierPath drawPath = data.path;
-NSBezierPath drawPath = data.path;
+drawPath.appendBezierPath(path.handle);
-drawPath.appendBezierPath(path.handle);
+Pattern pattern = data.backgroundPattern;
-Pattern pattern = data.backgroundPattern;
+if (pattern !is null && pattern.gradient !is null) {
-if (pattern !is null && pattern.gradient !is null) {
+fillPattern(drawPath, pattern);
-fillPattern(drawPath, pattern);
+} else {
-} else {
+drawPath.fill();
-drawPath.fill();
+}
-}
+drawPath.removeAllPoints();
-drawPath.removeAllPoints();
+} finally {
-NSGraphicsContext.setCurrentContext(context);
+uncheckGC(pool);
+}
 }
 /**
 * Fills the interior of the closed polygon which is defined by the
 * specified array of integer coordinates, using the receiver's
 * @see #drawPolygon
 */
 public void fillPolygon(int[] pointArray) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
 if (pointArray is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
-NSGraphicsContext.setCurrentContext(handle);
-checkGC(FILL);
 if (pointArray.length < 4) return;
-NSBezierPath path = data.path;
+NSAutoreleasePool pool = checkGC(FILL);
+try {
+NSBezierPath path = data.path;
 NSPoint pt = NSPoint();
 pt.x = pointArray[0];
 pt.y = pointArray[1];
 path.moveToPoint(pt);
 int end = pointArray.length / 2 * 2;
 for (int i = 2; i < end; i+=2) {
 pt.x = pointArray[i];
 pt.y = pointArray[i+1];
 path.lineToPoint(pt);
 }
 path.closePath();
 Pattern pattern = data.backgroundPattern;
 if (pattern !is null && pattern.gradient !is null) {
 fillPattern(path, pattern);
 } else {
 path.fill();
 }
 path.removeAllPoints();
-NSGraphicsContext.setCurrentContext(context);
+} finally {
+uncheckGC(pool);
+}
 }
 /**
 * Fills the interior of the rectangle specified by the arguments,
 * using the receiver's background color.
 *
 * @see #drawRectangle(int, int, int, int)
 */
 public void fillRectangle(int x, int y, int width, int height) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
+NSAutoreleasePool pool = checkGC(FILL);
-NSGraphicsContext.setCurrentContext(handle);
+try {
-checkGC(FILL);
+if (width < 0) {
-if (width < 0) {
+x = x + width;
-x = x + width;
+width = -width;
-width = -width;
+}
-}
+if (height < 0) {
-if (height < 0) {
+y = y + height;
-y = y + height;
+height = -height;
-height = -height;
+}
-}
 NSRect rect = NSRect();
 rect.x = x;
 rect.y = y;
 rect.width = width;
 rect.height = height;
 NSBezierPath path = data.path;
 path.appendBezierPathWithRect(rect);
 Pattern pattern = data.backgroundPattern;
 if (pattern !is null && pattern.gradient !is null) {
 fillPattern(path, pattern);
 } else {
 path.fill();
 }
 path.removeAllPoints();
-NSGraphicsContext.setCurrentContext(context);
+} finally {
+uncheckGC(pool);
+}
 }
 /**
 * Fills the interior of the specified rectangle, using the receiver's
 * background color.
 *
 * @see #drawRoundRectangle
 */
 public void fillRoundRectangle(int x, int y, int width, int height, int arcWidth, int arcHeight) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-NSGraphicsContext context = NSGraphicsContext.currentContext();
-NSGraphicsContext.setCurrentContext(handle);
-checkGC(FILL);
 if (arcWidth is 0 || arcHeight is 0) {
 fillRectangle(x, y, width, height);
 return;
 }
-NSBezierPath path = data.path;
+NSAutoreleasePool pool = checkGC(FILL);
+try {
+NSBezierPath path = data.path;
 NSRect rect = NSRect();
 rect.x = x;
 rect.y = y;
 rect.width = width;
 rect.height = height;
 path.appendBezierPathWithRoundedRect(rect, arcWidth, arcHeight);
 Pattern pattern = data.backgroundPattern;
 if (pattern !is null && pattern.gradient !is null) {
 fillPattern(path, pattern);
 } else {
 path.fill();
 }
 path.removeAllPoints();
-NSGraphicsContext.setCurrentContext(context);
+} finally {
+uncheckGC(pool);
+}
 }
 void flush () {
+handle.flushGraphics();
 }
 /**
 * Returns the <em>advance width</em> of the specified character in
 * the font which is currently selected into the receiver.
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
 return true;
 }
 /**
-* Returns the receiver's alpha value.
+* Returns the receiver's alpha value. The alpha value
+* is between 0 (transparent) and 255 (opaque).
 *
 * @return the alpha value
 *
 * @exception DWTException <ul>
 *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
 */
 public Rectangle getClipping() {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
 NSRect rect;
 if (data.view !is null) {
-rect = data.view.bounds();
+rect = data.view.visibleRect();
 } else {
 rect = NSRect();
 if (data.image !is null) {
 NSSize size = data.image.handle.size();
 rect.width = size.width;
 if (region is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
 if (region.isDisposed()) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
 region.subtract(region);
 NSRect rect = void;
 if (data.view !is null) {
-rect = data.view.bounds();
+rect = data.view.visibleRect();
 } else {
 rect = NSRect();
 if (data.image !is null) {
 NSSize size = data.image.handle.size();
 rect.width = size.width;
 if (paintRect !is null) {
 region.intersect(cast(int)paintRect.x, cast(int)paintRect.y, cast(int)paintRect.width, cast(int)paintRect.height);
 }
 if (data.clipPath !is null) {
 NSBezierPath clip = data.clipPath.bezierPathByFlatteningPath();
-int count = clip.elementCount();
+int count = (int)/*64*/clip.elementCount();
 int pointCount = 0;
 Region clipRgn = new Region(device);
 int[] pointArray = new int[count * 2];
 NSPointArray points = cast(NSPointArray) OS.malloc(NSPoint.sizeof);
 if (points is null) DWT.error(DWT.ERROR_NO_HANDLES);
 NSPoint pt = NSPoint();
 for (int  i = 0; i < count; i++) {
-NSBezierPathElement element = clip.elementAtIndex_associatedPoints_(i, points);
+NSBezierPathElement element = clip.elementAtIndex(i, points);
 switch (element) {
 case NSMoveToBezierPathElement:
 if (pointCount !is 0) clipRgn.add(pointArray, pointCount);
 pointCount = 0;
 OS.memmove(&pt, points, NSPoint.sizeof);
 *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
 * </ul>
 */
 public FontMetrics getFontMetrics() {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-checkGC(FONT);
+NSAutoreleasePool pool = checkGC(FONT);
-NSFont font = data.font.handle;
+try {
+NSFont font = data.font.handle;
 int ascent = cast(int)(0.5f + font.ascender());
 int descent = cast(int)(0.5f + (-font.descender() + font.leading()));
 String s = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
 int averageCharWidth = stringExtent(s).x / s.length();
 return FontMetrics.cocoa_new(ascent, descent, averageCharWidth, 0, ascent + descent);
+} finally {
+uncheckGC(pool);
+}
 }
 /**
 * Returns the receiver's foreground color.
 *
 *
 * @since 3.1
 */
 public int getInterpolation() {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-int interpolation = handle.imageInterpolation();
+int interpolation = (int)/*64*/handle.imageInterpolation();
 switch (interpolation) {
 case OS.NSImageInterpolationDefault: return DWT.DEFAULT;
 case OS.NSImageInterpolationNone: return DWT.NONE;
 case OS.NSImageInterpolationLow: return DWT.LOW;
 case OS.NSImageInterpolationHigh: return DWT.HIGH;
 setTransform(null);
 }
 }
 /**
-* Sets the receiver's alpha value.
+* Sets the receiver's alpha value which must be
+* between 0 (transparent) and 255 (opaque).
 * <p>
 * This operation requires the operating system's advanced
 * graphics subsystem which may not be available on some
 * platforms.
 * </p>
 * </ul>
 */
 public Point textExtent(String string, int flags) {
 if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
 if (string is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-checkGC(FONT);
+NSAutoreleasePool pool = checkGC(FONT);
-NSAttributedString str = createString(string, flags);
+try {
-NSSize size = str.size();
+NSAttributedString str = createString(string, flags);
+NSSize size = str.size();
 return new Point(cast(int)size.width, cast(int)size.height);
+} finally {
+uncheckGC(pool);
+}
 }
 /**
 * Returns a string containing a concise, human-readable
 * description of the receiver.
 public String toString () {
 if (isDisposed()) return "GC {*DISPOSED*}";
 return Format("GC {{}{}" , handle , "}");
 }
-}
+void uncheckGC(NSAutoreleasePool pool) {
+NSView view = data.view;
+if (view !is null && data.paintRect is null) {
+if (data.thread !is Thread.currentThread()) flush();
+}
+if (pool !is null) pool.release();
+}
+}

Mercurial > projects > dwt-mac

comparison dwt/graphics/GC.d @ 45:d8635bb48c7c