From 3898fe8e7cdf79c37a476c2169b4386f33a9bee3 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Wed, 5 Dec 2007 18:04:44 +0000 Subject: 2007-12-05 Thomas Fitzsimmons * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java, native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c (isWindowUnderMouse): New method. * include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h: Regenerate. * gnu/java/awt/peer/gtk/GtkComponentPeer.java (getLocationOnScreen): Move WindowPeer section to... * gnu/java/awt/peer/gtk/GtkWindowPeer.java (getLocationOnScreen): New method. * gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java (isWindowUnderMouse): Implement. * java/awt/Component.java (getMousePosition): New method. (getMousePositionHelper): Likewise. (mouseOverComponent): Likewise. * java/awt/Container.java (getMousePosition): New method. (mouseOverComponent): Likewise. * classpath/lib/java/awt/Component.class, classpath/lib/java/awt/Component$BltBufferStrategy.class, classpath/lib/java/awt/Container$GfxPaintAllVisitor.class, classpath/lib/java/awt/Component$AccessibleAWTComponent $AccessibleAWTFocusHandler.class, classpath/lib/java/awt/Component$FlipBufferStrategy.class, classpath/lib/java/awt/Container$GfxVisitor.class, classpath/lib/java/awt/Component$AccessibleAWTComponent $AccessibleAWTComponentHandler.class, classpath/lib/java/awt/Container$AccessibleAWTContainer $AccessibleContainerHandler.class, classpath/lib/java/awt/Container.class, classpath/lib/java/awt/Container$AccessibleAWTContainer.class, classpath/lib/java/awt/Container$GfxPrintAllVisitor.class, classpath/lib/java/awt/Component$AccessibleAWTComponent.class, classpath/lib/java/awt/Container$GfxPaintVisitor.class, classpath/lib/java/awt/Container$GfxPrintVisitor.class, classpath/lib/java/awt/Component$HeavyweightInLightweightListener.class, classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer.class, classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class, classpath/lib/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.class, classpath/lib/gnu/java/awt/peer/gtk/GtkWindowPeer.class, classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer $RepaintTimerTask.class: Regenerate. 2007-12-05 Thomas Fitzsimmons * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.h: Regenerate. * gnu/java/awt/peer/gtk/GtkWindowPeer.h: Likewise. * java/awt/Component.h: Likewise. * java/awt/Container.h: Likewise. From-SVN: r130627 --- libjava/classpath/ChangeLog | 44 ++++++++++++++++ .../java/awt/peer/gtk/GdkGraphicsEnvironment.java | 1 + .../gnu/java/awt/peer/gtk/GtkComponentPeer.java | 6 +-- .../gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java | 14 +----- .../gnu/java/awt/peer/gtk/GtkWindowPeer.java | 8 +++ .../gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h | 5 +- libjava/classpath/java/awt/Component.java | 56 +++++++++++++++++++++ libjava/classpath/java/awt/Container.java | 27 ++++++++++ .../java/awt/peer/gtk/GdkGraphicsEnvironment.class | Bin 3454 -> 3526 bytes .../gtk/GtkComponentPeer$RepaintTimerTask.class | Bin 1498 -> 1498 bytes .../gnu/java/awt/peer/gtk/GtkComponentPeer.class | Bin 18688 -> 18625 bytes .../gnu/java/awt/peer/gtk/GtkMouseInfoPeer.class | Bin 1504 -> 1154 bytes .../lib/gnu/java/awt/peer/gtk/GtkWindowPeer.class | Bin 8207 -> 8439 bytes ...WTComponent$AccessibleAWTComponentHandler.class | Bin 1391 -> 1391 bytes ...bleAWTComponent$AccessibleAWTFocusHandler.class | Bin 1188 -> 1188 bytes .../awt/Component$AccessibleAWTComponent.class | Bin 7344 -> 7344 bytes .../lib/java/awt/Component$BltBufferStrategy.class | Bin 3283 -> 3283 bytes .../java/awt/Component$FlipBufferStrategy.class | Bin 3475 -> 3475 bytes ...omponent$HeavyweightInLightweightListener.class | Bin 1500 -> 1500 bytes libjava/classpath/lib/java/awt/Component.class | Bin 57212 -> 58484 bytes ...leAWTContainer$AccessibleContainerHandler.class | Bin 1195 -> 1195 bytes .../awt/Container$AccessibleAWTContainer.class | Bin 2043 -> 2043 bytes .../java/awt/Container$GfxPaintAllVisitor.class | Bin 822 -> 822 bytes .../lib/java/awt/Container$GfxPaintVisitor.class | Bin 810 -> 810 bytes .../java/awt/Container$GfxPrintAllVisitor.class | Bin 822 -> 822 bytes .../lib/java/awt/Container$GfxPrintVisitor.class | Bin 810 -> 810 bytes .../lib/java/awt/Container$GfxVisitor.class | Bin 421 -> 421 bytes libjava/classpath/lib/java/awt/Container.class | Bin 25778 -> 26135 bytes .../gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c | 34 +++++++++++++ 29 files changed, 176 insertions(+), 19 deletions(-) (limited to 'libjava/classpath') diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index c24ad7b..4086a23 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -1,3 +1,47 @@ +2007-12-05 Thomas Fitzsimmons + + * gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java, + native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c + (isWindowUnderMouse): New method. + * include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h: + Regenerate. + * gnu/java/awt/peer/gtk/GtkComponentPeer.java + (getLocationOnScreen): Move WindowPeer section to... + * gnu/java/awt/peer/gtk/GtkWindowPeer.java (getLocationOnScreen): + New method. + * gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java + (isWindowUnderMouse): Implement. + * java/awt/Component.java (getMousePosition): New method. + (getMousePositionHelper): Likewise. + (mouseOverComponent): Likewise. + * java/awt/Container.java (getMousePosition): New method. + (mouseOverComponent): Likewise. + * classpath/lib/java/awt/Component.class, + classpath/lib/java/awt/Component$BltBufferStrategy.class, + classpath/lib/java/awt/Container$GfxPaintAllVisitor.class, + classpath/lib/java/awt/Component$AccessibleAWTComponent + $AccessibleAWTFocusHandler.class, + classpath/lib/java/awt/Component$FlipBufferStrategy.class, + classpath/lib/java/awt/Container$GfxVisitor.class, + classpath/lib/java/awt/Component$AccessibleAWTComponent + $AccessibleAWTComponentHandler.class, + classpath/lib/java/awt/Container$AccessibleAWTContainer + $AccessibleContainerHandler.class, + classpath/lib/java/awt/Container.class, + classpath/lib/java/awt/Container$AccessibleAWTContainer.class, + classpath/lib/java/awt/Container$GfxPrintAllVisitor.class, + classpath/lib/java/awt/Component$AccessibleAWTComponent.class, + classpath/lib/java/awt/Container$GfxPaintVisitor.class, + classpath/lib/java/awt/Container$GfxPrintVisitor.class, + classpath/lib/java/awt/Component$HeavyweightInLightweightListener.class, + classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer.class, + classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class, + classpath/lib/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.class, + classpath/lib/gnu/java/awt/peer/gtk/GtkWindowPeer.class, + classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer + $RepaintTimerTask.class: + Regenerate. + 2007-10-01 Alexandre Oliva * scripts/check_jni_methods.sh: Don't depend on diff -b ignoring diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java b/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java index 67040b8..d06af84 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.java @@ -155,6 +155,7 @@ public class GdkGraphicsEnvironment extends ClasspathGraphicsEnvironment * Used by GtkMouseInfoPeer. */ native int[] getMouseCoordinates(); + native boolean isWindowUnderMouse(GtkWindowPeer windowPeer); public WritableRaster createRaster(ColorModel cm, SampleModel sm) { diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java index 16c20ee..f658c17 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkComponentPeer.java @@ -76,7 +76,6 @@ import java.awt.image.VolatileImage; import java.awt.peer.ComponentPeer; import java.awt.peer.ContainerPeer; import java.awt.peer.LightweightPeer; -import java.awt.peer.WindowPeer; import java.util.Timer; import java.util.TimerTask; @@ -251,10 +250,7 @@ public class GtkComponentPeer extends GtkGenericPeer public Point getLocationOnScreen () { int point[] = new int[2]; - if( this instanceof WindowPeer ) - gtkWindowGetLocationOnScreen (point); - else - gtkWidgetGetLocationOnScreen (point); + gtkWidgetGetLocationOnScreen (point); return new Point (point[0], point[1]); } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java index 7aea509..7407744 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.java @@ -60,17 +60,7 @@ public class GtkMouseInfoPeer implements MouseInfoPeer public boolean isWindowUnderMouse(Window w) { - int[] coords = gde.getMouseCoordinates(); - GraphicsDevice[] gds = gde.getScreenDevices(); - - // Check if the screen of the Window and the cursor match - if( gds[ coords[0] ] != w.getGraphicsConfiguration().getDevice() ) - return false; - - // Return the bounds-check. - Point p = w.getLocationOnScreen(); - return (coords[1] >= p.x && coords[1] < p.x + w.getWidth() && - coords[2] >= p.y && coords[2] < p.y + w.getHeight() ); - } + return gde.isWindowUnderMouse((GtkWindowPeer) w.getPeer()); + } } diff --git a/libjava/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java b/libjava/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java index d805415..5dc4b2e 100644 --- a/libjava/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java +++ b/libjava/classpath/gnu/java/awt/peer/gtk/GtkWindowPeer.java @@ -45,6 +45,7 @@ import java.awt.Font; import java.awt.Frame; import java.awt.Graphics; import java.awt.KeyboardFocusManager; +import java.awt.Point; import java.awt.Rectangle; import java.awt.Window; import java.awt.event.ComponentEvent; @@ -392,6 +393,13 @@ public class GtkWindowPeer extends GtkContainerPeer clickCount, popupTrigger); } + public Point getLocationOnScreen() + { + int point[] = new int[2]; + gtkWindowGetLocationOnScreen(point); + return new Point(point[0], point[1]); + } + // We override this to keep it in sync with our internal // representation. public Rectangle getBounds() diff --git a/libjava/classpath/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h b/libjava/classpath/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h index aa0bd01..de83f57 100644 --- a/libjava/classpath/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h +++ b/libjava/classpath/include/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.h @@ -1,10 +1,10 @@ /* DO NOT EDIT THIS FILE - it is machine generated */ +#include + #ifndef __gnu_java_awt_peer_gtk_GdkGraphicsEnvironment__ #define __gnu_java_awt_peer_gtk_GdkGraphicsEnvironment__ -#include - #ifdef __cplusplus extern "C" { @@ -17,6 +17,7 @@ JNIEXPORT jobject JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nati JNIEXPORT jint JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeGetNumFontFamilies (JNIEnv *env, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_nativeGetFontFamilies (JNIEnv *env, jobject, jobjectArray); JNIEXPORT jintArray JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_getMouseCoordinates (JNIEnv *env, jobject); +JNIEXPORT jboolean JNICALL Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_isWindowUnderMouse (JNIEnv *env, jobject, jobject); #ifdef __cplusplus } diff --git a/libjava/classpath/java/awt/Component.java b/libjava/classpath/java/awt/Component.java index f8bed17..fe4fb9b 100644 --- a/libjava/classpath/java/awt/Component.java +++ b/libjava/classpath/java/awt/Component.java @@ -5834,6 +5834,62 @@ p *
  • the set of backward traversal keys } /** + * Returns the mouse pointer position relative to this Component's + * top-left corner. + * + * @return relative mouse pointer position + * + * @throws HeadlessException if in a headless environment + */ + public Point getMousePosition() throws HeadlessException + { + return getMousePositionHelper(true); + } + + Point getMousePositionHelper(boolean allowChildren) throws HeadlessException + { + if (GraphicsEnvironment.isHeadless()) + throw new HeadlessException("can't get mouse position" + + " in headless environment"); + if (!isShowing()) + return null; + + Component parent = this; + int windowRelativeXOffset = 0; + int windowRelativeYOffset = 0; + while (parent != null && !(parent instanceof Window)) + { + windowRelativeXOffset += parent.getX(); + windowRelativeYOffset += parent.getY(); + parent = parent.getParent(); + } + if (parent == null) + return null; + + Window window = (Window) parent; + if (!Toolkit.getDefaultToolkit() + .getMouseInfoPeer().isWindowUnderMouse(window)) + return null; + + PointerInfo info = MouseInfo.getPointerInfo(); + Point mouseLocation = info.getLocation(); + Point windowLocation = window.getLocationOnScreen(); + + int x = mouseLocation.x - windowLocation.x; + int y = mouseLocation.y - windowLocation.y; + + if (!mouseOverComponent(window.getComponentAt(x, y), allowChildren)) + return null; + + return new Point(x - windowRelativeXOffset, y - windowRelativeYOffset); + } + + boolean mouseOverComponent(Component component, boolean allowChildren) + { + return component == this; + } + + /** * This method is used to implement transferFocus(). CHILD is the child * making the request. This is overridden by Container; when called for an * ordinary component there is no child and so we always return null. diff --git a/libjava/classpath/java/awt/Container.java b/libjava/classpath/java/awt/Container.java index 83d9f7b..e7622f2 100644 --- a/libjava/classpath/java/awt/Container.java +++ b/libjava/classpath/java/awt/Container.java @@ -1098,6 +1098,33 @@ public class Container extends Component } /** + * Returns the mouse pointer position relative to this Container's + * top-left corner. If allowChildren is false, the mouse pointer + * must be directly over this container. If allowChildren is true, + * the mouse pointer may be over this container or any of its + * descendents. + * + * @param allowChildren true to allow descendents, false if pointer + * must be directly over Container. + * + * @return relative mouse pointer position + * + * @throws HeadlessException if in a headless environment + */ + public Point getMousePosition(boolean allowChildren) throws HeadlessException + { + return super.getMousePositionHelper(allowChildren); + } + + boolean mouseOverComponent(Component component, boolean allowChildren) + { + if (allowChildren) + return isAncestorOf(component); + else + return component == this; + } + + /** * Returns the component located at the specified point. This is done * by checking whether or not a child component claims to contain this * point. The first child component that does is returned. If no diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class index dfb28e4..6e3a11a 100644 Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GdkGraphicsEnvironment.class differ diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer$RepaintTimerTask.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer$RepaintTimerTask.class index 097713c..abf76c0 100644 Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer$RepaintTimerTask.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer$RepaintTimerTask.class differ diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer.class index 9627e77..45f9c47 100644 Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkComponentPeer.class differ diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.class index 35c5677..fc028c2 100644 Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkMouseInfoPeer.class differ diff --git a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkWindowPeer.class b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkWindowPeer.class index 53b831d..a348cf0 100644 Binary files a/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkWindowPeer.class and b/libjava/classpath/lib/gnu/java/awt/peer/gtk/GtkWindowPeer.class differ diff --git a/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent$AccessibleAWTComponentHandler.class b/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent$AccessibleAWTComponentHandler.class index f48c922..6c5bdeb 100644 Binary files a/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent$AccessibleAWTComponentHandler.class and b/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent$AccessibleAWTComponentHandler.class differ diff --git a/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent$AccessibleAWTFocusHandler.class b/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent$AccessibleAWTFocusHandler.class index 029692c..e2e3e87 100644 Binary files a/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent$AccessibleAWTFocusHandler.class and b/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent$AccessibleAWTFocusHandler.class differ diff --git a/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent.class b/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent.class index 010706e..2253232 100644 Binary files a/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent.class and b/libjava/classpath/lib/java/awt/Component$AccessibleAWTComponent.class differ diff --git a/libjava/classpath/lib/java/awt/Component$BltBufferStrategy.class b/libjava/classpath/lib/java/awt/Component$BltBufferStrategy.class index 74be60b..e796a03 100644 Binary files a/libjava/classpath/lib/java/awt/Component$BltBufferStrategy.class and b/libjava/classpath/lib/java/awt/Component$BltBufferStrategy.class differ diff --git a/libjava/classpath/lib/java/awt/Component$FlipBufferStrategy.class b/libjava/classpath/lib/java/awt/Component$FlipBufferStrategy.class index 16b0245..f0857dc 100644 Binary files a/libjava/classpath/lib/java/awt/Component$FlipBufferStrategy.class and b/libjava/classpath/lib/java/awt/Component$FlipBufferStrategy.class differ diff --git a/libjava/classpath/lib/java/awt/Component$HeavyweightInLightweightListener.class b/libjava/classpath/lib/java/awt/Component$HeavyweightInLightweightListener.class index 5ab9670..60503e6 100644 Binary files a/libjava/classpath/lib/java/awt/Component$HeavyweightInLightweightListener.class and b/libjava/classpath/lib/java/awt/Component$HeavyweightInLightweightListener.class differ diff --git a/libjava/classpath/lib/java/awt/Component.class b/libjava/classpath/lib/java/awt/Component.class index 6adbf61..90b546c 100644 Binary files a/libjava/classpath/lib/java/awt/Component.class and b/libjava/classpath/lib/java/awt/Component.class differ diff --git a/libjava/classpath/lib/java/awt/Container$AccessibleAWTContainer$AccessibleContainerHandler.class b/libjava/classpath/lib/java/awt/Container$AccessibleAWTContainer$AccessibleContainerHandler.class index a07e427..5f045ab 100644 Binary files a/libjava/classpath/lib/java/awt/Container$AccessibleAWTContainer$AccessibleContainerHandler.class and b/libjava/classpath/lib/java/awt/Container$AccessibleAWTContainer$AccessibleContainerHandler.class differ diff --git a/libjava/classpath/lib/java/awt/Container$AccessibleAWTContainer.class b/libjava/classpath/lib/java/awt/Container$AccessibleAWTContainer.class index 18f7901..167660a 100644 Binary files a/libjava/classpath/lib/java/awt/Container$AccessibleAWTContainer.class and b/libjava/classpath/lib/java/awt/Container$AccessibleAWTContainer.class differ diff --git a/libjava/classpath/lib/java/awt/Container$GfxPaintAllVisitor.class b/libjava/classpath/lib/java/awt/Container$GfxPaintAllVisitor.class index fea586b..cd7fd4c 100644 Binary files a/libjava/classpath/lib/java/awt/Container$GfxPaintAllVisitor.class and b/libjava/classpath/lib/java/awt/Container$GfxPaintAllVisitor.class differ diff --git a/libjava/classpath/lib/java/awt/Container$GfxPaintVisitor.class b/libjava/classpath/lib/java/awt/Container$GfxPaintVisitor.class index e5a54f8..791d857 100644 Binary files a/libjava/classpath/lib/java/awt/Container$GfxPaintVisitor.class and b/libjava/classpath/lib/java/awt/Container$GfxPaintVisitor.class differ diff --git a/libjava/classpath/lib/java/awt/Container$GfxPrintAllVisitor.class b/libjava/classpath/lib/java/awt/Container$GfxPrintAllVisitor.class index 3c741e9..0876318 100644 Binary files a/libjava/classpath/lib/java/awt/Container$GfxPrintAllVisitor.class and b/libjava/classpath/lib/java/awt/Container$GfxPrintAllVisitor.class differ diff --git a/libjava/classpath/lib/java/awt/Container$GfxPrintVisitor.class b/libjava/classpath/lib/java/awt/Container$GfxPrintVisitor.class index fe7b326..c8557e9 100644 Binary files a/libjava/classpath/lib/java/awt/Container$GfxPrintVisitor.class and b/libjava/classpath/lib/java/awt/Container$GfxPrintVisitor.class differ diff --git a/libjava/classpath/lib/java/awt/Container$GfxVisitor.class b/libjava/classpath/lib/java/awt/Container$GfxVisitor.class index f9f85ae..9fd2811 100644 Binary files a/libjava/classpath/lib/java/awt/Container$GfxVisitor.class and b/libjava/classpath/lib/java/awt/Container$GfxVisitor.class differ diff --git a/libjava/classpath/lib/java/awt/Container.class b/libjava/classpath/lib/java/awt/Container.class index 1154af9..f6b029e 100644 Binary files a/libjava/classpath/lib/java/awt/Container.class and b/libjava/classpath/lib/java/awt/Container.class differ diff --git a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c index 1c88d1b..6066a6b 100644 --- a/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c +++ b/libjava/classpath/native/jni/gtk-peer/gnu_java_awt_peer_gtk_GdkGraphicsEnvironment.c @@ -263,3 +263,37 @@ Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_getMouseCoordinates return retArray; } + +JNIEXPORT jboolean JNICALL +Java_gnu_java_awt_peer_gtk_GdkGraphicsEnvironment_isWindowUnderMouse +(JNIEnv *env, jobject obj, jobject windowPeer) +{ + GdkDisplay *display = NULL; + gint x = 0; + gint y = 0; + GtkWidget *windowToTest = NULL; + GdkWindow *windowAtPointer = NULL; + jboolean retVal = JNI_FALSE; + + display = (GdkDisplay *) gtkpeer_get_display (env, obj); + g_assert (display != NULL); + + windowToTest = (GtkWidget *) gtkpeer_get_widget (env, windowPeer); + + gdk_threads_enter (); + + windowAtPointer = gdk_display_get_window_at_pointer (display, &x, &y); + + while (windowAtPointer + && windowAtPointer != windowToTest->window) + windowAtPointer = gdk_window_get_parent (windowAtPointer); + + gdk_threads_leave (); + + if (windowAtPointer) + retVal = JNI_TRUE; + else + retVal = JNI_FALSE; + + return retVal; +} -- cgit v1.1