aboutsummaryrefslogtreecommitdiff
path: root/libjava/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'libjava/gnu')
-rw-r--r--libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java199
-rw-r--r--libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java4
-rw-r--r--libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java5
-rw-r--r--libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.java1
4 files changed, 121 insertions, 88 deletions
diff --git a/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java b/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java
index 8bae336..633eb09 100644
--- a/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java
+++ b/libjava/gnu/java/awt/peer/gtk/GdkGraphics2D.java
@@ -201,7 +201,7 @@ public class GdkGraphics2D extends Graphics2D
// draw current buffered image to the pixmap associated
// with it.
- drawImage (bimage, new AffineTransform (1,0,0,1,0,0), null);
+ drawImage (bimage, new AffineTransform (1,0,0,1,0,0), bg, null);
}
@@ -440,6 +440,69 @@ public class GdkGraphics2D extends Graphics2D
}
+ private boolean drawImage(Image img,
+ AffineTransform xform,
+ Color bgcolor,
+ ImageObserver obs)
+ {
+ if (img instanceof GtkOffScreenImage &&
+ img.getGraphics () instanceof GdkGraphics2D &&
+ (xform == null
+ || xform.getType () == AffineTransform.TYPE_IDENTITY
+ || xform.getType () == AffineTransform.TYPE_TRANSLATION)
+ )
+ {
+ // we are being asked to flush a double buffer from Gdk
+ GdkGraphics2D g2 = (GdkGraphics2D) img.getGraphics ();
+ gdkDrawDrawable (g2, (int)xform.getTranslateX(), (int)xform.getTranslateY());
+
+ if (isBufferedImageGraphics ())
+ updateBufferedImage();
+
+ return true;
+ }
+ else
+ {
+
+ // In this case, xform is an AffineTransform that transforms bounding
+ // box of the specified image from image space to user space. However
+ // when we pass this transform to cairo, cairo will use this transform
+ // to map "user coordinates" to "pixel" coordinates, which is the
+ // other way around. Therefore to get the "user -> pixel" transform
+ // that cairo wants from "image -> user" transform that we currently
+ // have, we will need to invert the transformation matrix.
+
+ AffineTransform invertedXform = new AffineTransform();
+
+ try
+ {
+ invertedXform = xform.createInverse();
+ if (img instanceof BufferedImage)
+ {
+ // draw an image which has actually been loaded
+ // into memory fully
+
+ BufferedImage b = (BufferedImage) img;
+ return drawRaster (b.getColorModel (),
+ b.getData (),
+ invertedXform,
+ bgcolor);
+ }
+ else
+ {
+ // begin progressive loading in a separate thread
+ new PainterThread (this, img, invertedXform, bgcolor);
+ return false;
+ }
+ }
+ catch (NoninvertibleTransformException e)
+ {
+ throw new ImagingOpException("Unable to invert transform "
+ + xform.toString());
+ }
+ }
+ }
+
//////////////////////////////////////////////////
////// Implementation of Graphics2D Methods //////
@@ -965,7 +1028,8 @@ public class GdkGraphics2D extends Graphics2D
}
private boolean drawRaster (ColorModel cm, Raster r,
- AffineTransform imageToUser)
+ AffineTransform imageToUser,
+ Color bgcolor)
{
if (r == null)
return false;
@@ -1012,6 +1076,18 @@ public class GdkGraphics2D extends Graphics2D
pixels = pixels2;
}
+ // change all transparent pixels in the image to the
+ // specified bgcolor
+
+ if (bgcolor != null)
+ {
+ for (int i = 0; i < pixels.length; i++)
+ {
+ if (cm.getAlpha (pixels[i]) == 0)
+ pixels[i] = bgcolor.getRGB ();
+ }
+ }
+
stateSave ();
translate (x, y);
drawPixels (pixels, r.getWidth (), r.getHeight (), r.getWidth (), i2u);
@@ -1026,7 +1102,7 @@ public class GdkGraphics2D extends Graphics2D
public void drawRenderedImage(RenderedImage image,
AffineTransform xform)
{
- drawRaster (image.getColorModel(), image.getData(), xform);
+ drawRaster (image.getColorModel(), image.getData(), xform, bg);
}
public void drawRenderableImage(RenderableImage image,
@@ -1039,60 +1115,7 @@ public class GdkGraphics2D extends Graphics2D
AffineTransform xform,
ImageObserver obs)
{
- if (img instanceof GtkOffScreenImage &&
- img.getGraphics () instanceof GdkGraphics2D &&
- (xform == null
- || xform.getType () == AffineTransform.TYPE_IDENTITY
- || xform.getType () == AffineTransform.TYPE_TRANSLATION)
- )
- {
- // we are being asked to flush a double buffer from Gdk
- GdkGraphics2D g2 = (GdkGraphics2D) img.getGraphics ();
- gdkDrawDrawable (g2, (int)xform.getTranslateX(), (int)xform.getTranslateY());
-
- if (isBufferedImageGraphics ())
- updateBufferedImage();
-
- return true;
- }
- else
- {
-
- // In this case, xform is an AffineTransform that transforms bounding
- // box of the specified image from image space to user space. However
- // when we pass this transform to cairo, cairo will use this transform
- // to map "user coordinates" to "pixel" coordinates, which is the
- // other way around. Therefore to get the "user -> pixel" transform
- // that cairo wants from "image -> user" transform that we currently
- // have, we will need to invert the transformation matrix.
-
- AffineTransform invertedXform = new AffineTransform();
-
- try
- {
- invertedXform = xform.createInverse();
- if (img instanceof BufferedImage)
- {
- // draw an image which has actually been loaded
- // into memory fully
- BufferedImage b = (BufferedImage) img;
- return drawRaster (b.getColorModel (),
- b.getData (),
- invertedXform);
- }
- else
- {
- // begin progressive loading in a separate thread
- new PainterThread (this, img, invertedXform);
- return false;
- }
- }
- catch (NoninvertibleTransformException e)
- {
- throw new ImagingOpException("Unable to invert transform "
- + xform.toString());
- }
- }
+ return drawImage(img, xform, bg, obs);
}
public void drawImage(BufferedImage image,
@@ -1101,13 +1124,13 @@ public class GdkGraphics2D extends Graphics2D
int y)
{
Image filtered = op.filter(image, null);
- drawImage(filtered, new AffineTransform(1f,0f,0f,1f,x,y), null);
+ drawImage(filtered, new AffineTransform(1f,0f,0f,1f,x,y), bg, null);
}
public boolean drawImage (Image img, int x, int y,
ImageObserver observer)
{
- return drawImage(img, new AffineTransform(1f,0f,0f,1f,x,y), observer);
+ return drawImage(img, new AffineTransform(1f,0f,0f,1f,x,y), bg, observer);
}
@@ -1130,11 +1153,14 @@ public class GdkGraphics2D extends Graphics2D
Image image;
ColorModel defaultModel;
AffineTransform xform;
+ Color bgcolor;
- public PainterThread (GdkGraphics2D g, Image im, AffineTransform xf)
+ public PainterThread (GdkGraphics2D g, Image im,
+ AffineTransform xf, Color bg)
{
image = im;
xform = xf;
+ bgcolor = bg;
this.gr = (GdkGraphics2D) g.create ();
new Thread (this).start ();
}
@@ -1184,6 +1210,18 @@ public class GdkGraphics2D extends Graphics2D
else
pixels2 = pixels;
+ // change all transparent pixels in the image to the
+ // specified bgcolor
+
+ if (bgcolor != null)
+ {
+ for (int i = 0; i < pixels2.length; i++)
+ {
+ if (model.getAlpha (pixels2[i]) == 0)
+ pixels2[i] = bgcolor.getRGB ();
+ }
+ }
+
double[] xf = new double[6];
xform.getMatrix(xf);
gr.drawPixels (pixels2, w, h, scansize, xf);
@@ -1347,40 +1385,27 @@ public class GdkGraphics2D extends Graphics2D
Color bgcolor, ImageObserver observer)
{
- // FIXME: change all the transparent pixels in the image to
- // bgcolor.
-
- return drawImage (img, x, y, width, height, observer);
- }
-
- public boolean drawImage (Image img, int x, int y, int width, int height,
- ImageObserver observer)
- {
-
double scaleX = width / (double) img.getWidth (observer);
double scaleY = height / (double) img.getHeight (observer);
return drawImage (img,
new AffineTransform(scaleX, 0f, 0f, scaleY, x, y),
+ bgcolor,
observer);
}
- public boolean drawImage (Image img, int dx1, int dy1, int dx2, int dy2,
- int sx1, int sy1, int sx2, int sy2,
- Color bgcolor, ImageObserver observer)
+ public boolean drawImage (Image img, int x, int y, int width, int height,
+ ImageObserver observer)
{
-
- // FIXME: change all transparent pixels in the image to
- // bgcolor
-
- return drawImage (img, dx1, dy1, dx2, dy2,
- sx1, sy1, sx2, sy2, observer);
+
+ return drawImage (img, x, y, width, height, bg, observer);
+
}
public boolean drawImage (Image img, int dx1, int dy1, int dx2, int dy2,
int sx1, int sy1, int sx2, int sy2,
- ImageObserver observer)
+ Color bgcolor, ImageObserver observer)
{
Image subImage;
@@ -1420,8 +1445,18 @@ public class GdkGraphics2D extends Graphics2D
}
return drawImage(subImage, new AffineTransform(scaleX, 0, 0,
- scaleY, dx1, dy1),
- observer);
+ scaleY, dx1, dy1),
+ bgcolor,
+ observer);
+ }
+
+ public boolean drawImage (Image img, int dx1, int dy1, int dx2, int dy2,
+ int sx1, int sy1, int sx2, int sy2,
+ ImageObserver observer)
+ {
+
+ return drawImage (img, dx1, dy1, dx2, dy2,
+ sx1, sy1, sx2, sy2, bg, observer);
}
public void drawOval(int x, int y, int width, int height)
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
index 4e338f6..55581d1 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
+++ b/libjava/gnu/java/awt/peer/gtk/GtkMenuItemPeer.java
@@ -50,6 +50,7 @@ public class GtkMenuItemPeer extends GtkMenuComponentPeer
implements MenuItemPeer
{
native void create (String label);
+ public native void connectSignals ();
public GtkMenuItemPeer (MenuItem item)
{
@@ -57,6 +58,9 @@ public class GtkMenuItemPeer extends GtkMenuComponentPeer
create (item.getLabel ());
setEnabled (item.isEnabled ());
setParent (item);
+
+ if (item.getParent() instanceof Menu && ! (item instanceof Menu))
+ connectSignals();
}
void setParent (MenuItem item)
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java
index a5fcae7..9b3f678 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java
+++ b/libjava/gnu/java/awt/peer/gtk/GtkMenuPeer.java
@@ -95,10 +95,5 @@ public class GtkMenuPeer extends GtkMenuItemPeer
addItem (item, key, shiftModifier);
}
- public void addSeparator ()
- {
- addItem (new MenuItem ("-"));
- }
-
native public void delItem (int index);
}
diff --git a/libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.java b/libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.java
index 4f77994..70aab2c 100644
--- a/libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.java
+++ b/libjava/gnu/java/awt/peer/gtk/GtkPanelPeer.java
@@ -46,7 +46,6 @@ public class GtkPanelPeer extends GtkContainerPeer
{
native void create ();
native void connectJObject ();
- native void connectSignals ();
public GtkPanelPeer (Panel p)
{
generated by cgit v1.1 at 2025-04-02 12:53:47 +0000