diff options
| -rw-r--r-- | libjava/ChangeLog | 9 | ||||
| -rw-r--r-- | libjava/Makefile.in | 2 | ||||
| -rwxr-xr-x | libjava/gnu/awt/xlib/XGraphicsDevice.java | 58 | ||||
| -rwxr-xr-x | libjava/gnu/awt/xlib/XGraphicsEnvironment.java | 59 | ||||
| -rw-r--r-- | libjava/gnu/awt/xlib/XToolkit.java | 2 | ||||
| -rw-r--r-- | libjava/sources.am | 2 |
6 files changed, 131 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 724fcd73e6e..d534360f78e 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,12 @@ +2005-11-15 Scott Gilbertson <scottg@mantatest.com> + + * Makefile.in: Re-generated. + * gnu/awt/xlib/XGraphicsDevice.java: New file. + * gnu/awt/xlib/XToolkit.java + (getLocalGraphicsEnvironment): Implemented. + * gnu/awt/xlib/XGraphicsEnvironment.java: New file. + * sources.am: Re-generated. + 2005-15-09 David Daney <ddaney@avtrex.com> PR libgcj/15430 diff --git a/libjava/Makefile.in b/libjava/Makefile.in index e0b665d704d..561c4eb1abb 100644 --- a/libjava/Makefile.in +++ b/libjava/Makefile.in @@ -829,6 +829,8 @@ gnu/awt/xlib/XFontPeer.java \ gnu/awt/xlib/XFramePeer.java \ gnu/awt/xlib/XGraphics.java \ gnu/awt/xlib/XGraphicsConfiguration.java \ +gnu/awt/xlib/XGraphicsDevice.java \ +gnu/awt/xlib/XGraphicsEnvironment.java \ gnu/awt/xlib/XOffScreenImage.java \ gnu/awt/xlib/XPanelPeer.java \ gnu/awt/xlib/XToolkit.java diff --git a/libjava/gnu/awt/xlib/XGraphicsDevice.java b/libjava/gnu/awt/xlib/XGraphicsDevice.java new file mode 100755 index 00000000000..4fe1c2387b4 --- /dev/null +++ b/libjava/gnu/awt/xlib/XGraphicsDevice.java @@ -0,0 +1,58 @@ +/* Copyright (C) 2005 Free Software Foundation + + This file is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the file "LIBGCJ_LICENSE" for +details. */ + +package gnu.awt.xlib; + +import java.awt.GraphicsDevice; +import java.awt.GraphicsConfiguration; + +public class XGraphicsDevice extends GraphicsDevice +{ + private int id; + private String IDstring; + private GraphicsConfiguration[] configs; + + public int getType() + { + return TYPE_RASTER_SCREEN; + } + + public XGraphicsDevice(int id, XToolkit toolkit) + { + this.id = id; + IDstring = "XGraphicsDevice " + id; + configs = new GraphicsConfiguration [1]; + configs[0] = toolkit.getDefaultXGraphicsConfiguration(); + } + + public String getIDstring() + { + return IDstring; + } + + public GraphicsConfiguration[] getConfigurations() + { + return configs; + } + + public GraphicsConfiguration getDefaultConfiguration() + { + return configs[0]; + } + + public boolean isDisplayChangeSupported() + { + return false; + } + + public boolean isFullScreenSupported() + { + return false; + } +} + diff --git a/libjava/gnu/awt/xlib/XGraphicsEnvironment.java b/libjava/gnu/awt/xlib/XGraphicsEnvironment.java new file mode 100755 index 00000000000..64c799017c0 --- /dev/null +++ b/libjava/gnu/awt/xlib/XGraphicsEnvironment.java @@ -0,0 +1,59 @@ +/* Copyright (C) 2005 Free Software Foundation + + This file is part of libgcj. + +This software is copyrighted work licensed under the terms of the +Libgcj License. Please consult the file "LIBGCJ_LICENSE" for +details. */ + +package gnu.awt.xlib; + +import java.awt.GraphicsEnvironment; +import java.awt.GraphicsDevice; +import java.awt.Graphics2D; +import java.awt.Font; +import java.awt.image.BufferedImage; +import java.util.Locale; + +public class XGraphicsEnvironment extends GraphicsEnvironment +{ + private XToolkit toolkit; + private XGraphicsDevice [] devices; + + XGraphicsEnvironment (XToolkit toolkit) + { + this.toolkit = toolkit; + devices = new XGraphicsDevice [1]; + devices [0] = new XGraphicsDevice (0,toolkit); + } + + public GraphicsDevice[] getScreenDevices () + { + return devices; + } + + public GraphicsDevice getDefaultScreenDevice () + { + return devices [0]; + } + + public Graphics2D createGraphics (BufferedImage image) + { + throw new UnsupportedOperationException ("createGraphics not implemented yet in " + this.getClass ().getName ()); + } + + public Font[] getAllFonts() + { + throw new UnsupportedOperationException ("getAllFonts not implemented yet in " + this.getClass ().getName ()); + } + + public String[] getAvailableFontFamilyNames (Locale l) + { + throw new UnsupportedOperationException ("getAvailableFontFamilyNames not implemented yet in " + this.getClass ().getName ()); + } + + public String[] getAvailableFontFamilyNames () + { + throw new UnsupportedOperationException ("getAvailableFontFamilyNames not implemented yet in " + this.getClass ().getName ()); + } +} diff --git a/libjava/gnu/awt/xlib/XToolkit.java b/libjava/gnu/awt/xlib/XToolkit.java index 27e273aa778..6651ae789a2 100644 --- a/libjava/gnu/awt/xlib/XToolkit.java +++ b/libjava/gnu/awt/xlib/XToolkit.java @@ -362,7 +362,7 @@ public class XToolkit extends ClasspathToolkit */ public GraphicsEnvironment getLocalGraphicsEnvironment () { - throw new java.lang.UnsupportedOperationException (); + return new XGraphicsEnvironment (this); } /** Acquires an appropriate {@link ClasspathFontPeer}, for use in diff --git a/libjava/sources.am b/libjava/sources.am index e1531744b1a..fec918a906d 100644 --- a/libjava/sources.am +++ b/libjava/sources.am @@ -46,6 +46,8 @@ gnu/awt/xlib/XFontPeer.java \ gnu/awt/xlib/XFramePeer.java \ gnu/awt/xlib/XGraphics.java \ gnu/awt/xlib/XGraphicsConfiguration.java \ +gnu/awt/xlib/XGraphicsDevice.java \ +gnu/awt/xlib/XGraphicsEnvironment.java \ gnu/awt/xlib/XOffScreenImage.java \ gnu/awt/xlib/XPanelPeer.java \ gnu/awt/xlib/XToolkit.java |