FYI: Patch: General embedded window support

[Michael Koch <konqueror at gmx dot de>]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi list,


I commited the attached patch to trunk.

It adds a GNU extension to libgcj to embed AWT/Swing into native apps 
using non-Java graphical toolkits.

This patch doesnt add a working extension but just the framework for 
it. Each java.awt peer that implements this extension is support to 
support embedded windows.

A first application using this extension is my little web browser 
plugin called gcjwebplugin. It can be found on 
http://savannah.nongnu.org/projects/gcjwebplugin/.


Michael
- -- 
Homepage: http://www.worldforge.org/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.1 (GNU/Linux)

iD8DBQE/EXBGWSOgCCdjSDsRAtUMAJ9RCXxNt2O6dow9ZM3NWkfVC7XJPQCeK96Q
qKUxe28HYP4kF03fzszA8K0=
=AnM+
-----END PGP SIGNATURE-----

Index: ChangeLog
===================================================================
RCS file: /cvs/gcc/gcc/libjava/ChangeLog,v
retrieving revision 1.2025
diff -u -b -B -r1.2025 ChangeLog
--- ChangeLog	11 Jul 2003 18:27:53 -0000	1.2025
+++ ChangeLog	13 Jul 2003 14:29:02 -0000
@@ -1,3 +1,17 @@
+2003-07-13  Michael Koch  <konqueror@gmx.de>
+
+	* gnu/java/awt/EmbeddedWindow.java,
+	gnu/java/awt/EmbeddedWindowSupport.java,
+	gnu/java/awt/natEmbeddedWindow.cc:
+	New files.
+	* java/awt/Window.java
+	(Window): New constructor to support embedded windows.
+	* Makefile.am
+	(awt_java_source_files): Added gnu/java/awt/EmbeddedWindow.java and
+	gnu/java/awt/EmbeddedWindowSupport.java.
+	(nat_source_files): Added gnu/java/awt/natEmbeddedWindow.cc.
+	* Makefile.in: Regenerated.
+
 2003-07-11  Matt Kraai  <kraii@alumni.cmu.edu>
 
 	* gnu/gcj/runtime/SharedLibLoader.java: Fix misspelling.
Index: Makefile.am
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.am,v
retrieving revision 1.306
diff -u -b -B -r1.306 Makefile.am
--- Makefile.am	9 Jul 2003 21:03:31 -0000	1.306
+++ Makefile.am	13 Jul 2003 14:29:05 -0000
@@ -751,6 +751,8 @@
 gnu/java/awt/BitMaskExtent.java \
 gnu/java/awt/Buffers.java \
 gnu/java/awt/ComponentDataBlitOp.java \
+gnu/java/awt/EmbeddedWindow.java \
+gnu/java/awt/EmbeddedWindowSupport.java \
 gnu/java/awt/EventModifier.java \
 gnu/java/awt/GLightweightPeer.java \
 gnu/java/awt/image/ImageDecoder.java \
@@ -2573,6 +2575,7 @@
 gnu/gcj/runtime/natStackTrace.cc \
 gnu/gcj/runtime/natStringBuffer.cc \
 gnu/gcj/runtime/natVMClassLoader.cc \
+gnu/java/awt/natEmbeddedWindow.cc \
 gnu/java/nio/natFileChannelImpl.cc \
 gnu/java/nio/natFileLockImpl.cc \
 gnu/java/nio/natSelectorImpl.cc \
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
retrieving revision 1.331
diff -u -b -B -r1.331 Makefile.in
--- Makefile.in	9 Jul 2003 21:03:31 -0000	1.331
+++ Makefile.in	13 Jul 2003 14:29:13 -0000
@@ -522,6 +522,8 @@
 gnu/java/awt/BitMaskExtent.java \
 gnu/java/awt/Buffers.java \
 gnu/java/awt/ComponentDataBlitOp.java \
+gnu/java/awt/EmbeddedWindow.java \
+gnu/java/awt/EmbeddedWindowSupport.java \
 gnu/java/awt/EventModifier.java \
 gnu/java/awt/GLightweightPeer.java \
 gnu/java/awt/image/ImageDecoder.java \
@@ -2336,6 +2338,7 @@
 gnu/gcj/runtime/natStackTrace.cc \
 gnu/gcj/runtime/natStringBuffer.cc \
 gnu/gcj/runtime/natVMClassLoader.cc \
+gnu/java/awt/natEmbeddedWindow.cc \
 gnu/java/nio/natFileChannelImpl.cc \
 gnu/java/nio/natFileLockImpl.cc \
 gnu/java/nio/natSelectorImpl.cc \
@@ -2511,14 +2514,15 @@
 gnu/gcj/runtime/natFinalizerThread.lo gnu/gcj/runtime/natFirstThread.lo \
 gnu/gcj/runtime/natNameFinder.lo gnu/gcj/runtime/natSharedLibLoader.lo \
 gnu/gcj/runtime/natStackTrace.lo gnu/gcj/runtime/natStringBuffer.lo \
-gnu/gcj/runtime/natVMClassLoader.lo gnu/java/nio/natFileChannelImpl.lo \
-gnu/java/nio/natFileLockImpl.lo gnu/java/nio/natSelectorImpl.lo \
-java/io/natFile.lo java/io/natFileDescriptor.lo \
-java/io/natObjectInputStream.lo java/io/natVMObjectStreamClass.lo \
-java/lang/natCharacter.lo java/lang/natClass.lo \
-java/lang/natClassLoader.lo java/lang/natConcreteProcess.lo \
-java/lang/natDouble.lo java/lang/natFloat.lo java/lang/natMath.lo \
-java/lang/natObject.lo java/lang/natRuntime.lo java/lang/natString.lo \
+gnu/gcj/runtime/natVMClassLoader.lo gnu/java/awt/natEmbeddedWindow.lo \
+gnu/java/nio/natFileChannelImpl.lo gnu/java/nio/natFileLockImpl.lo \
+gnu/java/nio/natSelectorImpl.lo java/io/natFile.lo \
+java/io/natFileDescriptor.lo java/io/natObjectInputStream.lo \
+java/io/natVMObjectStreamClass.lo java/lang/natCharacter.lo \
+java/lang/natClass.lo java/lang/natClassLoader.lo \
+java/lang/natConcreteProcess.lo java/lang/natDouble.lo \
+java/lang/natFloat.lo java/lang/natMath.lo java/lang/natObject.lo \
+java/lang/natRuntime.lo java/lang/natString.lo \
 java/lang/natStringBuffer.lo java/lang/natSystem.lo \
 java/lang/natThread.lo java/lang/natVMSecurityManager.lo \
 java/lang/ref/natReference.lo java/lang/reflect/natArray.lo \
@@ -2772,10 +2776,13 @@
 .deps/gnu/gcj/xlib/natXImage.P .deps/gnu/gcj/xlib/natXUnmapEvent.P \
 .deps/gnu/java/awt/BitMaskExtent.P .deps/gnu/java/awt/Buffers.P \
 .deps/gnu/java/awt/ComponentDataBlitOp.P \
+.deps/gnu/java/awt/EmbeddedWindow.P \
+.deps/gnu/java/awt/EmbeddedWindowSupport.P \
 .deps/gnu/java/awt/EventModifier.P \
 .deps/gnu/java/awt/GLightweightPeer.P \
 .deps/gnu/java/awt/image/ImageDecoder.P \
 .deps/gnu/java/awt/image/XBMDecoder.P \
+.deps/gnu/java/awt/natEmbeddedWindow.P \
 .deps/gnu/java/awt/peer/gtk/GdkFontMetrics.P \
 .deps/gnu/java/awt/peer/gtk/GdkGraphics.P \
 .deps/gnu/java/awt/peer/gtk/GtkArg.P \
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	13 Jul 2003 14:29:13 -0000
@@ -0,0 +1,62 @@
+/* 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 java.awt.Window;
+
+/**
+ * This class represents an AWT window embedded into another graphical
+ * toolkit or anther application.
+ * 
+ * @author Michael Koch <konqueror@gmx.de>
+ */
+public class EmbeddedWindow extends Window
+{
+  /**
+   * Creates an window embedded into another application of graphical toolkit.
+   *
+   * @param window_id The native handle to the screen area where the AWT window
+   * should be embedded.
+   * @param width The width of the screen area.
+   * @param height The height of the screen area.
+   */
+  // This method is only made native to circumvent the package-privateness of
+  // an internal java.awt.Window constructor.
+  public static native Window create (int window_id, int width, int height);
+}
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	13 Jul 2003 14:29:13 -0000
@@ -0,0 +1,67 @@
+/* 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 java.awt.peer.WindowPeer;
+
+/**
+ * This interface defines a method for creating embedded windows.
+ *
+ * All classes inherited from java.awt.Toolkit that implement this interface
+ * are assumed to support embedded windows. To embed the real embedded window
+ * you need to use gnu.java.awt.EmbeddedWindow.
+ *
+ * @see gnu.java.awt.EmbeddedWindow
+ * @see java.awt.Toolkit
+ *
+ * @author Michael Koch <konqueror@gmx.de>
+ */
+public interface EmbeddedWindowSupport
+{
+  /**
+   * This method creates an embedded window in an application.
+   *
+   * @param window_id The native handle of a screen area to display an
+   * AWT window in it.
+   * @param width The width of the screen area.
+   * @param height The height of the screen area.
+   */
+  public WindowPeer createEmbeddedWindow (int window_id,
+					  int width, int height);
+}
Index: gnu/java/awt/natEmbeddedWindow.cc
===================================================================
RCS file: gnu/java/awt/natEmbeddedWindow.cc
diff -N gnu/java/awt/natEmbeddedWindow.cc
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ gnu/java/awt/natEmbeddedWindow.cc	13 Jul 2003 14:29:13 -0000
@@ -0,0 +1,16 @@
+/* Copyright (C) 2003  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.  */
+
+#include <gnu/java/awt/EmbeddedWindow.h>
+#include <java/awt/Window.h>
+
+::java::awt::Window*
+gnu::java::awt::EmbeddedWindow::create (jint window_id, jint width, jint height)
+{
+  return new ::java::awt::Window (window_id, width, height);
+}
Index: java/awt/Window.java
===================================================================
RCS file: /cvs/gcc/gcc/libjava/java/awt/Window.java,v
retrieving revision 1.24
diff -u -b -B -r1.24 Window.java
--- java/awt/Window.java	27 Jun 2003 20:53:01 -0000	1.24
+++ java/awt/Window.java	13 Jul 2003 14:29:13 -0000
@@ -38,6 +38,7 @@
 
 package java.awt;
 
+import gnu.java.awt.EmbeddedWindowSupport;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowFocusListener;
 import java.awt.event.WindowListener;
@@ -93,6 +94,19 @@
     graphicsConfiguration = gc;
   }
 
+  Window(int window_id, int width, int height)
+  {
+    this();
+
+    Toolkit tk = getToolkit();
+    if (!(tk instanceof EmbeddedWindowSupport))
+      throw new UnsupportedOperationException
+	("Embedded windows not supported by the current peers: " + tk.getClass());
+    
+    peer = ((EmbeddedWindowSupport) getToolkit())
+	    .createEmbeddedWindow (window_id, width, height);
+  }
+    
   /**
    * Initializes a new instance of <code>Window</code> with the specified
    * parent.  The window will initially be invisible.