From c36eda5462a917b6b23c07fa0ac1752cf830a29d Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Mon, 14 Feb 2005 21:08:08 +0000 Subject: jawt.c: New file. 2005-02-14 Thomas Fitzsimmons * jawt.c: New file. * include/jawt.h: Likewise. * include/jawt_md.h: Likewise. * include/Makefile.am (tool_include__HEADERS): Add jawt.h and jawt_md.h files. * include/Makefile.in: Regenerate. * jni/classpath/classpath_jawt.h: Likewise. * jni/gtk-peer/gtk_jawt.c: Likewise. * Makefile.am: Build libjawt.so. * Makefile.in: Regenerate. From-SVN: r95047 --- libjava/include/Makefile.am | 2 +- libjava/include/Makefile.in | 2 +- libjava/include/jawt.h | 92 +++++++++++++++++++++++++++++++++++++++++++++ libjava/include/jawt_md.h | 63 +++++++++++++++++++++++++++++++ 4 files changed, 157 insertions(+), 2 deletions(-) create mode 100644 libjava/include/jawt.h create mode 100644 libjava/include/jawt_md.h (limited to 'libjava/include') diff --git a/libjava/include/Makefile.am b/libjava/include/Makefile.am index 5b6177b..089884b 100644 --- a/libjava/include/Makefile.am +++ b/libjava/include/Makefile.am @@ -5,4 +5,4 @@ AUTOMAKE_OPTIONS = foreign # autoconf2.13's target_alias target_noncanonical = @target_noncanonical@ -tool_include__HEADERS = jni.h jvmpi.h +tool_include__HEADERS = jni.h jawt.h jawt_md.h jvmpi.h diff --git a/libjava/include/Makefile.in b/libjava/include/Makefile.in index 7d2bb46..4c05fce 100644 --- a/libjava/include/Makefile.in +++ b/libjava/include/Makefile.in @@ -296,7 +296,7 @@ toolexecdir = @toolexecdir@ toolexeclibdir = @toolexeclibdir@ toolexecmainlibdir = @toolexecmainlibdir@ AUTOMAKE_OPTIONS = foreign -tool_include__HEADERS = jni.h jvmpi.h +tool_include__HEADERS = jni.h jawt.h jawt_md.h jvmpi.h all: config.h $(MAKE) $(AM_MAKEFLAGS) all-am diff --git a/libjava/include/jawt.h b/libjava/include/jawt.h new file mode 100644 index 0000000..52cde83 --- /dev/null +++ b/libjava/include/jawt.h @@ -0,0 +1,92 @@ +/* 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., 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. */ + + +/* + * 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_LOCK_ERROR 0x1 + +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; + + /* 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*); +}; + +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/libjava/include/jawt_md.h b/libjava/include/jawt_md.h new file mode 100644 index 0000000..94abb57 --- /dev/null +++ b/libjava/include/jawt_md.h @@ -0,0 +1,63 @@ +/* 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., 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. */ + + +#ifndef __jawt_md_h__ +#define __jawt_md_h__ + +#include +#include +#include + +#ifdef __cplusplus +extern "C" +{ +#endif + +struct _JAWT_X11DrawingSurfaceInfo +{ + Display* display; + Drawable drawable; +}; + +typedef struct _JAWT_X11DrawingSurfaceInfo JAWT_X11DrawingSurfaceInfo; + +#ifdef __cplusplus +} +#endif + +#endif /* __jawt_md_h__ */ -- cgit v1.1