# HG changeset patch # User dav # Date 1223455817 -14400 # Node ID 07500c30ab46a2d70d8a49a4b9cd6058e56047f9 # Parent 09060e8ca52cf03f395b99238271ad0af7f9a9a7 5076635: Double click speed is not honored in KDE linux Reviewed-by: art, dcherepanov diff -r 09060e8ca52c -r 07500c30ab46 jdk/src/solaris/classes/sun/awt/X11/XToolkit.java --- a/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Fri Jul 25 15:19:11 2008 +0400 +++ b/jdk/src/solaris/classes/sun/awt/X11/XToolkit.java Wed Oct 08 12:50:17 2008 +0400 @@ -61,6 +61,10 @@ private static Logger keyEventLog = Logger.getLogger("sun.awt.X11.kye.XToolkit"); private static final Logger backingStoreLog = Logger.getLogger("sun.awt.X11.backingStore.XToolkit"); + //There is 400 ms is set by default on Windows and 500 by default on KDE and GNOME. + //We use the same hardcoded constant. + private final static int AWT_MULTICLICK_DEFAULT_TIME = 500; + static final boolean PRIMARY_LOOP = false; static final boolean SECONDARY_LOOP = true; @@ -1211,7 +1215,6 @@ String multiclick_time_query = XlibWrapper.XGetDefault(XToolkit.getDisplay(), "*", "multiClickTime"); if (multiclick_time_query != null) { awt_multiclick_time = (int)Long.parseLong(multiclick_time_query); - // awt_multiclick_time = XtGetMultiClickTime(awt_display); } else { multiclick_time_query = XlibWrapper.XGetDefault(XToolkit.getDisplay(), "OpenWindows", "MultiClickTimeout"); @@ -1221,20 +1224,19 @@ milliseconds */ awt_multiclick_time = (int)Long.parseLong(multiclick_time_query) * 100; } else { - awt_multiclick_time = 200; - // awt_multiclick_time = XtGetMultiClickTime(awt_display); + awt_multiclick_time = AWT_MULTICLICK_DEFAULT_TIME; } } } catch (NumberFormatException nf) { - awt_multiclick_time = 200; + awt_multiclick_time = AWT_MULTICLICK_DEFAULT_TIME; } catch (NullPointerException npe) { - awt_multiclick_time = 200; + awt_multiclick_time = AWT_MULTICLICK_DEFAULT_TIME; } } finally { awtUnlock(); } if (awt_multiclick_time == 0) { - awt_multiclick_time = 200; + awt_multiclick_time = AWT_MULTICLICK_DEFAULT_TIME; } } diff -r 09060e8ca52c -r 07500c30ab46 jdk/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/java/awt/Mouse/MaximizedFrameTest/MaximizedFrameTest.html Wed Oct 08 12:50:17 2008 +0400 @@ -0,0 +1,42 @@ +/* + * Copyright 2008 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. + * + * 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. + */ + + +
+This is an AUTOMATIC test, simply wait for completion
+ + + +