[kaffe] CVS kaffe (jserv): Support GNU EmbbededWindow extension
Kaffe CVS
cvs-commits at kaffe.org
Thu Jul 8 23:32:23 PDT 2004
PatchSet 4917
Date: 2004/07/09 06:20:22
Author: jserv
Branch: HEAD
Tag: (none)
Log:
Support GNU EmbbededWindow extension
* libraries/javalib/profiles/default/coreawt.files,
* libraries/javalib/profiles/allatonce/all.files,
* libraries/javalib/Makefile.in,
* libraries/javalib/Makefile.am:
add entry to GNU EmbbededWindow extension
* libraries/javalib/gnu/java/awt/EmbeddedWindow.java,
* libraries/javalib/gnu/java/awt/EmbeddedWindowSupport.java,
* libraries/javalib/gnu/java/awt/peer/EmbeddedWindowPeer.java:
GNU EmbbededWindow extension from GNU Classpath. This is necessary
for making use of gcjwebplugin.
Note: java-awt loading mechanism is disabled because of not importing
to Kaffe yet.
Members:
ChangeLog:1.2483->1.2484
libraries/javalib/Makefile.am:1.196->1.197
libraries/javalib/Makefile.in:1.267->1.268
libraries/javalib/gnu/java/awt/EmbeddedWindow.java:INITIAL->1.1
libraries/javalib/gnu/java/awt/EmbeddedWindowSupport.java:INITIAL->1.1
libraries/javalib/gnu/java/awt/peer/EmbeddedWindowPeer.java:INITIAL->1.1
libraries/javalib/profiles/allatonce/all.files:1.50->1.51
libraries/javalib/profiles/default/coreawt.files:1.9->1.10
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.2483 kaffe/ChangeLog:1.2484
--- kaffe/ChangeLog:1.2483 Fri Jul 9 02:57:53 2004
+++ kaffe/ChangeLog Fri Jul 9 06:20:22 2004
@@ -1,5 +1,21 @@
2004-07-09 Jim Huang <jserv at kaffe.org>
+ * libraries/javalib/profiles/default/coreawt.files,
+ * libraries/javalib/profiles/allatonce/all.files,
+ * libraries/javalib/Makefile.in,
+ * libraries/javalib/Makefile.am:
+ add entry to GNU EmbbededWindow extension
+
+ * libraries/javalib/gnu/java/awt/EmbeddedWindow.java,
+ * libraries/javalib/gnu/java/awt/EmbeddedWindowSupport.java,
+ * libraries/javalib/gnu/java/awt/peer/EmbeddedWindowPeer.java:
+ GNU EmbbededWindow extension from GNU Classpath. This is necessary
+ for making use of gcjwebplugin.
+ Note: java-awt loading mechanism is disabled because of not importing
+ to Kaffe yet.
+
+2004-07-09 Jim Huang <jserv at kaffe.org>
+
* kaffe/kaffevm/systems/unix-pthreads/signal.c
(registerSignalHandler): Add missing declaration of oldact.
Index: kaffe/libraries/javalib/Makefile.am
diff -u kaffe/libraries/javalib/Makefile.am:1.196 kaffe/libraries/javalib/Makefile.am:1.197
--- kaffe/libraries/javalib/Makefile.am:1.196 Thu Jun 10 16:25:12 2004
+++ kaffe/libraries/javalib/Makefile.am Fri Jul 9 06:20:19 2004
@@ -245,6 +245,9 @@
gnu/java/awt/Buffers.java \
gnu/java/awt/ComponentDataBlitOp.java \
gnu/java/awt/EventModifier.java
+ gnu/java/awt/EmbeddedWindow.java \
+ gnu/java/awt/EmbeddedWindowSupport.java \
+ gnu/java/awt/peer/EmbeddedWindowPeer.java
gnu_java_beans_SRCS = \
gnu/java/beans/BeanInfoEmbryo.java \
gnu/java/beans/ExplicitBeanInfo.java \
Index: kaffe/libraries/javalib/Makefile.in
diff -u kaffe/libraries/javalib/Makefile.in:1.267 kaffe/libraries/javalib/Makefile.in:1.268
--- kaffe/libraries/javalib/Makefile.in:1.267 Wed Jul 7 19:35:03 2004
+++ kaffe/libraries/javalib/Makefile.in Fri Jul 9 06:20:18 2004
@@ -553,7 +553,10 @@
gnu/java/awt/BitMaskExtent.java \
gnu/java/awt/Buffers.java \
gnu/java/awt/ComponentDataBlitOp.java \
- gnu/java/awt/EventModifier.java
+ gnu/java/awt/EventModifier.java \
+ gnu/java/awt/EmbeddedWindow.java \
+ gnu/java/awt/EmbeddedWindowSupport.java \
+ gnu/java/awt/peer/EmbeddedWindowPeer.java
gnu_java_beans_SRCS = \
gnu/java/beans/BeanInfoEmbryo.java \
===================================================================
Checking out kaffe/libraries/javalib/gnu/java/awt/EmbeddedWindow.java
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/gnu/java/awt/EmbeddedWindow.java,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/java/awt/EmbeddedWindow.java Fri Jul 9 06:32:22 2004
@@ -0,0 +1,133 @@
+/* EmbeddedWindow.java --
+ Copyright (C) 2003, 2004 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 gnu.java.awt.peer.EmbeddedWindowPeer;
+import java.awt.Frame;
+import java.awt.Toolkit;
+
+/**
+ * Represents an AWT window that can be embedded into another
+ * application.
+ *
+ * @author Michael Koch <konqueror at gmx.de>
+ */
+public class EmbeddedWindow extends Frame
+{
+/* XXX: implement java-awt native part
+ static
+ {
+ if (Configuration.INIT_LOAD_LIBRARY)
+ System.loadLibrary("javaawt");
+ }
+ */
+
+ private long handle;
+
+ /**
+ * Creates a window to be embedded into another application. The
+ * window will only be embedded after its setHandle method has been
+ * called.
+ */
+ public EmbeddedWindow ()
+ {
+ super();
+ this.handle = 0;
+ }
+
+ /**
+ * Creates a window to be embedded into another application.
+ *
+ * @param handle the native handle to the screen area where the AWT
+ * window should be embedded
+ */
+ public EmbeddedWindow (long handle)
+ {
+ super();
+ this.handle = handle;
+ }
+
+ /**
+ * Creates the native peer for this embedded window.
+ */
+ public void addNotify()
+ {
+ Toolkit tk = getToolkit();
+
+ if (! (tk instanceof EmbeddedWindowSupport))
+ throw new UnsupportedOperationException
+ ("Embedded windows are not supported by the current peers: " + tk.getClass());
+
+ setWindowPeer (((EmbeddedWindowSupport) tk).createEmbeddedWindow (this));
+ super.addNotify();
+ }
+
+ // This method is only made native to circumvent the package-privateness of
+ // an AWT internal java.awt.Component.peer member variable.
+ native void setWindowPeer (EmbeddedWindowPeer peer);
+
+ /**
+ * If the native peer for this embedded window has been created,
+ * then setHandle will embed the window. If not, setHandle tells
+ * us where to embed ourselves when our peer is created.
+ *
+ * @param handle the native handle to the screen area where the AWT
+ * window should be embedded
+ */
+ public void setHandle(long handle)
+ {
+ if (this.handle != 0)
+ throw new RuntimeException ("EmbeddedWindow is already embedded");
+
+ this.handle = handle;
+ if (getPeer() != null)
+ ((EmbeddedWindowPeer) getPeer()).embed (this.handle);
+ }
+
+ /**
+ * Gets the native handle of the screen area where the window will
+ * be embedded.
+ *
+ * @return The native handle that was passed to the constructor.
+ */
+ public long getHandle()
+ {
+ return handle;
+ }
+}
===================================================================
Checking out kaffe/libraries/javalib/gnu/java/awt/EmbeddedWindowSupport.java
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/gnu/java/awt/EmbeddedWindowSupport.java,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/java/awt/EmbeddedWindowSupport.java Fri Jul 9 06:32:22 2004
@@ -0,0 +1,65 @@
+/* EmbeddedWindowSupport.java --
+ Copyright (C) 2003 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 gnu.java.awt.peer.EmbeddedWindowPeer;
+
+/**
+ * Declares a method for creating native embedded window peers.
+ *
+ * All classes inherited from java.awt.Toolkit that implement this
+ * interface are assumed to support the creation of embedded window
+ * peers. To create an embedded window, use
+ * gnu.java.awt.EmbeddedWindow.
+ *
+ * @see gnu.java.awt.EmbeddedWindow
+ * @see java.awt.Toolkit
+ *
+ * @author Michael Koch <konqueror at gmx.de>
+ */
+public interface EmbeddedWindowSupport
+{
+ /**
+ * Creates an embedded window peer, and associates it with an
+ * EmbeddedWindow object.
+ *
+ * @param w The embedded window with which to associate a peer.
+ */
+ EmbeddedWindowPeer createEmbeddedWindow (EmbeddedWindow w);
+}
===================================================================
Checking out kaffe/libraries/javalib/gnu/java/awt/peer/EmbeddedWindowPeer.java
RCS: /home/cvs/kaffe/kaffe/libraries/javalib/gnu/java/awt/peer/EmbeddedWindowPeer.java,v
VERS: 1.1
***************
--- /dev/null Sun Aug 4 19:57:58 2002
+++ kaffe/libraries/javalib/gnu/java/awt/peer/EmbeddedWindowPeer.java Fri Jul 9 06:32:22 2004
@@ -0,0 +1,47 @@
+/* EmbeddedWindowPeer.java -- Interface for window peers that may be
+ embedded into other applications
+ Copyright (C) 2003 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;
+
+import java.awt.peer.FramePeer;
+
+public interface EmbeddedWindowPeer extends FramePeer
+{
+ void embed (long handle);
+}
Index: kaffe/libraries/javalib/profiles/allatonce/all.files
diff -u kaffe/libraries/javalib/profiles/allatonce/all.files:1.50 kaffe/libraries/javalib/profiles/allatonce/all.files:1.51
--- kaffe/libraries/javalib/profiles/allatonce/all.files:1.50 Thu Jun 3 18:56:14 2004
+++ kaffe/libraries/javalib/profiles/allatonce/all.files Fri Jul 9 06:20:17 2004
@@ -26,6 +26,9 @@
gnu/java/awt/Buffers.java
gnu/java/awt/ComponentDataBlitOp.java
gnu/java/awt/EventModifier.java
+gnu/java/awt/EmbeddedWindow.java
+gnu/java/awt/EmbeddedWindowSupport.java
+gnu/java/awt/peer/EmbeddedWindowPeer.java
gnu/java/beans/BeanInfoEmbryo.java
gnu/java/beans/editors/ColorEditor.java
gnu/java/beans/editors/FontEditor.java
Index: kaffe/libraries/javalib/profiles/default/coreawt.files
diff -u kaffe/libraries/javalib/profiles/default/coreawt.files:1.9 kaffe/libraries/javalib/profiles/default/coreawt.files:1.10
--- kaffe/libraries/javalib/profiles/default/coreawt.files:1.9 Sun May 23 13:23:29 2004
+++ kaffe/libraries/javalib/profiles/default/coreawt.files Fri Jul 9 06:20:15 2004
@@ -2,6 +2,9 @@
gnu/java/awt/Buffers.java
gnu/java/awt/ComponentDataBlitOp.java
gnu/java/awt/EventModifier.java
+gnu/java/awt/EmbeddedWindow.java
+gnu/java/awt/EmbeddedWindowSupport.java
+gnu/java/awt/peer/EmbeddedWindowPeer.java
java/awt/ActionEvt.java
java/awt/Adjustable.java
java/awt/AdjustmentEvt.java
More information about the kaffe
mailing list