Window.java (Window(Window,GraphicsConfiguration)): Don't try to find graphics configuration.

	* java/awt/Window.java (Window(Window,GraphicsConfiguration)):
	Don't try to find graphics configuration.
	* java/awt/Toolkit.java (default_toolkit_name): Use new
	Configuration entry.
	* gnu/classpath/Configuration.java.in (default_awt_peer_toolkit):
	New global.
	* configure: Rebuilt.
	* configure.in (TOOLKIT): New subst.
	(--enable-java-awt) [xlib, gtk]: Set TOOLKIT if required.
	Do AWT tests much earlier.  Run Gtk tests.  Make jniinclude
	directory.  Make output directories for .c files.
	* Makefile.in: Rebuilt.
	* Makefile.am (lib_gnu_java_awt_peer_gtk_la_SOURCES): New macro.
	(toolexeclib_LTLIBRARIES): Added cond_gtk_ltlibrary.
	(all_java_source_files): Added new sources.
	($(lib_gnu_java_awt_peer_gtk_la_OBJECTS)): New target.
	(gtk_c_files): New macro.
	(gtk_c_source_files): New macro.
	(cond_gtk_ltlibrary): New macro.
	($(gtk_c_files)): New target.
	(lib_gnu_java_awt_peer_gtk_la_LIBADD): New macro.
	(gtk_awt_peer_sources): New macro.
	(gtk_c_headers): New macro.
	($(gtk_c_headers)): New target.
	(ACLOCAL_AMFLAGS): New macro.
	* gtk.m4, glib.m4, libart.m4: New files.
	* gnu/java/awt/peer/gtk/GdkFontMetrics.java,
	gnu/java/awt/peer/gtk/GdkGraphics.java,
	gnu/java/awt/peer/gtk/GtkArg.java,
	gnu/java/awt/peer/gtk/GtkArgList.java,
	gnu/java/awt/peer/gtk/GtkButtonPeer.java,
	gnu/java/awt/peer/gtk/GtkCanvasPeer.java,
	gnu/java/awt/peer/gtk/GtkCheckboxGroupPeer.java,
	gnu/java/awt/peer/gtk/GtkCheckboxMenuItemPeer.java,
	gnu/java/awt/peer/gtk/GtkCheckboxPeer.java,
	gnu/java/awt/peer/gtk/GtkChoicePeer.java,
	gnu/java/awt/peer/gtk/GtkClipboard.java,
	gnu/java/awt/peer/gtk/GtkComponentPeer.java,
	gnu/java/awt/peer/gtk/GtkContainerPeer.java,
	gnu/java/awt/peer/gtk/GtkDialogPeer.java,
	gnu/java/awt/peer/gtk/GtkFileDialogPeer.java,
	gnu/java/awt/peer/gtk/GtkFontPeer.java,
	gnu/java/awt/peer/gtk/GtkFramePeer.java,
	gnu/java/awt/peer/gtk/GtkGenericPeer.java,
	gnu/java/awt/peer/gtk/GtkImage.java,
	gnu/java/awt/peer/gtk/GtkImagePainter.java,
	gnu/java/awt/peer/gtk/GtkLabelPeer.java,
	gnu/java/awt/peer/gtk/GtkListPeer.java,
	gnu/java/awt/peer/gtk/GtkMainThread.java,
	gnu/java/awt/peer/gtk/GtkMenuBarPeer.java,
	gnu/java/awt/peer/gtk/GtkMenuComponentPeer.java,
	gnu/java/awt/peer/gtk/GtkMenuItemPeer.java,
	gnu/java/awt/peer/gtk/GtkMenuPeer.java,
	gnu/java/awt/peer/gtk/GtkOffScreenImage.java,
	gnu/java/awt/peer/gtk/GtkPanelPeer.java,
	gnu/java/awt/peer/gtk/GtkPopupMenuPeer.java,
	gnu/java/awt/peer/gtk/GtkScrollbarPeer.java,
	gnu/java/awt/peer/gtk/GtkScrollPanePeer.java,
	gnu/java/awt/peer/gtk/GtkTextAreaPeer.java,
	gnu/java/awt/peer/gtk/GtkTextComponentPeer.java,
	gnu/java/awt/peer/gtk/GtkTextFieldPeer.java,
	gnu/java/awt/peer/gtk/GtkToolkit.java,
	gnu/java/awt/peer/gtk/GtkWindowPeer.java,
	gnu/java/awt/peer/gtk/TestAWT.java,
	gnu/java/awt/peer/gtk/Test.java: New files from Classpath.
	* jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontMetrics.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCanvasPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxMenuItemPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkCheckboxPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkLabelPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkListPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuBarPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuItemPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMenuPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPanelPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkPopupMenuPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollBarPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkScrollPanePeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextFieldPeer.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkToolkit.c,
	jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c,
	jni/gtk-peer/gthread-jni.c, jni/gtk-peer/gthread-jni.h,
	jni/gtk-peer/gtkpeer.h, jni/classpath/jcl.c, jni/classpath/jcl.h,
	jni/classpath/jnilink.c, jni/classpath/jnilink.h,
	jni/classpath/native_state.c, jni/classpath/native_state.h,
	jni/classpath/primlib.c, jni/classpath/primlib.h: Likewise.

From-SVN: r62187

1 files changed, 169 insertions, 0 deletions

diff --git a/libjava/jni/gtk-peer/gthread-jni.c b/libjava/jni/gtk-peer/gthread-jni.c
new file mode 100644
index 0000000..9409720
--- /dev/null
+++ b/libjava/jni/gtk-peer/gthread-jni.c
@@ -0,0 +1,169 @@
+/* gthread-jni.c -- JNI threading routines for GLIB
+   Copyright (C) 1998 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. */
+
+
+#include "gthread-jni.h"
+
+/*
+ * This code has been written specifically to be used with GTK+ 1.2.
+ * `Real' GLIB threading is not supported.  We fake things where necessary.
+ * Once we know we're running on a 1.2 VM, we can write a real implementation.
+ */
+
+static GMutex *
+g_mutex_new_jni_impl (void)
+{
+  jclass obj_class;
+  jobject *mutex;
+
+  obj_class = (*gdk_env)->FindClass (gdk_env, "java/lang/Object");
+  if (obj_class == NULL)
+    return NULL;
+
+  mutex = (jobject *) g_malloc (sizeof (jobject));
+  *mutex = (*gdk_env)->AllocObject (gdk_env, obj_class);
+  if (*mutex == NULL)
+    {
+      g_free (mutex);
+      return NULL;
+    }
+  *mutex = (*gdk_env)->NewGlobalRef (gdk_env, *mutex);
+
+  return (GMutex *) mutex;
+}
+
+static void
+g_mutex_lock_jni_impl (GMutex *mutex)
+{
+  if (mutex && mutex == gdk_threads_mutex)
+    (*gdk_env)->MonitorEnter (gdk_env, *((jobject *)mutex));
+}
+
+static gboolean
+g_mutex_trylock_jni_impl (GMutex *mutex)
+{
+  return FALSE;
+}
+
+static void
+g_mutex_unlock_jni_impl (GMutex *mutex)
+{
+  if (mutex && mutex == gdk_threads_mutex)
+    (*gdk_env)->MonitorExit (gdk_env, *((jobject *)mutex));
+}
+
+static void
+g_mutex_free_jni_impl (GMutex *mutex)
+{
+  if (mutex && mutex == gdk_threads_mutex)
+    {
+      (*gdk_env)->DeleteGlobalRef (gdk_env, *((jobject *)mutex));
+      g_free (mutex);
+    }
+}
+
+static GPrivate *
+g_private_new_jni_impl (GDestroyNotify notify)
+{
+  return NULL;
+}
+
+static gpointer
+g_private_get_jni_impl (GPrivate *private)
+{
+  return NULL;
+}
+
+static void
+g_private_set_jni_impl (GPrivate *private, gpointer data)
+{
+}
+
+static GCond *
+g_cond_new_jni_impl ()
+{
+  return NULL;
+}
+
+static void
+g_cond_signal_jni_impl (GCond *cond)
+{
+}
+
+static void
+g_cond_broadcast_jni_impl (GCond *cond)
+{
+}
+
+static void
+g_cond_wait_jni_impl (GCond *cond, GMutex *mutex)
+{
+}
+
+static gboolean
+g_cond_timed_wait_jni_impl (GCond *cond, GMutex *mutex)
+{
+  return FALSE;
+}
+
+static void
+g_cond_free_jni_impl (GCond *cond)
+{
+}
+
+GThreadFunctions g_thread_jni_functions =
+{
+  g_mutex_new_jni_impl,	      /* mutex_new */
+  g_mutex_lock_jni_impl,      /* mutex_lock */
+  g_mutex_trylock_jni_impl,   /* mutex_try_lock */
+  g_mutex_unlock_jni_impl,    /* mutex_unlock */
+  g_mutex_free_jni_impl,      /* mutex_free */
+  g_cond_new_jni_impl,        /* cond_new */
+  g_cond_signal_jni_impl,     /* cond_signal */
+  g_cond_broadcast_jni_impl,  /* cond_broadcast */
+  g_cond_wait_jni_impl,       /* cond_wait */
+  g_cond_timed_wait_jni_impl, /* cond_timed_wait */
+  g_cond_free_jni_impl,       /* cond_free */
+  g_private_new_jni_impl,     /* private_new */
+  g_private_get_jni_impl,     /* private_get */
+  g_private_set_jni_impl      /* private_set */
+};
+
+void
+gdk_threads_wake ()
+{
+}