[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: peer fixes
PatchSet 5531
Date: 2005/02/13 22:32:04
Author: robilad
Branch: HEAD
Tag: (none)
Log:
Resynced with GNU Classpath: peer fixes
2005-02-13 Dalibor Topic <[EMAIL PROTECTED]>
Resynced with GNU Classpath.
2005-02-10 Graydon Hoare <[EMAIL PROTECTED]>
* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,
jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
Release GDK lock during upcalls.
Members:
ChangeLog:1.3575->1.3576
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:1.10->1.11
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c:1.6->1.7
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c:1.4->1.5
libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.12->1.13
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3575 kaffe/ChangeLog:1.3576
--- kaffe/ChangeLog:1.3575 Sun Feb 13 22:29:44 2005
+++ kaffe/ChangeLog Sun Feb 13 22:32:04 2005
@@ -2,6 +2,18 @@
Resynced with GNU Classpath.
+ 2005-02-10 Graydon Hoare <[EMAIL PROTECTED]>
+
+* jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c,
+jni/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c,
+jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextComponentPeer.c,
+jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:
+Release GDK lock during upcalls.
+
+2005-02-13 Dalibor Topic <[EMAIL PROTECTED]>
+
+ Resynced with GNU Classpath.
+
2005-02-10 Michael Koch <[EMAIL PROTECTED]>
* native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkImagePainter.c:
Index:
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
diff -u
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:1.10
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:1.11
---
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c:1.10
Sat Jan 22 18:25:01 2005
+++
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkComponentPeer.c
Sun Feb 13 22:32:09 2005
@@ -1054,10 +1054,12 @@
GdkEventFocus *event __attribute((unused)),
jobject peer)
{
+ gdk_threads_leave ();
(*gdk_env())->CallVoidMethod (gdk_env(), peer,
postFocusEventID,
AWT_FOCUS_GAINED,
JNI_FALSE);
+ gdk_threads_enter ();
return FALSE;
}
@@ -1066,9 +1068,11 @@
GdkEventFocus *event __attribute((unused)),
jobject peer)
{
+ gdk_threads_leave ();
(*gdk_env())->CallVoidMethod (gdk_env(), peer,
postFocusEventID,
AWT_FOCUS_LOST,
JNI_FALSE);
+ gdk_threads_enter ();
return FALSE;
}
Index:
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
diff -u
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c:1.6
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c:1.7
---
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c:1.6
Sat Jan 22 18:25:01 2005
+++
kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c
Sun Feb 13 22:32:10 2005
@@ -883,6 +883,7 @@
switch (event->type)
{
case GDK_BUTTON_PRESS:
+ gdk_threads_leave ();
(*gdk_env())->CallVoidMethod (gdk_env(), peer,
postMouseEventID,
AWT_MOUSE_PRESSED,
@@ -894,12 +895,14 @@
click_count,
(event->button.button == 3) ? JNI_TRUE :
JNI_FALSE);
+ gdk_threads_enter ();
hasBeenDragged = FALSE;
break;
case GDK_BUTTON_RELEASE:
{
int width, height;
+ gdk_threads_leave ();
(*gdk_env())->CallVoidMethod (gdk_env(), peer,
postMouseEventID,
AWT_MOUSE_RELEASED,
@@ -910,6 +913,7 @@
(jint)event->button.y,
click_count,
JNI_FALSE);
+ gdk_threads_enter ();
/* Generate an AWT click event only if the release occured in the
window it was pressed in, and the mouse has not been dragged since
@@ -921,6 +925,7 @@
&& event->button.x <= width
&& event->button.y <= height)
{
+ gdk_threads_leave ();
(*gdk_env()
[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: peer fixes
PatchSet 5852 Date: 2005/01/13 09:10:23 Author: robilad Branch: HEAD Tag: (none) Log: Resynced with GNU Classpath: peer fixes 2005-01-13 Dalibor Topic <[EMAIL PROTECTED]> Resynced with GNU Classpath. 2005-01-12 Michael Koch <[EMAIL PROTECTED]> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetVisible): Removed setting of gdk_env. 2005-01-12 Thomas Fitzsimmons <[EMAIL PROTECTED]> * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c (mouseWheel): Call XFlush. (keyPress): Likewise. (keyRelease): Likewise. Members: ChangeLog:1.3396->1.3397 libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c:1.1->1.2 libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.10->1.11 Index: kaffe/ChangeLog diff -u kaffe/ChangeLog:1.3396 kaffe/ChangeLog:1.3397 --- kaffe/ChangeLog:1.3396 Thu Jan 13 08:59:51 2005 +++ kaffe/ChangeLog Thu Jan 13 09:10:23 2005 @@ -2,6 +2,23 @@ Resynced with GNU Classpath. + 2005-01-12 Michael Koch <[EMAIL PROTECTED]> + + * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c + (Java_gnu_java_awt_peer_gtk_GtkWindowPeer_nativeSetVisible): + Removed setting of gdk_env. + + 2005-01-12 Thomas Fitzsimmons <[EMAIL PROTECTED]> + + * jni/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c + (mouseWheel): Call XFlush. + (keyPress): Likewise. + (keyRelease): Likewise. + +2005-01-13 Dalibor Topic <[EMAIL PROTECTED]> + + Resynced with GNU Classpath. + 2005-01-11 Michael Koch <[EMAIL PROTECTED]> * javax/swing/UIDefaults.java (UIDefaults): Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c:1.1 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c:1.2 --- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c:1.1 Fri Jan 7 17:54:54 2005 +++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkRobotPeer.c Thu Jan 13 09:10:25 2005 @@ -181,6 +181,7 @@ False, CurrentTime); } + XFlush (xdisplay); gdk_threads_leave (); } @@ -223,6 +224,7 @@ g_free (keymap_keys); + XFlush (xdisplay); gdk_threads_leave (); } @@ -265,6 +267,7 @@ g_free (keymap_keys); + XFlush (xdisplay); gdk_threads_leave (); } Index: kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c diff -u kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.10 kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.11 --- kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c:1.10 Thu Jan 13 08:02:17 2005 +++ kaffe/libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c Thu Jan 13 09:10:26 2005 @@ -225,8 +225,6 @@ gdk_threads_enter (); - gdk_env = env; - if (visible) gtk_widget_show (GTK_WIDGET (ptr)); else ___ kaffe mailing list kaffe@kaffe.org http://kaffe.org/cgi-bin/mailman/listinfo/kaffe
[kaffe] CVS kaffe (robilad): resynced with GNU Classpath: peer fixes and cleanups
PatchSet 5374 Date: 2004/10/27 22:15:40 Author: robilad Branch: HEAD Tag: (none) Log: resynced with GNU Classpath: peer fixes and cleanups 2004-10-27 Dalibor Topic <[EMAIL PROTECTED]> * libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c, libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c, libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c, libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c, libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c, libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c, libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c, libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c, libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c, libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c, libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c, libraries/clib/awt/classpath-gtk/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c, libraries/clib/awt/classpath-gtk/gtk-peer/gtkpeer.h: Resynced with GNU Classpath. 2004-10-27 Mark Wielaard <[EMAIL PROTECTED]> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c (Java_gnu_java_awt_peer_gtk_GdkTextLayout_setText): Installed and and renamed from Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setText. 2004-10-26 Mark Wielaard <[EMAIL PROTECTED]> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkTextLayout.c (Java_gnu_java_awt_peer_gtk_GdkGlyphVector_setText): Removed. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkMainThread.c (init_dpi_conversion_factor): Correct prototype. 2004-10-26 Thomas Fitzsimmons <[EMAIL PROTECTED]> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFramePeer.c (nativeSetIconImage): Rename to nativeSetIconImageFromDecoder. 2004-10-26 Andreas Tobler <[EMAIL PROTECTED]> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GThreadNativeMethodRunner.c (Java_gnu_java_awt_peer_gtk_GThreadNativeMethodRunner_nativeRun): Fix pointer warning. 2004-10-26 Andreas Tobler <[EMAIL PROTECTED]> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkFileDialogPeer.c (Java_gnu_java_awt_peer_gtk_GtkFileDialogPeer_nativeSetFilenameFilter): Fix pointer warning. * native/jni/gtk-peer/gtkpeer.h: Introduce widget_union to fix type punned warnings. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (Java_gnu_java_awt_peer_gtk_GdkGraphics_clearRect): Use widget_union to fix type punned pointer warning. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (pre_event_handler): Likewise. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkWindowPeer.c (window_get_new_state): Introduce unions to fix warnings as above. (window_property_changed_cb): Likewise. (window_active_state_change_cb): Mark unused variables unused. (window_focus_state_change_cb): Likewise. (window_focus_in_cb): Likewise. (window_focus_out_cb): Likewise. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkFontPeer.c (Java_gnu_java_awt_peer_gtk_GdkFontPeer_setFont): Convert PangoFontMap correctly with PANGO_FT2FONT_MAP macro. 2004-10-26 Andreas Tobler <[EMAIL PROTECTED]> * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkTextAreaPeer.c (Java_gnu_java_awt_peer_gtk_GtkTextAreaPeer_create): Use the GTK_TEXT_VIEW macro. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkEvents.c (connect_awt_hook_cb): Mark unused variable unused. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkClipboard.c (selection_get): Do the cast right. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkChoicePeer.c (Java_gnu_java_awt_peer_gtk_GtkChoicePeer_create): According to the gtk API gtk_combo_box_new_text actually returns a GtkWidget. Remove unused var menu. (selection_changed): Remove unused value. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GtkButtonPeer.c (Java_gnu_java_awt_peer_gtk_GtkButtonPeer_setNativeBounds): Fix pointer warning with using an intermediate variable. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkPixbufDecoder.c (area_updated): Fix unused var warning for BE archs. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphics.c (Java_gnu_java_awt_peer_gtk_GdkGraphics_connectSignals): Remove unused var. (realize_cb): Mark unused variable unused. * native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGlyphVector.c (
