--- a/jdk/src/solaris/classes/sun/awt/X11/XlibWrapper.java Thu Mar 26 14:38:46 2009 +0300
+++ b/jdk/src/solaris/classes/sun/awt/X11/XlibWrapper.java Fri Mar 27 12:01:24 2009 +0300
@@ -1,5 +1,5 @@
/*
- * Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved.
+ * Copyright 2002-2009 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
@@ -492,6 +492,21 @@
static native int XKeysymToKeycode(long display, long keysym);
+ // xkb-related
+ static native int XkbGetEffectiveGroup(long display);
+ static native long XkbKeycodeToKeysym(long display, int keycode, int group, int level);
+ static native void XkbSelectEvents(long display, long device, long bits_to_change, long values_for_bits);
+ static native void XkbSelectEventDetails(long display, long device, long event_type,
+ long bits_to_change, long values_for_bits);
+ static native boolean XkbQueryExtension(long display, long opcode_rtrn, long event_rtrn,
+ long error_rtrn, long major_in_out, long minor_in_out);
+ static native boolean XkbLibraryVersion(long lib_major_in_out, long lib_minor_in_out);
+ static native long XkbGetMap(long display, long which, long device_spec);
+ static native long XkbGetUpdatedMap(long display, long which, long xkb);
+ static native void XkbFreeKeyboard(long xkb, long which, boolean free_all);
+ static native boolean XkbTranslateKeyCode(long xkb, int keycode, long mods, long mods_rtrn, long keysym_rtrn);
+
+
static native void XConvertCase(long keysym,
long keysym_lowercase,
long keysym_uppercase);
@@ -617,6 +632,15 @@
}
return buf.toString();
}
+ static String getEventToString( int type ) {
+ if( (type >= 0) && (type < eventToString.length)) {
+ return eventToString[type];
+ }else if( type == XToolkit.getXKBBaseEventCode() ) {
+ //XXX TODO various xkb types
+ return "XkbEvent";
+ }
+ return eventToString[0];
+ }
private static boolean getBuildInternal() {
String javaVersion = XToolkit.getSystemProperty("java.version");