mirror of
https://gcc.gnu.org/git/gcc.git
synced 2025-01-26 22:34:27 +08:00
More AWT/Swing merge from GNU Classpath.
From-SVN: r56149
This commit is contained in:
parent
8f5c92a0a3
commit
084ef9cf09
@ -405,6 +405,10 @@
|
|||||||
java/awt/image/renderable/RenderedImageFactory.java: New files from
|
java/awt/image/renderable/RenderedImageFactory.java: New files from
|
||||||
classpath.
|
classpath.
|
||||||
|
|
||||||
|
* gnu/java/awt/EventModifier.java,
|
||||||
|
gnu/java/awt/image/ImageDecoder.java,
|
||||||
|
gnu/java/awt/image/XBMDecoder.java: New files from GNU Classpath.
|
||||||
|
|
||||||
* Makefile.am: Add new files.
|
* Makefile.am: Add new files.
|
||||||
* Makefile.in: Rebuilt.
|
* Makefile.in: Rebuilt.
|
||||||
|
|
||||||
|
107
libjava/gnu/java/awt/EventModifier.java
Normal file
107
libjava/gnu/java/awt/EventModifier.java
Normal file
@ -0,0 +1,107 @@
|
|||||||
|
/* EventModifier.java -- tool for converting modifier bits to 1.4 syle
|
||||||
|
Copyright (C) 2002 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;
|
||||||
|
|
||||||
|
import java.awt.event.InputEvent;
|
||||||
|
|
||||||
|
public class EventModifier
|
||||||
|
{
|
||||||
|
/** The mask for old events. */
|
||||||
|
public static final int OLD_MASK = 0x3f;
|
||||||
|
|
||||||
|
/** The mask for new events. */
|
||||||
|
public static final int NEW_MASK = 0x3fc0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Non-instantiable.
|
||||||
|
*/
|
||||||
|
private EventModifier()
|
||||||
|
{
|
||||||
|
throw new InternalError();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts the old style modifiers (0x3f) to the new style (0xffffffc0).
|
||||||
|
*
|
||||||
|
* @param mod the modifiers to convert
|
||||||
|
* @return the adjusted modifiers
|
||||||
|
*/
|
||||||
|
public static int extend(int mod)
|
||||||
|
{
|
||||||
|
// Favor what we hope will be the common case.
|
||||||
|
if ((mod & OLD_MASK) == 0)
|
||||||
|
return mod;
|
||||||
|
if ((mod & InputEvent.SHIFT_MASK) != 0)
|
||||||
|
mod |= InputEvent.SHIFT_DOWN_MASK;
|
||||||
|
if ((mod & InputEvent.CTRL_MASK) != 0)
|
||||||
|
mod |= InputEvent.CTRL_DOWN_MASK;
|
||||||
|
if ((mod & InputEvent.META_MASK) != 0)
|
||||||
|
mod |= InputEvent.META_DOWN_MASK;
|
||||||
|
if ((mod & InputEvent.ALT_MASK) != 0)
|
||||||
|
mod |= InputEvent.ALT_DOWN_MASK;
|
||||||
|
if ((mod & InputEvent.BUTTON1_MASK) != 0)
|
||||||
|
mod |= InputEvent.BUTTON1_DOWN_MASK;
|
||||||
|
if ((mod & InputEvent.ALT_GRAPH_MASK) != 0)
|
||||||
|
mod |= InputEvent.ALT_GRAPH_DOWN_MASK;
|
||||||
|
return mod & ~OLD_MASK;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Converts the new style modifiers (0xffffffc0) to the old style (0x3f).
|
||||||
|
*
|
||||||
|
* @param mod the modifiers to convert
|
||||||
|
* @return the adjusted modifiers
|
||||||
|
*/
|
||||||
|
public static int revert(int mod)
|
||||||
|
{
|
||||||
|
if ((mod & InputEvent.SHIFT_DOWN_MASK) != 0)
|
||||||
|
mod |= InputEvent.SHIFT_MASK;
|
||||||
|
if ((mod & InputEvent.CTRL_DOWN_MASK) != 0)
|
||||||
|
mod |= InputEvent.CTRL_MASK;
|
||||||
|
if ((mod & InputEvent.META_DOWN_MASK) != 0)
|
||||||
|
mod |= InputEvent.META_MASK;
|
||||||
|
if ((mod & InputEvent.ALT_DOWN_MASK) != 0)
|
||||||
|
mod |= InputEvent.ALT_MASK;
|
||||||
|
if ((mod & InputEvent.ALT_GRAPH_DOWN_MASK) != 0)
|
||||||
|
mod |= InputEvent.ALT_GRAPH_MASK;
|
||||||
|
if ((mod & InputEvent.BUTTON1_DOWN_MASK) != 0)
|
||||||
|
mod |= InputEvent.BUTTON1_MASK;
|
||||||
|
return mod & OLD_MASK;
|
||||||
|
}
|
||||||
|
} // class EventModifier
|
113
libjava/gnu/java/awt/image/ImageDecoder.java
Normal file
113
libjava/gnu/java/awt/image/ImageDecoder.java
Normal file
@ -0,0 +1,113 @@
|
|||||||
|
/* ImageDecoder.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.image;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
|
import java.awt.image.*;
|
||||||
|
import java.util.*;
|
||||||
|
import java.io.*;
|
||||||
|
import java.net.URL;
|
||||||
|
|
||||||
|
public abstract class ImageDecoder implements ImageProducer
|
||||||
|
{
|
||||||
|
Vector consumers = new Vector ();
|
||||||
|
String filename;
|
||||||
|
URL url;
|
||||||
|
|
||||||
|
public static ColorModel cm;
|
||||||
|
|
||||||
|
static
|
||||||
|
{
|
||||||
|
// FIXME: there was some broken code here that looked like
|
||||||
|
// it wanted to rely on this property. I don't have any idea
|
||||||
|
// what it was intended to do.
|
||||||
|
// String endian = System.getProperties ().getProperty ("gnu.cpu.endian");
|
||||||
|
}
|
||||||
|
|
||||||
|
public ImageDecoder (String filename)
|
||||||
|
{
|
||||||
|
this.filename = filename;
|
||||||
|
}
|
||||||
|
|
||||||
|
public ImageDecoder (URL url)
|
||||||
|
{
|
||||||
|
this.url = url;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void addConsumer (ImageConsumer ic)
|
||||||
|
{
|
||||||
|
consumers.addElement (ic);
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isConsumer (ImageConsumer ic)
|
||||||
|
{
|
||||||
|
return consumers.contains (ic);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void removeConsumer (ImageConsumer ic)
|
||||||
|
{
|
||||||
|
consumers.removeElement (ic);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void startProduction (ImageConsumer ic)
|
||||||
|
{
|
||||||
|
addConsumer (ic);
|
||||||
|
Vector list = (Vector) consumers.clone ();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
FileInputStream is = (url == null) ? new FileInputStream (filename) :
|
||||||
|
(FileInputStream) url.openStream();
|
||||||
|
|
||||||
|
produce (list, is);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
for (int i = 0; i < list.size (); i++)
|
||||||
|
{
|
||||||
|
ImageConsumer ic2 = (ImageConsumer) list.elementAt (i);
|
||||||
|
ic2.imageComplete (ImageConsumer.IMAGEERROR);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void requestTopDownLeftRightResend (ImageConsumer ic)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
abstract void produce (Vector v, FileInputStream is) throws IOException;
|
||||||
|
}
|
149
libjava/gnu/java/awt/image/XBMDecoder.java
Normal file
149
libjava/gnu/java/awt/image/XBMDecoder.java
Normal file
@ -0,0 +1,149 @@
|
|||||||
|
/* XBMDecoder -- Decodes X-bitmaps
|
||||||
|
Copyright (C) 1999 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.image;
|
||||||
|
|
||||||
|
import java.awt.*;
|
||||||
|
import java.awt.image.*;
|
||||||
|
import java.util.*;
|
||||||
|
import java.io.*;
|
||||||
|
import java.net.URL;
|
||||||
|
|
||||||
|
public class XBMDecoder extends ImageDecoder
|
||||||
|
{
|
||||||
|
BufferedReader reader;
|
||||||
|
static final ColorModel cm = ColorModel.getRGBdefault ();
|
||||||
|
static final int black = 0xff000000;
|
||||||
|
static final int transparent = 0x00000000;
|
||||||
|
static final int masktable[] = { 0x01, 0x02, 0x04, 0x08,
|
||||||
|
0x10, 0x20, 0x40, 0x80 };
|
||||||
|
|
||||||
|
public XBMDecoder (String filename)
|
||||||
|
{
|
||||||
|
super (filename);
|
||||||
|
}
|
||||||
|
|
||||||
|
public XBMDecoder (URL url)
|
||||||
|
{
|
||||||
|
super (url);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void produce (Vector v, FileInputStream is) throws IOException
|
||||||
|
{
|
||||||
|
reader = new BufferedReader (new InputStreamReader (is));
|
||||||
|
int width = -1, height = -1;
|
||||||
|
|
||||||
|
for (int i = 0; i < 2; i++)
|
||||||
|
{
|
||||||
|
String line = reader.readLine ();
|
||||||
|
StringTokenizer st = new StringTokenizer (line);
|
||||||
|
|
||||||
|
st.nextToken (); // #define
|
||||||
|
st.nextToken (); // name_[width|height]
|
||||||
|
if (i == 0)
|
||||||
|
width = Integer.parseInt (st.nextToken (), 10);
|
||||||
|
else
|
||||||
|
height = Integer.parseInt (st.nextToken (), 10);
|
||||||
|
}
|
||||||
|
|
||||||
|
for (int i = 0; i < v.size (); i++)
|
||||||
|
{
|
||||||
|
ImageConsumer ic = (ImageConsumer) v.elementAt (i);
|
||||||
|
|
||||||
|
ic.setDimensions (width, height);
|
||||||
|
ic.setColorModel (cm);
|
||||||
|
ic.setHints (ImageConsumer.COMPLETESCANLINES
|
||||||
|
| ImageConsumer.SINGLEFRAME
|
||||||
|
| ImageConsumer.SINGLEPASS
|
||||||
|
| ImageConsumer.TOPDOWNLEFTRIGHT);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* skip to the byte array */
|
||||||
|
while (reader.read () != '{') { }
|
||||||
|
|
||||||
|
/* loop through each scanline */
|
||||||
|
for (int line = 0; line < height; line++)
|
||||||
|
{
|
||||||
|
int scanline[] = getScanline (reader, width);
|
||||||
|
|
||||||
|
for (int i = 0; i < v.size (); i++)
|
||||||
|
{
|
||||||
|
ImageConsumer ic = (ImageConsumer) v.elementAt (i);
|
||||||
|
ic.setPixels (0, 0 + line, width, 1, cm, scanline, 0, width);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/* tell each ImageConsumer that we're finished */
|
||||||
|
for (int i = 0; i < v.size (); i++)
|
||||||
|
{
|
||||||
|
ImageConsumer ic = (ImageConsumer) v.elementAt (i);
|
||||||
|
ic.imageComplete (ImageConsumer.STATICIMAGEDONE);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static public int[] getScanline (Reader in, int len) throws IOException
|
||||||
|
{
|
||||||
|
char byteStr[] = new char[2];
|
||||||
|
int scanline[] = new int[len];
|
||||||
|
int x = 0;
|
||||||
|
|
||||||
|
while (x < len)
|
||||||
|
{
|
||||||
|
int ch = in.read ();
|
||||||
|
if (ch == '0')
|
||||||
|
{
|
||||||
|
in.read (); // 'x'
|
||||||
|
|
||||||
|
byteStr[0] = (char) in.read ();
|
||||||
|
byteStr[1] = (char) in.read ();
|
||||||
|
|
||||||
|
int byteVal = Integer.parseInt (new String (byteStr), 16);
|
||||||
|
|
||||||
|
for (int i = 0; i < 8; i++, x++)
|
||||||
|
{
|
||||||
|
if (x == len) // condition occurs if bitmap is padded
|
||||||
|
return scanline;
|
||||||
|
|
||||||
|
scanline[x] = ((byteVal & masktable[i]) != 0) ?
|
||||||
|
black : transparent;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return scanline;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user