Imported Classpath 0.18.
* sources.am, Makefile.in: Updated. * Makefile.am (nat_source_files): Removed natProxy.cc. * java/lang/reflect/natProxy.cc: Removed. * gnu/classpath/jdwp/VMFrame.java, gnu/classpath/jdwp/VMIdManager.java, gnu/classpath/jdwp/VMVirtualMachine.java, java/lang/reflect/VMProxy.java: New files. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * scripts/makemake.tcl (verbose): Add gnu/java/awt/peer/qt to BC list. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/java/net/DefaultContentHandlerFactory.java (getContent): Remove ClasspathToolkit references. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * gnu/awt/xlib/XCanvasPeer.java: Add new peer methods. * gnu/awt/xlib/XFramePeer.java: Likewise. * gnu/awt/xlib/XGraphicsConfiguration.java: Likewise. 2005-09-23 Thomas Fitzsimmons <fitzsim@redhat.com> * Makefile.am (libgcjawt_la_SOURCES): Remove jawt.c. Add classpath/native/jawt/jawt.c. * Makefile.in: Regenerate. * jawt.c: Remove file. * include/Makefile.am (tool_include__HEADERS): Remove jawt.h and jawt_md.h. Add ../classpath/include/jawt.h and ../classpath/include/jawt_md.h. * include/Makefile.in: Regenerate. * include/jawt.h: Regenerate. * include/jawt_md.h: Regenerate. From-SVN: r104586
This commit is contained in:
Tom Tromey
@@ -11,5 +11,5 @@ target_noncanonical = @target_noncanonical@
|
||||
tool_include_dir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
|
||||
## The 'jni.h' here is fairly hacky, but it is simpler than trying to
|
||||
## tell Classpath about our peculiar install directory.
|
||||
tool_include__HEADERS = jni_md.h jawt.h jawt_md.h jvmpi.h \
|
||||
../classpath/include/jni.h
|
||||
tool_include__HEADERS = jni_md.h ../classpath/include/jawt.h \
|
||||
../classpath/include/jawt_md.h jvmpi.h ../classpath/include/jni.h
|
||||
|
||||
@@ -299,8 +299,8 @@ AUTOMAKE_OPTIONS = foreign
|
||||
# May be used by various substitution variables.
|
||||
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
|
||||
tool_include_dir = $(libdir)/gcc/$(target_noncanonical)/$(gcc_version)/include
|
||||
tool_include__HEADERS = jni_md.h jawt.h jawt_md.h jvmpi.h \
|
||||
../classpath/include/jni.h
|
||||
tool_include__HEADERS = jni_md.h ../classpath/include/jawt.h \
|
||||
../classpath/include/jawt_md.h jvmpi.h ../classpath/include/jni.h
|
||||
|
||||
all: config.h
|
||||
$(MAKE) $(AM_MAKEFLAGS) all-am
|
||||
|
||||
@@ -1,101 +0,0 @@
|
||||
/* 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__ */
|
||||
@@ -1,64 +0,0 @@
|
||||
/* 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__ */
|
||||
Reference in New Issue
Block a user