OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

natGC.cc (fillPolygon): New method.

Browse Source 
2003-01-15  Scott Gilbertson  <scottg@mantatest.com>

	* gnu/gcj/xlib/natGC.cc (fillPolygon): New method.
	* gnu/gcj/xlib/GC.java (fillPolygon): Declare.
	* gnu/awt/xlib/XGraphics.java (fillPolygon): Added translateX and
	translateY arguments.  Implement.
	* gnu/awt/j2d/IntegerGraphicsState.java (fillPolygon): Pass
	down translation arguments.
	(drawPolyline, drawPolygon): Fix incorrect tests.
	* gnu/awt/j2d/DirectRasterGraphics.java (fillPolygon): Added
	translateX and translateY arguments.

From-SVN: r61369
This commit is contained in:
Scott Gilbertson 2003-01-15 23:53:49 +00:00 committed by Tom Tromey
parent 2af84af57b
commit f826d5952c
6 changed files with 52 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libjava/ChangeLog
View File

@ -1,3 +1,15 @@
2003-01-15 Scott Gilbertson <scottg@mantatest.com>
* gnu/gcj/xlib/natGC.cc (fillPolygon): New method.
* gnu/gcj/xlib/GC.java (fillPolygon): Declare.
* gnu/awt/xlib/XGraphics.java (fillPolygon): Added translateX and
translateY arguments. Implement.
* gnu/awt/j2d/IntegerGraphicsState.java (fillPolygon): Pass
down translation arguments.
(drawPolyline, drawPolygon): Fix incorrect tests.
* gnu/awt/j2d/DirectRasterGraphics.java (fillPolygon): Added
translateX and translateY arguments.
2003-01-15 Scott Gilbertson <scottg@mantatest.com>
* Makefile.in: Rebuilt.

5
libjava/gnu/awt/j2d/DirectRasterGraphics.java
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2000 Free Software Foundation
/* Copyright (C) 2000, 2003 Free Software Foundation
This file is part of libgcj.
@ -61,7 +61,8 @@ public interface DirectRasterGraphics extends Cloneable
public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints);
public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints);
public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints,
int translateX, int translateY);
public void drawString(String str, int x, int y);

18
libjava/gnu/awt/j2d/IntegerGraphicsState.java
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2000 Free Software Foundation
/* Copyright (C) 2000, 2003 Free Software Foundation
This file is part of libgcj.
@ -212,7 +212,7 @@ public class IntegerGraphicsState extends AbstractGraphicsState
public void drawPolyline(int[] xPoints, int[] yPoints, int nPoints)
{
if ((tx == 0) || (ty == 0))
if ((tx == 0) && (ty == 0))
{
directGfx.drawPolyline(xPoints, yPoints, nPoints);
return;
@ -223,7 +223,7 @@ public class IntegerGraphicsState extends AbstractGraphicsState
public void drawPolygon(int[] xPoints, int[] yPoints, int nPoints)
{
if ((tx == 0) || (ty == 0))
if ((tx == 0) && (ty == 0))
{
directGfx.drawPolygon(xPoints, yPoints, nPoints);
return;
@ -232,15 +232,11 @@ public class IntegerGraphicsState extends AbstractGraphicsState
throw new UnsupportedOperationException("translate not implemented");
}
public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints)
public void fillPolygon (int[] xPoints, int[] yPoints, int nPoints)
{
if ((tx == 0) || (ty == 0))
{
directGfx.fillPolygon(xPoints, yPoints, nPoints);
return;
}
throw new UnsupportedOperationException("translate not implemented");
// FIXME: remove tx & ty args once translation via AffineTransform
// is implemented.
directGfx.fillPolygon (xPoints, yPoints, nPoints, tx, ty);
}
public boolean drawImage(Image image, int x, int y,

8
libjava/gnu/awt/xlib/XGraphics.java
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2000 Free Software Foundation
/* Copyright (C) 2000, 2003 Free Software Foundation
This file is part of libgcj.
@ -176,10 +176,10 @@ public class XGraphics implements Cloneable, DirectRasterGraphics
throw new UnsupportedOperationException("not implemented");
}
public void fillPolygon(int[] xPoints, int[] yPoints, int
nPoints)
public void fillPolygon(int[] xPoints, int[] yPoints, int nPoints,
int translateX, int translateY)
{
throw new UnsupportedOperationException("not implemented");
context.fillPolygon(xPoints, yPoints, nPoints, translateX, translateY);
}
public void drawString(String str, int x, int y)

4
libjava/gnu/gcj/xlib/GC.java
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2000 Free Software Foundation
/* Copyright (C) 2000, 2003 Free Software Foundation
This file is part of libgcj.
@ -84,6 +84,8 @@ public class GC implements Cloneable
public native void drawRectangle(int x, int y, int w, int h);
public native void fillRectangle(int x, int y, int w, int h);
public native void fillPolygon(int[] xPoints, int[] yPoints, int nPoints,
int translateX, int translateY);
/**
*

24
libjava/gnu/gcj/xlib/natGC.cc
View File

@ -1,4 +1,4 @@
/* Copyright (C) 2000 Free Software Foundation
/* Copyright (C) 2000, 2003 Free Software Foundation
This file is part of libgcj.
@ -11,6 +11,7 @@ details. */
#include <X11/Xlib.h>
#include <gcj/cni.h>
#include <gcj/array.h>
#include <gnu/gcj/RawData.h>
#include <java/lang/String.h>
#include <java/awt/Rectangle.h>
@ -154,6 +155,27 @@ void gnu::gcj::xlib::GC::fillRectangle(jint x, jint y, jint w, jint h)
// no fast fail
}
void gnu::gcj::xlib::GC::fillPolygon(jintArray xPoints, jintArray yPoints,
jint nPoints,
jint translateX, jint translateY)
{
Display* display = target->getDisplay();
::Display* dpy = (::Display*) (display->display);
::Drawable drawableXID = target->getXID();
::GC gc = (::GC) structure;
typedef ::XPoint xpoint;
std::vector<xpoint> points(nPoints+1);
for (int i=0; i<nPoints; i++)
{
points[i].x = elements(xPoints)[i] + translateX;
points[i].y = elements(yPoints)[i] + translateY;
}
points[nPoints] = points[0];
XFillPolygon(dpy, drawableXID, gc, &(points.front()), nPoints,
Complex, CoordModeOrigin);
// no fast fail
}
void gnu::gcj::xlib::GC::clearArea(jint x, jint y, jint w, jint h,
jboolean exposures)
{