From: Scott Gilbertson Date: Wed, 15 Jan 2003 23:53:49 +0000 (+0000) Subject: natGC.cc (fillPolygon): New method. X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f826d5952cbea7d361f5e7869868acb7cce47d95;p=gcc.git natGC.cc (fillPolygon): New method. 2003-01-15 Scott Gilbertson * 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 --- diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 081ce99c6b7..62f54b556f9 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,15 @@ +2003-01-15 Scott Gilbertson + + * 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 * Makefile.in: Rebuilt. diff --git a/libjava/gnu/awt/j2d/DirectRasterGraphics.java b/libjava/gnu/awt/j2d/DirectRasterGraphics.java index 8d25b88d018..28aad9b0404 100644 --- a/libjava/gnu/awt/j2d/DirectRasterGraphics.java +++ b/libjava/gnu/awt/j2d/DirectRasterGraphics.java @@ -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); diff --git a/libjava/gnu/awt/j2d/IntegerGraphicsState.java b/libjava/gnu/awt/j2d/IntegerGraphicsState.java index 90a1a4d2ab5..bfea6611ca5 100644 --- a/libjava/gnu/awt/j2d/IntegerGraphicsState.java +++ b/libjava/gnu/awt/j2d/IntegerGraphicsState.java @@ -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, diff --git a/libjava/gnu/awt/xlib/XGraphics.java b/libjava/gnu/awt/xlib/XGraphics.java index 27b07a2369a..90f53880e85 100644 --- a/libjava/gnu/awt/xlib/XGraphics.java +++ b/libjava/gnu/awt/xlib/XGraphics.java @@ -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) diff --git a/libjava/gnu/gcj/xlib/GC.java b/libjava/gnu/gcj/xlib/GC.java index 6b33715cf6c..1806c2ae569 100644 --- a/libjava/gnu/gcj/xlib/GC.java +++ b/libjava/gnu/gcj/xlib/GC.java @@ -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); /** * diff --git a/libjava/gnu/gcj/xlib/natGC.cc b/libjava/gnu/gcj/xlib/natGC.cc index 66de35f868b..1a1bd586d8e 100644 --- a/libjava/gnu/gcj/xlib/natGC.cc +++ b/libjava/gnu/gcj/xlib/natGC.cc @@ -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 #include +#include #include #include #include @@ -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 points(nPoints+1); + for (int i=0; i