Index: gnu/java/awt/EmbeddedWindow.java =================================================================== RCS file: gnu/java/awt/EmbeddedWindow.java diff -N gnu/java/awt/EmbeddedWindow.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/java/awt/EmbeddedWindow.java 12 Feb 2004 16:52:15 -0000 @@ -0,0 +1,125 @@ +/* EmbeddedWindow.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; +import java.awt.Frame; +import java.awt.Toolkit; + +/** + * Represents an AWT window that can be embedded into another + * application. + * + * @author Michael Koch
+ */ +public class EmbeddedWindow extends Frame +{ + 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; + } +} Index: gnu/java/awt/EmbeddedWindowSupport.java =================================================================== RCS file: gnu/java/awt/EmbeddedWindowSupport.java diff -N gnu/java/awt/EmbeddedWindowSupport.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/java/awt/EmbeddedWindowSupport.java 12 Feb 2004 16:52:15 -0000 @@ -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 + */ +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); +} Index: gnu/java/awt/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/gnu/java/awt/Makefile.am,v retrieving revision 1.7 diff -u -b -B -r1.7 Makefile.am --- gnu/java/awt/Makefile.am 6 Nov 2003 17:09:35 -0000 1.7 +++ gnu/java/awt/Makefile.am 12 Feb 2004 16:52:15 -0000 @@ -8,4 +8,6 @@ Buffers.java \ ComponentDataBlitOp.java \ ClasspathToolkit.java \ +EmbeddedWindow.java \ +EmbeddedWindowSupport.java \ EventModifier.java Index: gnu/java/awt/peer/EmbeddedWindowPeer.java =================================================================== RCS file: gnu/java/awt/peer/EmbeddedWindowPeer.java diff -N gnu/java/awt/peer/EmbeddedWindowPeer.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/java/awt/peer/EmbeddedWindowPeer.java 12 Feb 2004 16:52:15 -0000 @@ -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: gnu/java/awt/peer/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/Makefile.am,v retrieving revision 1.5 diff -u -b -B -r1.5 Makefile.am --- gnu/java/awt/peer/Makefile.am 4 Nov 2003 11:24:08 -0000 1.5 +++ gnu/java/awt/peer/Makefile.am 12 Feb 2004 16:52:15 -0000 @@ -4,4 +4,5 @@ EXTRA_DIST = \ ClasspathFontPeer.java \ +EmbeddedWindowPeer.java \ GLightweightPeer.java Index: gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java =================================================================== RCS file: gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java diff -N gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ gnu/java/awt/peer/gtk/GtkEmbeddedWindowPeer.java 12 Feb 2004 16:52:15 -0000 @@ -0,0 +1,73 @@ +/* GtkEmbeddedWindowPeer.java -- Implements EmbeddedWindowPeer using a + GtkPlug + 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.gtk; + +import gnu.java.awt.EmbeddedWindow; +import gnu.java.awt.peer.EmbeddedWindowPeer; + +public class GtkEmbeddedWindowPeer extends GtkFramePeer + implements EmbeddedWindowPeer +{ + native void create (long socket_id); + + void create () + { + create (((EmbeddedWindow) awtComponent).getHandle ()); + } + + native void construct (long socket_id); + + // FIXME: embed doesn't work right now, though I believe it should. + // This means that you can't call setVisible (true) on an + // EmbeddedWindow before calling setHandle with a valid handle. The + // problem is that somewhere after the call to + // GtkEmbeddedWindow.create and before the call to + // GtkEmbeddedWindow.construct, the GtkPlug peer is being realized. + // GtkSocket silently fails to embed an already-realized GtkPlug. + public void embed (long handle) + { + construct (handle); + } + + public GtkEmbeddedWindowPeer (EmbeddedWindow w) + { + super (w); + } +} Index: gnu/java/awt/peer/gtk/GtkToolkit.java =================================================================== RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/GtkToolkit.java,v retrieving revision 1.47 diff -u -b -B -r1.47 GtkToolkit.java --- gnu/java/awt/peer/gtk/GtkToolkit.java 25 Jan 2004 18:45:26 -0000 1.47 +++ gnu/java/awt/peer/gtk/GtkToolkit.java 12 Feb 2004 16:52:15 -0000 @@ -53,6 +53,9 @@ import java.util.Map; import java.util.MissingResourceException; import java.util.Properties; +import gnu.java.awt.EmbeddedWindow; +import gnu.java.awt.EmbeddedWindowSupport; +import gnu.java.awt.peer.EmbeddedWindowPeer; import gnu.java.awt.peer.ClasspathFontPeer; import gnu.classpath.Configuration; import gnu.java.awt.peer.gtk.GdkPixbufDecoder; @@ -73,6 +76,7 @@ */ public class GtkToolkit extends gnu.java.awt.ClasspathToolkit + implements EmbeddedWindowSupport { GtkMainThread main; Hashtable containers = new Hashtable(); @@ -351,6 +355,11 @@ protected WindowPeer createWindow (Window w) { return new GtkWindowPeer (w); + } + + public EmbeddedWindowPeer createEmbeddedWindow (EmbeddedWindow w) + { + return new GtkEmbeddedWindowPeer (w); } /** Index: gnu/java/awt/peer/gtk/Makefile.am =================================================================== RCS file: /cvsroot/classpath/classpath/gnu/java/awt/peer/gtk/Makefile.am,v retrieving revision 1.11 diff -u -b -B -r1.11 Makefile.am --- gnu/java/awt/peer/gtk/Makefile.am 21 Nov 2003 12:54:26 -0000 1.11 +++ gnu/java/awt/peer/gtk/Makefile.am 12 Feb 2004 16:52:15 -0000 @@ -20,6 +20,7 @@ GtkComponentPeer.java \ GtkContainerPeer.java \ GtkDialogPeer.java \ + GtkEmbeddedWindowPeer.java \ GtkFileDialogPeer.java \ GtkFontPeer.java \ GtkFramePeer.java \ Index: configure.ac =================================================================== RCS file: /cvsroot/classpath/classpath/configure.ac,v retrieving revision 1.6 diff -u -b -B -r1.6 configure.ac --- configure.ac 4 Feb 2004 09:01:52 -0000 1.6 +++ configure.ac 12 Feb 2004 16:52:16 -0000 @@ -412,6 +412,7 @@ native/cni/Makefile native/jni/Makefile native/jni/classpath/Makefile +native/jni/java-awt/Makefile native/jni/java-io/Makefile native/jni/java-lang/Makefile native/jni/java-net/Makefile Index: include/gnu_java_awt_EmbeddedWindow.h =================================================================== RCS file: include/gnu_java_awt_EmbeddedWindow.h diff -N include/gnu_java_awt_EmbeddedWindow.h --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ include/gnu_java_awt_EmbeddedWindow.h 12 Feb 2004 16:52:16 -0000 @@ -0,0 +1,19 @@ +/* DO NOT EDIT THIS FILE - it is machine generated */ + +#ifndef __gnu_java_awt_EmbeddedWindow__ +#define __gnu_java_awt_EmbeddedWindow__ + +#include