. Fix key recognition problems when NumLock is on.

PR:		85997
Submitted by:	Kurt Miller <lists@intricatesoftware.com>

4 files changed, 120 insertions, 0 deletions

diff --git a/java/jdk15/files/patch-j2se::awt::canvas.c b/java/jdk15/files/patch-j2se::awt::canvas.c
new file mode 100644
index 000000000000..cf69af4aa14f
--- /dev/null
+++ b/java/jdk15/files/patch-j2se::awt::canvas.c
@@ -0,0 +1,32 @@
+$FreeBSD$
+
+--- ../../j2se/src/solaris/native/sun/awt/canvas.c	10 Jan 2005 15:09:40 -0000	1.2
++++ ../../j2se/src/solaris/native/sun/awt/canvas.c	19 Apr 2006 22:21:51 -0000
+@@ -258,10 +258,10 @@
+     {java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
+ 
+     /* Keypad equivalents of Triangular Navigation Block */
+-    {java_awt_event_KeyEvent_VK_KP_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+-    {java_awt_event_KeyEvent_VK_KP_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+-    {java_awt_event_KeyEvent_VK_KP_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+-    {java_awt_event_KeyEvent_VK_KP_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+ 
+     /* Other vendor-specific Triangular Navigation Block */
+     {java_awt_event_KeyEvent_VK_LEFT, osfXK_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
+@@ -1349,7 +1349,7 @@
+ {
+     KeySym originalKeysym = *keysym;
+ 
+-#if !defined(__linux__) 	// XXXBSD: applies to FreeBSD?
++#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
+     /* The following code on Linux will cause the keypad keys
+      * not to echo on JTextField when the NumLock is on. The
+      * keysyms will be 0, because the last parameter 2 is not defined.
+Index: j2se/src/solaris/native/sun/xawt/XWindow.c
+===================================================================
+RCS file: /home/Java/CVS/JDK2/javasrc_1_5_scsl/j2se/src/solaris/native/sun/xawt/XWindow.c,v
+retrieving revision 1.1.1.1
diff --git a/java/jdk15/files/patch-j2se::xawt::XWindow.c b/java/jdk15/files/patch-j2se::xawt::XWindow.c
new file mode 100644
index 000000000000..6060511e8263
--- /dev/null
+++ b/java/jdk15/files/patch-j2se::xawt::XWindow.c
@@ -0,0 +1,28 @@
+$FreeBSD$
+
+--- ../../j2se/src/solaris/native/sun/xawt/XWindow.c	8 Nov 2004 22:27:40 -0000	1.1.1.1
++++ ../../j2se/src/solaris/native/sun/xawt/XWindow.c	19 Apr 2006 22:21:51 -0000
+@@ -204,10 +204,10 @@
+     {java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
+ 
+     /* Keypad equivalents of Triangular Navigation Block */
+-    {java_awt_event_KeyEvent_VK_KP_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+-    {java_awt_event_KeyEvent_VK_KP_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+-    {java_awt_event_KeyEvent_VK_KP_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+-    {java_awt_event_KeyEvent_VK_KP_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+ 
+     /* Other vendor-specific Triangular Navigation Block */
+     {java_awt_event_KeyEvent_VK_LEFT, osfXK_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
+@@ -742,7 +742,7 @@
+ {
+     KeySym originalKeysym = *keysym;
+ 
+-#ifndef __linux__
++#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
+     /* The following code on Linux will cause the keypad keys
+      * not to echo on JTextField when the NumLock is on. The
+      * keysyms will be 0, because the last parameter 2 is not defined.
diff --git a/java/jdk16/files/patch-j2se::awt::canvas.c b/java/jdk16/files/patch-j2se::awt::canvas.c
new file mode 100644
index 000000000000..cf69af4aa14f
--- /dev/null
+++ b/java/jdk16/files/patch-j2se::awt::canvas.c
@@ -0,0 +1,32 @@
+$FreeBSD$
+
+--- ../../j2se/src/solaris/native/sun/awt/canvas.c	10 Jan 2005 15:09:40 -0000	1.2
++++ ../../j2se/src/solaris/native/sun/awt/canvas.c	19 Apr 2006 22:21:51 -0000
+@@ -258,10 +258,10 @@
+     {java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
+ 
+     /* Keypad equivalents of Triangular Navigation Block */
+-    {java_awt_event_KeyEvent_VK_KP_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+-    {java_awt_event_KeyEvent_VK_KP_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+-    {java_awt_event_KeyEvent_VK_KP_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+-    {java_awt_event_KeyEvent_VK_KP_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+ 
+     /* Other vendor-specific Triangular Navigation Block */
+     {java_awt_event_KeyEvent_VK_LEFT, osfXK_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
+@@ -1349,7 +1349,7 @@
+ {
+     KeySym originalKeysym = *keysym;
+ 
+-#if !defined(__linux__) 	// XXXBSD: applies to FreeBSD?
++#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
+     /* The following code on Linux will cause the keypad keys
+      * not to echo on JTextField when the NumLock is on. The
+      * keysyms will be 0, because the last parameter 2 is not defined.
+Index: j2se/src/solaris/native/sun/xawt/XWindow.c
+===================================================================
+RCS file: /home/Java/CVS/JDK2/javasrc_1_5_scsl/j2se/src/solaris/native/sun/xawt/XWindow.c,v
+retrieving revision 1.1.1.1
diff --git a/java/jdk16/files/patch-j2se::xawt::XWindow.c b/java/jdk16/files/patch-j2se::xawt::XWindow.c
new file mode 100644
index 000000000000..6060511e8263
--- /dev/null
+++ b/java/jdk16/files/patch-j2se::xawt::XWindow.c
@@ -0,0 +1,28 @@
+$FreeBSD$
+
+--- ../../j2se/src/solaris/native/sun/xawt/XWindow.c	8 Nov 2004 22:27:40 -0000	1.1.1.1
++++ ../../j2se/src/solaris/native/sun/xawt/XWindow.c	19 Apr 2006 22:21:51 -0000
+@@ -204,10 +204,10 @@
+     {java_awt_event_KeyEvent_VK_DOWN, XK_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
+ 
+     /* Keypad equivalents of Triangular Navigation Block */
+-    {java_awt_event_KeyEvent_VK_KP_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+-    {java_awt_event_KeyEvent_VK_KP_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+-    {java_awt_event_KeyEvent_VK_KP_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+-    {java_awt_event_KeyEvent_VK_KP_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_LEFT, XK_KP_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_UP, XK_KP_Up, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_RIGHT, XK_KP_Right, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
++    {java_awt_event_KeyEvent_VK_DOWN, XK_KP_Down, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_NUMPAD},
+ 
+     /* Other vendor-specific Triangular Navigation Block */
+     {java_awt_event_KeyEvent_VK_LEFT, osfXK_Left, FALSE, java_awt_event_KeyEvent_KEY_LOCATION_STANDARD},
+@@ -742,7 +742,7 @@
+ {
+     KeySym originalKeysym = *keysym;
+ 
+-#ifndef __linux__
++#if !defined(__linux__) && !defined(_ALLBSD_SOURCE)
+     /* The following code on Linux will cause the keypad keys
+      * not to echo on JTextField when the NumLock is on. The
+      * keysyms will be 0, because the last parameter 2 is not defined.