diff -r fd16c54261b3 -r 90ce3da70b43 jdk/src/solaris/classes/sun/awt/X11/XMouseInfoPeer.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/jdk/src/solaris/classes/sun/awt/X11/XMouseInfoPeer.java	Sat Dec 01 00:00:00 2007 +0000
@@ -0,0 +1,108 @@
+/*
+ * Copyright 2003-2006 Sun Microsystems, Inc.  All Rights Reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.  Sun designates this
+ * particular file as subject to the "Classpath" exception as provided
+ * by Sun in the LICENSE file that accompanied this code.
+ *
+ * This code 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
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+
+package sun.awt.X11;
+
+import java.awt.Point;
+import java.awt.Window;
+import java.awt.GraphicsEnvironment;
+import java.awt.GraphicsConfiguration;
+import java.awt.GraphicsDevice;
+import java.awt.peer.MouseInfoPeer;
+
+public class XMouseInfoPeer implements MouseInfoPeer {
+
+    /**
+     * Package-private constructor to prevent instantiation.
+     */
+    XMouseInfoPeer() {
+    }
+
+    public int fillPointWithCoords(Point point) {
+        long display = XToolkit.getDisplay();
+        GraphicsEnvironment ge = GraphicsEnvironment.
+                                     getLocalGraphicsEnvironment();
+        GraphicsDevice[] gds = ge.getScreenDevices();
+        int gdslen = gds.length;
+
+        XToolkit.awtLock();
+        try {
+            for (int i = 0; i < gdslen; i++) {
+                long screenRoot = XlibWrapper.RootWindow(display, i);
+                boolean pointerFound = XlibWrapper.XQueryPointer(
+                                           display, screenRoot,
+                                           XlibWrapper.larg1,  // root_return
+                                           XlibWrapper.larg2,  // child_return
+                                           XlibWrapper.larg3,  // xr_return
+                                           XlibWrapper.larg4,  // yr_return
+                                           XlibWrapper.larg5,  // xw_return
+                                           XlibWrapper.larg6,  // yw_return
+                                           XlibWrapper.larg7); // mask_return
+                if (pointerFound) {
+                    point.x = Native.getInt(XlibWrapper.larg3);
+                    point.y = Native.getInt(XlibWrapper.larg4);
+                    return i;
+                }
+            }
+        } finally {
+            XToolkit.awtUnlock();
+        }
+
+        // this should never happen
+        assert false : "No pointer found in the system.";
+        return 0;
+    }
+
+    public boolean isWindowUnderMouse(Window w) {
+
+        long display = XToolkit.getDisplay();
+
+        // java.awt.Component.findUnderMouseInWindow checks that
+        // the peer is non-null by checking that the component
+        // is showing.
+
+        long contentWindow = ((XWindow)w.getPeer()).getContentWindow();
+        long parent = XlibUtil.getParentWindow(contentWindow);
+
+        XToolkit.awtLock();
+        try
+        {
+            boolean windowOnTheSameScreen = XlibWrapper.XQueryPointer(display, parent,
+                                  XlibWrapper.larg1, // root_return
+                                  XlibWrapper.larg8, // child_return
+                                  XlibWrapper.larg3, // root_x_return
+                                  XlibWrapper.larg4, // root_y_return
+                                  XlibWrapper.larg5, // win_x_return
+                                  XlibWrapper.larg6, // win_y_return
+                                  XlibWrapper.larg7); //  mask_return
+            long siblingWindow = Native.getWindow(XlibWrapper.larg8);
+            return (siblingWindow == contentWindow && windowOnTheSameScreen);
+        }
+        finally
+        {
+            XToolkit.awtUnlock();
+        }
+    }
+}