FCL/sf/app/jrt: comparison javauis/lcdui_qt/src/javax/microedition/lcdui/Graphics.java

equal deleted inserted replaced

-:dc7c549001d5
+:85266cc22c7f
 static final int OPAQUE_ALPHA = 0xff000000;
 static final int COMPONENT_MASK = 0xFF;
+/**
+* Constants for sync strategy
+*/
+static final int SYNC_LEAVE_SURFACE_SESSION_CLOSED = 10;
+static final int SYNC_LEAVE_SURFACE_SESSION_OPEN = 11;
+// Set default sync strategy as closed
+private int syncStrategy = SYNC_LEAVE_SURFACE_SESSION_CLOSED;
 private DirectGraphics directGraphics;
 private Buffer graphicsBuffer;
-// Off-screen buffer.
-//private org.eclipse.swt.internal.qt.graphics.Image frameBuffer;
 // Current font for rendering texts.
 Font currentFont;
 int currentColor;
 int translateX;
 int translateY;
 int[] currentClip = new int[4];
-int currentStrokeSyle;
+int currentStrokeStyle;
 private com.nokia.mj.impl.rt.support.Finalizer finalizer;
-// serialization lock for command buffering and flush
-private final Object flushLock = new Object();
-private Canvas canvasParent;
-private CustomItem customItemParent;
 //Constructor
-Graphics(Buffer buffer)
+Graphics(Buffer buffer, Rectangle clipRect)
 {
 finalizer = ((finalizer != null) ? finalizer
 : new com.nokia.mj.impl.rt.support.Finalizer()
 {
 public void finalizeImpl()
 }
 }
 }
 });
+currentClip[0] = clipRect.x;
+currentClip[1] = clipRect.y;
+currentClip[2] = clipRect.width;
+currentClip[3] = clipRect.height;
 graphicsBuffer = buffer;
 reset();
 }
 /**
 * Resets Graphics state to initial.
 */
 void reset()
 {
-setColor(0, 0, 0);
+currentFont = Buffer.defaultFont;
-setFont(Font.getDefaultFont());
+currentColor = Buffer.defaultColor;
-setStrokeStyle(Graphics.SOLID);
+currentStrokeStyle = Buffer.defaultStrokeStyle;
-this.translateX = 0;
+translateX = Buffer.defaultTranslateX;
-this.translateY = 0;
+translateY = Buffer.defaultTranslateY;
 }
 /**
 * Cleans the Canvas background.
 */
 setColor(255, 255, 255);
 fillRect(x, y, w, h);
 setColor(savedColor);
 }
+/**
+* Sets the sync strategy for this instance.
+* This affects on the behavior of the sync method of this class
+* which is called via LCDUIInvoker
+*/
+void setSyncStrategy(int strategy)
+{
+	if((strategy != SYNC_LEAVE_SURFACE_SESSION_CLOSED) && (strategy != SYNC_LEAVE_SURFACE_SESSION_OPEN))
+	{
+		throw new IllegalArgumentException("Internal: Invalid strategy value");
+	}
+	syncStrategy = strategy;
+}
 /**
 * Sets coordinate translation. Translations are cumulative.
 *
 * @param xDelta x-shift for coordinates.
 x = xPos - image.getWidth();
 }
 synchronized(image.graphicsBuffer)
 {
-image.sync();
+final Image localLcduiImage = image;
-graphicsBuffer.drawImage(Internal_GfxPackageSupport.getImage(Image.getESWTImage(image)), x, y, this);
+final org.eclipse.swt.internal.qt.graphics.Image localCgfxImage =
+	Internal_GfxPackageSupport.getImage(Image.getESWTImage(image));
+final int localX = x;
+final int localY = y;
+final Graphics self = this;
+ESWTUIThreadRunner.safeSyncExec(new Runnable()
+			{
+				public void run()
+				{
+					localLcduiImage.sync(false);
+					graphicsBuffer.drawImage(localCgfxImage, localX, localY, self);
+				}
+			});
 }
 }
 }
 /**
 *            Graphics.DOTTED.
 * @throws IllegalArgumentException if the new style value is invalid.
 */
 public void setStrokeStyle(int newStyle)
 {
-if(newStyle == currentStrokeSyle)
+if(newStyle == currentStrokeStyle)
 {
 return;
 }
 synchronized(graphicsBuffer)
 {
 {
 throw new IllegalArgumentException(
 MsgRepository.GRAPHICS_EXCEPTION_ILLEGAL_STROKE_STYLE);
 }
 graphicsBuffer.setStrokeStyle(styleToApply, newStyle, this);
-currentStrokeSyle = newStyle;
+currentStrokeStyle = newStyle;
 }
 }
 /**
 * Returns current stroke style.
 */
 public int getStrokeStyle()
 {
 synchronized(graphicsBuffer)
 {
-return currentStrokeSyle;
+return currentStrokeStyle;
 }
 }
 /**
 * Returns the color that will be used if the specified color is requested.
 x = xDst - srcImage.getWidth();
 }
 final int gcTransform = Image.getCgTransformValue(transform);
 synchronized(srcImage.graphicsBuffer)
 {
-srcImage.sync();
+	final Image localLcduiSrcImage = srcImage;
-graphicsBuffer.drawImage(Internal_GfxPackageSupport.getImage(Image.getESWTImage(srcImage)),
+	final org.eclipse.swt.internal.qt.graphics.Image localCgfxImage =
-x, y, width, height, xSrc, ySrc, width, height, gcTransform, this);
+	Internal_GfxPackageSupport.getImage(Image.getESWTImage(srcImage));
-}
+	final int localX = x;
-}
+	final int localY = y;
-}
+	final int localW = width;
+	final int localH = height;
+	final int localXSrc = xSrc;
+	final int localYSrc = ySrc;
+	final int localGcTransform = gcTransform;
+	final Graphics self = this;
+	ESWTUIThreadRunner.safeSyncExec(new Runnable()
+{
+public void run()
+{
+	localLcduiSrcImage.sync(false);
+graphicsBuffer.drawImage(localCgfxImage,
+		localX, localY, localW, localH, localXSrc, localYSrc, localW, localH, localGcTransform, self);
+}
+});
+}
+}
+}
+/**
+* Performs synchronization on the graphics buffer, i.e.
+* the buffered draw commands are rasterized to the surface.
+*/
+void sync()
+{
+	synchronized(graphicsBuffer)
+	{
+		if(syncStrategy == SYNC_LEAVE_SURFACE_SESSION_OPEN)
+		{
+			// This instance is used only with paint callbacks, thus
+			// sync is called with the indication that surface paint
+			// session can be left open as it will be closed when the
+			// callback returns.
+		    graphicsBuffer.sync(false);
+		}
+		else
+		{
+			graphicsBuffer.sync(true);
+		}
+	}
+}
 /**
 * Return DirectGraphics associated with this instance.
 */
 DirectGraphics getDirectGraphics()
 {
 directGraphics = new DirectGraphicsImpl(this);
 }
 return directGraphics;
 }
+/**
+	 * Getter for graphics buffer.
+	 * @return The Buffer.
+	 */
+Buffer getGraphicsBuffer()
+{
+return graphicsBuffer;
+}
 /**
 * Maps stroke style constant from values used by
 * Graphics to values defined in GraphicsContext
 */
 static int mapStrokeStyle(int strokeStyle)

changeset 35	85266cc22c7f
parent 26	dc7c549001d5
child 47	f40128debb5d