diff options
| author | Thomas Fitzsimmons <fitzsim@redhat.com> | 2005-08-20 22:46:53 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@redhat.com> | 2005-08-20 22:46:53 +0000 |
| commit | 2055eb8823d533e57946ada6f46e2e521ab15746 (patch) | |
| tree | 2f05e6a13a23bf65bab5a135dc3303ac740479ab /include/jawt_md.h | |
| parent | c57c525cf50b37d401a193f3f4af1e69774fa90c (diff) | |
| download | classpath-2055eb8823d533e57946ada6f46e2e521ab15746.tar.gz | |
2005-08-20 Thomas Fitzsimmons <fitzsim@redhat.com>
* native/jni/gtk-peer/gtk_jawt.c
(classpath_jawt_get_default_display): Remove locking.
(classpath_jawt_get_visualID): Likewise.
(classpath_jawt_get_drawable): Likewise.
(classpath_jawt_object_lock): Remove function.
(classpath_jawt_object_unlock): Likewise.
(classpath_jawt_create_lock): Likewise.
(classpath_jawt_destroy_lock): Likewise.
* native/jni/classpath/classpath_jawt.h
(classpath_jawt_object_lock): Remove function.
(classpath_jawt_object_unlock): Likewise.
(classpath_jawt_create_lock): Likewise.
(classpath_jawt_destroy_lock): Likewise.
* native/jawt/jawt.c [!__GNUC__] (__attribute__): Define to
nothing.
(_Jv_Lock): Call classpath_jawt_lock.
(_Jv_Unlock): Call classpath_jawt_unlock.
(_Jv_GetDrawingSurfaceInfo): Move surface_info_x11 initialization
from ...
(_Jv_GetDrawingSurface): Remove surface_info_x11 initialization.
(_Jv_FreeDrawingSurface): Don't destroy target object.
* native/jawt/Makefile.am: Add SONAME FIXME.
* include/jawt_md.h (struct _JAWT_X11DrawingSurfaceInfo): Re-order
display field. Add colour map, depth and GetAWTColor function
pointer fields.
* include/jawt.h (struct _JAWT_Rectangle): New structure.
(struct _JAWT_DrawingSurfaceInfo): Add drawing surface, bounds,
clip size and clipping rectangle fields.
(struct _JAWT_DrawingSurface): Add env field. Rename lock field
target. Re-order function pointer and lock fields. Remove
surface_info field.
(struct _JAWT): Add GetComponent function pointer field.
Diffstat (limited to 'include/jawt_md.h')
| -rw-r--r-- | include/jawt_md.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/jawt_md.h b/include/jawt_md.h index 29c9a3f2a..5c2089b90 100644 --- a/include/jawt_md.h +++ b/include/jawt_md.h @@ -50,9 +50,12 @@ extern "C" struct _JAWT_X11DrawingSurfaceInfo { - Display* display; Drawable drawable; + Display* display; VisualID visualID; + Colormap colormapID; + int depth; + int (JNICALL *GetAWTColor)(struct _JAWT_DrawingSurface*, int, int, int); }; typedef struct _JAWT_X11DrawingSurfaceInfo JAWT_X11DrawingSurfaceInfo; |