Window.java (Window(Window,GraphicsConfiguration)): Don't try to find graphics configuration.
* java/awt/Window.java (Window(Window,GraphicsConfiguration)): Don't try to find graphics configuration. * java/awt/Toolkit.java (default_toolkit_name): Use new Configuration entry. * gnu/classpath/Configuration.java.in (default_awt_peer_toolkit): New global. * configure: Rebuilt. * configure.in (TOOLKIT): New subst. (--enable-java-awt) [xlib, gtk]: Set TOOLKIT if required. Do AWT tests much earlier. Run Gtk tests. Make jniinclude directory. Make output directories for .c files. * Makefile.in: Rebuilt. * Makefile.am (lib_gnu_java_awt_peer_gtk_la_SOURCES): New macro. (toolexeclib_LTLIBRARIES): Added cond_gtk_ltlibrary. (all_java_source_files): Added new sources. ($(lib_gnu_java_awt_peer_gtk_la_OBJECTS)): New target. (gtk_c_files): New macro. (gtk_c_source_files): New macro. (cond_gtk_ltlibrary): New macro. ($(gtk_c_files)): New target. (lib_gnu_java_awt_peer_gtk_la_LIBADD): New macro. (gtk_awt_peer_sources): New macro. (gtk_c_headers): New macro. ($(gtk_c_headers)): New target. (ACLOCAL_AMFLAGS): New macro. * gtk.m4, glib.m4, libart.m4: New files. * gnu/java/awt/peer/gtk/GdkFontMetrics.java, gnu/java/awt/peer/gtk/GdkGraphics.java, gnu/java/awt/peer/gtk/GtkArg.java, gnu/java/awt/peer/gtk/GtkArgList.java, gnu/java/awt/peer/gtk/GtkButtonPeer.java, gnu/java/awt/peer/gtk/GtkCanvasPeer.java, gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java, gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java, gnu/java/awt/peer/gtk/GtkCheckboxPeer.java, gnu/java/awt/peer/gtk/GtkChoicePeer.java, gnu/java/awt/peer/gtk/GtkClipboard.java, gnu/java/awt/peer/gtk/GtkComponentPeer.java, gnu/java/awt/peer/gtk/GtkContainerPeer.java, gnu/java/awt/peer/gtk/GtkDialogPeer.java, gnu/java/awt/peer/gtk/GtkFileDialogPeer.java, gnu/java/awt/peer/gtk/GtkFontPeer.java, gnu/java/awt/peer/gtk/GtkFramePeer.java, gnu/java/awt/peer/gtk/GtkGenericPeer.java, gnu/java/awt/peer/gtk/GtkImage.java, gnu/java/awt/peer/gtk/GtkImagePainter.java, gnu/java/awt/peer/gtk/GtkLabelPeer.java, gnu/java/awt/peer/gtk/GtkListPeer.java, gnu/java/awt/peer/gtk/GtkMainThread.java, gnu/java/awt/peer/gtk/GtkMenuBarPeer.java, gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java, gnu/java/awt/peer/gtk/GtkMenuItemPeer.java, gnu/java/awt/peer/gtk/GtkMenuPeer.java, gnu/java/awt/peer/gtk/GtkOffScreenImage.java, gnu/java/awt/peer/gtk/GtkPanelPeer.java, gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java, gnu/java/awt/peer/gtk/GtkScrollbarPeer.java, gnu/java/awt/peer/gtk/GtkScrollPanePeer.java, gnu/java/awt/peer/gtk/GtkTextAreaPeer.java, gnu/java/awt/peer/gtk/GtkTextComponentPeer.java, gnu/java/awt/peer/gtk/GtkTextFieldPeer.java, gnu/java/awt/peer/gtk/GtkToolkit.java, gnu/java/awt/peer/gtk/GtkWindowPeer.java, gnu/java/awt/peer/gtk/TestAWT.java, gnu/java/awt/peer/gtk/Test.java: New files from Classpath. * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c, jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c, jni/gtk-peer/gthread-jni.c, jni/gtk-peer/gthread-jni.h, jni/gtk-peer/gtkpeer.h, jni/classpath/jcl.c, jni/classpath/jcl.h, jni/classpath/jnilink.c, jni/classpath/jnilink.h, jni/classpath/native_state.c, jni/classpath/native_state.h, jni/classpath/primlib.c, jni/classpath/primlib.h: Likewise. From-SVN: r62187
This commit is contained in:
Tom Tromey
Tom Tromey
parent
371ac72558
commit
5aac1dac62
93 changed files with 16186 additions and 1309 deletions
239
libjava/gnu/java/awt/peer/gtk/GtkImagePainter.java
Normal file
239
libjava/gnu/java/awt/peer/gtk/GtkImagePainter.java
Normal file
|
|
@ -0,0 +1,239 @@
|
|||
/* GtkImagePainter.java
|
||||
Copyright (C) 1999, 2000 Free Software Foundation, Inc.
|
||||
|
||||
This file is part of GNU Classpath.
|
||||
|
||||
GNU Classpath is free software; you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation; either version 2, or (at your option)
|
||||
any later version.
|
||||
|
||||
GNU Classpath is distributed in the hope that it will be useful, but
|
||||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with GNU Classpath; see the file COPYING. If not, write to the
|
||||
Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
||||
02111-1307 USA.
|
||||
|
||||
Linking this library statically or dynamically with other modules is
|
||||
making a combined work based on this library. Thus, the terms and
|
||||
conditions of the GNU General Public License cover the whole
|
||||
combination.
|
||||
|
||||
As a special exception, the copyright holders of this library give you
|
||||
permission to link this library with independent modules to produce an
|
||||
executable, regardless of the license terms of these independent
|
||||
modules, and to copy and distribute the resulting executable under
|
||||
terms of your choice, provided that you also meet, for each linked
|
||||
independent module, the terms and conditions of the license of that
|
||||
module. An independent module is a module which is not derived from
|
||||
or based on this library. If you modify this library, you may extend
|
||||
this exception to your version of the library, but you are not
|
||||
obligated to do so. If you do not wish to do so, delete this
|
||||
exception statement from your version. */
|
||||
|
||||
package gnu.java.awt.peer.gtk;
|
||||
|
||||
import java.awt.*;
|
||||
import java.awt.image.*;
|
||||
import java.util.*;
|
||||
|
||||
public class GtkImagePainter implements Runnable, ImageConsumer
|
||||
{
|
||||
GtkImage image;
|
||||
GdkGraphics gc;
|
||||
int startX, startY;
|
||||
int redBG;
|
||||
int greenBG;
|
||||
int blueBG;
|
||||
double affine[];
|
||||
int width, height;
|
||||
boolean flipX, flipY;
|
||||
Rectangle clip;
|
||||
int s_width, s_height;
|
||||
|
||||
public
|
||||
GtkImagePainter (GtkImage image, GdkGraphics gc, int x, int y,
|
||||
int width, int height, Color bgcolor)
|
||||
{
|
||||
this.image = image;
|
||||
this.gc = (GdkGraphics) gc.create ();
|
||||
startX = x;
|
||||
startY = y;
|
||||
redBG = bgcolor.getRed ();
|
||||
greenBG = bgcolor.getGreen ();
|
||||
blueBG = bgcolor.getBlue ();
|
||||
this.width = width;
|
||||
this.height = height;
|
||||
flipX = flipY = false;
|
||||
s_width = s_height = 0;
|
||||
clip = null;
|
||||
|
||||
new Thread (this).start ();
|
||||
}
|
||||
|
||||
public
|
||||
GtkImagePainter (GtkImage image, GdkGraphics gc,
|
||||
int dx1, int dy1, int dx2, int dy2,
|
||||
int sx1, int sy1, int sx2, int sy2,
|
||||
Color bgcolor)
|
||||
{
|
||||
this.image = image;
|
||||
this.gc = (GdkGraphics) gc.create ();
|
||||
startX = (dx1 < dx2) ? dx1 : dx2;
|
||||
startY = dy1;
|
||||
redBG = bgcolor.getRed ();
|
||||
greenBG = bgcolor.getGreen ();
|
||||
blueBG = bgcolor.getBlue ();
|
||||
|
||||
this.width = Math.abs (dx2 - dx1);
|
||||
this.height = Math.abs (dy2 - dy1);
|
||||
|
||||
flipX = ((dx1 > dx2 && sx2 > sx1)
|
||||
|| (dx1 < dx2 && sx2 < sx1));
|
||||
|
||||
flipY = ((dy1 > dy2 && sy2 > sy1)
|
||||
|| (dy1 < dy2 && sy2 < sy1));
|
||||
|
||||
s_width = Math.abs (sx2 - sx1);
|
||||
s_height = Math.abs (sy2 - sy1);
|
||||
clip = new Rectangle (sx1, sy1, s_width, s_height);
|
||||
|
||||
new Thread (this).start ();
|
||||
}
|
||||
|
||||
public void
|
||||
run ()
|
||||
{
|
||||
image.startProduction (this);
|
||||
gc.dispose ();
|
||||
}
|
||||
|
||||
/* Convert pixel data into a format that gdkrgb can understand */
|
||||
static int[]
|
||||
convertPixels (int[] pixels, ColorModel model)
|
||||
{
|
||||
if (model.equals (ColorModel.getRGBdefault ()))
|
||||
return pixels;
|
||||
|
||||
int ret[] = new int[pixels.length];
|
||||
|
||||
for (int i = 0; i < pixels.length; i++)
|
||||
ret[i] = model.getRGB (pixels[i]);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
static int[]
|
||||
convertPixels (byte[] pixels, ColorModel model)
|
||||
{
|
||||
int ret[] = new int[pixels.length];
|
||||
|
||||
for (int i = 0; i < pixels.length; i++)
|
||||
ret[i] = model.getRGB (pixels[i]);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
native void
|
||||
drawPixels (GdkGraphics gc, int bg_red, int bg_green, int bg_blue,
|
||||
int x, int y, int width, int height, int[] pixels, int offset,
|
||||
int scansize, double affine[]);
|
||||
|
||||
|
||||
public void
|
||||
setPixels (int x, int y, int width, int height, ColorModel model,
|
||||
int[] pixels, int offset, int scansize)
|
||||
{
|
||||
if (clip != null)
|
||||
{
|
||||
Rectangle r;
|
||||
r = clip.intersection (new Rectangle (x, y, width, height));
|
||||
if (r.width == 0 && r.height == 0)
|
||||
return;
|
||||
|
||||
offset += r.y * scansize + r.x;
|
||||
|
||||
r.translate (-Math.abs (clip.x - startX), -Math.abs (clip.y - startY));
|
||||
|
||||
width = r.width;
|
||||
height = r.height;
|
||||
x = r.x;
|
||||
y = r.y;
|
||||
}
|
||||
|
||||
drawPixels (gc, redBG, greenBG, blueBG,
|
||||
startX + x, startY + y,
|
||||
width, height, convertPixels (pixels, model), offset,
|
||||
scansize, affine);
|
||||
}
|
||||
|
||||
public void
|
||||
setPixels (int x, int y, int width, int height, ColorModel model,
|
||||
byte[] pixels, int offset, int scansize)
|
||||
{
|
||||
setPixels (x, y, width, height, model, convertPixels (pixels, model),
|
||||
offset, scansize);
|
||||
}
|
||||
|
||||
public void
|
||||
setDimensions (int width, int height)
|
||||
{
|
||||
if (!flipX && !flipY &&
|
||||
((this.width == -1 && this.height == -1)
|
||||
|| (this.width == width && this.height == height)))
|
||||
return;
|
||||
|
||||
affine = new double[6];
|
||||
affine[1] = affine[2] = affine[4] = affine[5] = 0;
|
||||
|
||||
if (clip != null)
|
||||
{
|
||||
affine[0] = this.width / (double) s_width;
|
||||
affine[3] = this.height / (double) s_height;
|
||||
}
|
||||
else
|
||||
{
|
||||
affine[0] = this.width / (double) width;
|
||||
affine[3] = this.height / (double) height;
|
||||
}
|
||||
|
||||
if (flipX)
|
||||
{
|
||||
affine[0] = -affine[0];
|
||||
affine[4] = this.width;
|
||||
}
|
||||
|
||||
if (flipY)
|
||||
{
|
||||
affine[3] = -affine[3];
|
||||
affine[5] = this.height;
|
||||
}
|
||||
|
||||
if (affine[0] == 1 && affine[3] == 1)
|
||||
affine = null;
|
||||
}
|
||||
|
||||
public void
|
||||
setProperties (Hashtable props)
|
||||
{
|
||||
}
|
||||
|
||||
public void
|
||||
setColorModel (ColorModel model)
|
||||
{
|
||||
}
|
||||
|
||||
public void
|
||||
setHints (int flags)
|
||||
{
|
||||
}
|
||||
|
||||
public void
|
||||
imageComplete (int status)
|
||||
{
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue