diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | include/jawt.h | 101 | ||||
| -rw-r--r-- | include/jawt_md.h | 64 | ||||
| -rw-r--r-- | native/Makefile.am | 8 | ||||
| -rw-r--r-- | native/jawt/.cvsignore | 8 | ||||
| -rw-r--r-- | native/jawt/Makefile.am | 12 | ||||
| -rw-r--r-- | native/jawt/jawt.c | 178 |
8 files changed, 381 insertions, 2 deletions
@@ -1,3 +1,14 @@ +2005-08-19 Thomas Fitzsimmons <fitzsim@redhat.com> + + * configure.ac: Generate native/jawt/Makefile. + * include/jawt.h: Import from libgcj. + * include/jawt_md.h: Likewise. + * native/Makefile.am (JAWTDIR): New variable. + * native/jawt: New directory. + * native/jawt/.cvsignore: New file. + * native/jawt/Makefile.am: Likewise. + * native/jawt/jawt.c: Import from libgcj. + 2005-08-19 Lillian Angel <langel@redhat.com> * javax/swing/tree/DefaultTreeModel.java diff --git a/configure.ac b/configure.ac index 9b76d49f4..d4a27f013 100644 --- a/configure.ac +++ b/configure.ac @@ -468,6 +468,7 @@ gnu/classpath/Configuration.java include/Makefile native/Makefile native/fdlibm/Makefile +native/jawt/Makefile native/jni/Makefile native/jni/classpath/Makefile native/jni/java-io/Makefile diff --git a/include/jawt.h b/include/jawt.h new file mode 100644 index 000000000..1e2fb0086 --- /dev/null +++ b/include/jawt.h @@ -0,0 +1,101 @@ +/* jawt.h -- the machine-independent parts of the AWT Native Interface + Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 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. */ + + +/* + * The AWT Native Interface allows direct access to native screen + * resources from within a Canvas's paint method. + */ + +#ifndef __jawt_h__ +#define __jawt_h__ + +#ifdef __cplusplus +extern "C" +{ +#endif + +#define JAWT_VERSION_1_3 0x10003 +#define JAWT_VERSION_1_4 0x10004 + +#define JAWT_LOCK_ERROR 0x1 +#define JAWT_LOCK_CLIP_CHANGED 0x2 +#define JAWT_LOCK_BOUNDS_CHANGED 0x4 +#define JAWT_LOCK_SURFACE_CHANGED 0x8 + +struct _JAWT_DrawingSurfaceInfo +{ + void* platformInfo; +}; + +struct _JAWT_DrawingSurface +{ + jint (JNICALL* Lock) (struct _JAWT_DrawingSurface*); + void (JNICALL* Unlock) (struct _JAWT_DrawingSurface*); + + struct _JAWT_DrawingSurfaceInfo* (JNICALL* GetDrawingSurfaceInfo) (struct _JAWT_DrawingSurface*); + void (JNICALL* FreeDrawingSurfaceInfo) (struct _JAWT_DrawingSurfaceInfo*); + + struct _JAWT_DrawingSurfaceInfo* surface_info; + + /* An object we're going to use for locking the surface. */ + jobject lock; + + /* FIXME: also include bounding rectangle of drawing surface. */ + /* FIXME: also include current clipping region. */ +}; + +struct _JAWT +{ + jint version; + struct _JAWT_DrawingSurface* (JNICALL* GetDrawingSurface) (JNIEnv*, jobject); + void (JNICALL* FreeDrawingSurface) (struct _JAWT_DrawingSurface*); + void (JNICALL *Lock) (JNIEnv*); + void (JNICALL *Unlock) (JNIEnv*); +}; + +typedef struct _JAWT_DrawingSurfaceInfo JAWT_DrawingSurfaceInfo; +typedef struct _JAWT_DrawingSurface JAWT_DrawingSurface; +typedef struct _JAWT JAWT; + +JNIEXPORT jboolean JNICALL JAWT_GetAWT (JNIEnv* env, struct _JAWT* awt); + +#ifdef __cplusplus +} +#endif + +#endif /* __jawt_h__ */ diff --git a/include/jawt_md.h b/include/jawt_md.h new file mode 100644 index 000000000..29c9a3f2a --- /dev/null +++ b/include/jawt_md.h @@ -0,0 +1,64 @@ +/* jawt_md.h -- the X11-dependent parts of the AWT Native Interface + Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 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. */ + + +#ifndef __jawt_md_h__ +#define __jawt_md_h__ + +#include <jni.h> +#include <jawt.h> +#include <X11/Xlib.h> + +#ifdef __cplusplus +extern "C" +{ +#endif + +struct _JAWT_X11DrawingSurfaceInfo +{ + Display* display; + Drawable drawable; + VisualID visualID; +}; + +typedef struct _JAWT_X11DrawingSurfaceInfo JAWT_X11DrawingSurfaceInfo; + +#ifdef __cplusplus +} +#endif + +#endif /* __jawt_md_h__ */ diff --git a/native/Makefile.am b/native/Makefile.am index 6cc309010..4fa593e03 100644 --- a/native/Makefile.am +++ b/native/Makefile.am @@ -4,6 +4,10 @@ if CREATE_JNI_LIBRARIES JNIDIR = jni endif -SUBDIRS = fdlibm $(JNIDIR) target -DIST_SUBDIRS = fdlibm jni target +if CREATE_GTK_PEER_LIBRARIES + JAWTDIR = jawt +endif + +SUBDIRS = fdlibm $(JNIDIR) $(JAWTDIR) target +DIST_SUBDIRS = fdlibm jni jawt target diff --git a/native/jawt/.cvsignore b/native/jawt/.cvsignore new file mode 100644 index 000000000..e9f2658a6 --- /dev/null +++ b/native/jawt/.cvsignore @@ -0,0 +1,8 @@ +*.o +*.a +*.lo +*.la +.libs +.deps +Makefile +Makefile.in diff --git a/native/jawt/Makefile.am b/native/jawt/Makefile.am new file mode 100644 index 000000000..dfc64cc60 --- /dev/null +++ b/native/jawt/Makefile.am @@ -0,0 +1,12 @@ +pkglib_LTLIBRARIES = libjawtgnu.la + +libjawtgnu_la_SOURCES = jawt.c +libjawtgnu_la_LIBADD = $(top_builddir)/native/jni/gtk-peer/libgtkpeer.la + +AM_LDFLAGS = @CLASSPATH_MODULE@ @GTK_LIBS@ @CAIRO_LIBS@ @PANGOFT2_LIBS@ @X_LIBS@ -lXtst +AM_CPPFLAGS = @CLASSPATH_INCLUDES@ + +# Just the WARNING_CFLAGS. We cannot use the strict flags since the gtk +# headers contain broken prototypes (by design, see gtkitemfactory.h). +AM_CFLAGS = @WARNING_CFLAGS@ @ERROR_CFLAGS@ \ + @GTK_CFLAGS@ @CAIRO_CFLAGS@ @PANGOFT2_CFLAGS@ diff --git a/native/jawt/jawt.c b/native/jawt/jawt.c new file mode 100644 index 000000000..8efa87cd8 --- /dev/null +++ b/native/jawt/jawt.c @@ -0,0 +1,178 @@ +/* jawt.c -- X11 implementation of the AWT Native Interface + Copyright (C) 2005 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., 51 Franklin Street, Fifth Floor, Boston, MA + 02110-1301 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 <stdlib.h> +#include <jni.h> +#include <jawt.h> +#include <jawt_md.h> +#include "classpath_jawt.h" + +static jint (JNICALL _Jv_Lock) (JAWT_DrawingSurface* surface); +static void (JNICALL _Jv_Unlock) (JAWT_DrawingSurface* surface); +static JAWT_DrawingSurfaceInfo* (JNICALL _Jv_GetDrawingSurfaceInfo) + (JAWT_DrawingSurface* surface); +static void (JNICALL _Jv_FreeDrawingSurfaceInfo) + (JAWT_DrawingSurfaceInfo* surface_info); +static JAWT_DrawingSurface* (JNICALL _Jv_GetDrawingSurface) (JNIEnv* env, + jobject canvas); +static void (JNICALL _Jv_FreeDrawingSurface) (JAWT_DrawingSurface* surface); +static void (JNICALL _Jv_AWTLock) (JNIEnv*); +static void (JNICALL _Jv_AWTUnlock) (JNIEnv*); + +JNIEXPORT jboolean JNICALL +JAWT_GetAWT (JNIEnv* env __attribute__((unused)), JAWT* awt) +{ + jint retrieved_version; + + retrieved_version = classpath_jawt_get_awt_version (); + + if (awt->version > retrieved_version) + return JNI_FALSE; + + awt->GetDrawingSurface = _Jv_GetDrawingSurface; + awt->FreeDrawingSurface = _Jv_FreeDrawingSurface; + awt->Lock = _Jv_AWTLock; + awt->Unlock = _Jv_AWTUnlock; + + return JNI_TRUE; +} + +/* JAWT_DrawingSurface functions */ + +static jint +(JNICALL _Jv_Lock) (JAWT_DrawingSurface* surface) +{ + return classpath_jawt_object_lock (surface->lock); +} + +static void +(JNICALL _Jv_Unlock) (JAWT_DrawingSurface* surface) +{ + classpath_jawt_object_unlock (surface->lock); +} + +static JAWT_DrawingSurfaceInfo* +(JNICALL _Jv_GetDrawingSurfaceInfo) (JAWT_DrawingSurface* surface) +{ + if (surface == NULL) + return NULL; + + return surface->surface_info; +} + +static void +(JNICALL _Jv_FreeDrawingSurfaceInfo) (JAWT_DrawingSurfaceInfo* surface_info) +{ + JAWT_X11DrawingSurfaceInfo* surface_info_x11; + + if (surface_info == NULL) + return; + + surface_info_x11 = (JAWT_X11DrawingSurfaceInfo*) surface_info->platformInfo; + + surface_info_x11->display = NULL; + surface_info_x11->drawable = 0; + surface_info_x11->visualID = 0; + + free (surface_info->platformInfo); + free (surface_info); + surface_info = NULL; +} + +/* JAWT functions */ + +static JAWT_DrawingSurface* +(JNICALL _Jv_GetDrawingSurface) (JNIEnv* env, jobject canvas) +{ + JAWT_DrawingSurface* surface; + JAWT_X11DrawingSurfaceInfo* surface_info_x11; + + surface = (JAWT_DrawingSurface*) malloc (sizeof (JAWT_DrawingSurface)); + + if (surface == NULL) + return NULL; + + /* initialize function pointers */ + surface->GetDrawingSurfaceInfo = _Jv_GetDrawingSurfaceInfo; + surface->FreeDrawingSurfaceInfo = _Jv_FreeDrawingSurfaceInfo; + + surface->Lock = _Jv_Lock; + surface->Unlock = _Jv_Unlock; + + surface->surface_info = (JAWT_DrawingSurfaceInfo*) malloc (sizeof (JAWT_DrawingSurfaceInfo)); + + surface->lock = classpath_jawt_create_lock (); + + if (surface->surface_info == NULL) + return NULL; + + surface->surface_info->platformInfo = malloc (sizeof (JAWT_X11DrawingSurfaceInfo)); + + if (surface->surface_info->platformInfo == NULL) + return NULL; + + surface_info_x11 = (JAWT_X11DrawingSurfaceInfo*) surface->surface_info->platformInfo; + + surface_info_x11->display = classpath_jawt_get_default_display (env, canvas); + surface_info_x11->drawable = classpath_jawt_get_drawable (env, canvas); + surface_info_x11->visualID = classpath_jawt_get_visualID (env, canvas); + + /* FIXME: also include bounding rectangle of drawing surface */ + /* FIXME: also include current clipping region */ + + return surface; +} + +static void +(JNICALL _Jv_FreeDrawingSurface) (JAWT_DrawingSurface* surface) +{ + classpath_jawt_destroy_lock (surface->lock); + free (surface); +} + +static void +(JNICALL _Jv_AWTLock) (JNIEnv* env __attribute__((unused))) +{ + classpath_jawt_lock (); +} + +static void +(JNICALL _Jv_AWTUnlock) (JNIEnv* env __attribute__((unused))) +{ + classpath_jawt_unlock (); +} + |