diff options
| author | Anthony Green <green@redhat.com> | 2005-03-05 21:47:10 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2005-03-05 21:47:10 +0000 |
| commit | 011ad0584495ebbf43243a811166df479bba578c (patch) | |
| tree | c15a9469945dc66556efc2b98914d3904ca49180 /libjava/jawt.c | |
| parent | 3f724eb8a71c5aa02709ff34b93d272881bf69f8 (diff) | |
| download | gcc-011ad0584495ebbf43243a811166df479bba578c.zip gcc-011ad0584495ebbf43243a811166df479bba578c.tar.gz gcc-011ad0584495ebbf43243a811166df479bba578c.tar.bz2 | |
gtk_jawt.c (classpath_jawt_get_drawable, [...]): New functions.
2005-02-15 Anthony Green <green@redhat.com>
* jni/gtk-peer/gtk_jawt.c (classpath_jawt_get_drawable,
classpath_jawt_lock, classpath_jawt_unlock): New functions.
* jawt.c (_Jv_JAWT_Lock, _Jv_JAWT_Unlock): New functions.
(_Jv_GetDrawingSurface): Set visualID.
(_Jv_FreeDrawingSurfaceInfo): Clear visualID.
(JAWT_GetAWT): Set Lock and Unlock.
* include/jawt_md.h (struct _JAWT_X11DrawingSurfaceInfo): Add visualID.
* include/jawt.h (JAWT_VERSION_1_4, JAWT_LOCK_ERROR,
JAWT_LOCK_CLIP_CHANGED, JAWT_LOCK_BOUNDS_CHANGED,
JAWT_LOCK_SURFACE_CHANGED): New macros.
(struct _JAWT): Add Lock and Unlock.
From-SVN: r95943
Diffstat (limited to 'libjava/jawt.c')
| -rw-r--r-- | libjava/jawt.c | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/libjava/jawt.c b/libjava/jawt.c index c0d65b8..20890da 100644 --- a/libjava/jawt.c +++ b/libjava/jawt.c @@ -50,6 +50,8 @@ static void (JNICALL _Jv_FreeDrawingSurfaceInfo) 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, JAWT* awt) @@ -63,6 +65,8 @@ JAWT_GetAWT (JNIEnv* env, JAWT* awt) awt->GetDrawingSurface = _Jv_GetDrawingSurface; awt->FreeDrawingSurface = _Jv_FreeDrawingSurface; + awt->Lock = _Jv_AWTLock; + awt->Unlock = _Jv_AWTUnlock; return JNI_TRUE; } @@ -103,6 +107,7 @@ static void surface_info_x11->display = NULL; surface_info_x11->drawable = 0; + surface_info_x11->visualID = 0; free (surface_info); surface_info = NULL; @@ -142,6 +147,7 @@ static JAWT_DrawingSurface* 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 */ @@ -154,3 +160,16 @@ static void { free (surface); } + +static void +(JNICALL _Jv_AWTLock) (JNIEnv* env) +{ + classpath_jawt_lock (); +} + +static void +(JNICALL _Jv_AWTUnlock) (JNIEnv* env) +{ + classpath_jawt_unlock (); +} + |