6240872 Nevada Build 10 Belgian USB Type 6 keyboard on sparc is not functioning

6333981 Unable to switch to Turkish keyboard on x86+Xsun server

5 files changed, 275 insertions, 12 deletions

diff --git a/usr/src/cmd/loadkeys/set_keyboard_layout b/usr/src/cmd/loadkeys/set_keyboard_layout
index c544137b53..cc36d7ba22 100644
--- a/usr/src/cmd/loadkeys/set_keyboard_layout
+++ b/usr/src/cmd/loadkeys/set_keyboard_layout
@@ -3,9 +3,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,6 @@
 #
 # CDDL HEADER END
 #
-#
 #pragma ident	"%Z%%M%	%I%	%E% SMI"
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
@@ -63,6 +61,8 @@ case "$KBD_TYPE" in
 	"Swiss-German" ) 	LAYOUT=28 ;;
 	"Taiwanese" )		LAYOUT=30 ;;
 	"Turkish" )		LAYOUT= ;;
+	"TurkishQ" )		LAYOUT=31 ;;
+	"TurkishF" )		LAYOUT=35 ;;
 	"UK-English" )		LAYOUT=32 ;;
 	"US-English" )		LAYOUT=33 ;;
 	"US-English(Microsoft-Natural)" ) LAYOUT=33 ;;
diff --git a/usr/src/cmd/loadkeys/type_6/Makefile b/usr/src/cmd/loadkeys/type_6/Makefile
index 81a8baa044..0a41d0398b 100644
--- a/usr/src/cmd/loadkeys/type_6/Makefile
+++ b/usr/src/cmd/loadkeys/type_6/Makefile
@@ -2,9 +2,8 @@
 # CDDL HEADER START
 #
 # The contents of this file are subject to the terms of the
-# Common Development and Distribution License, Version 1.0 only
-# (the "License").  You may not use this file except in compliance
-# with the License.
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
 #
 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
 # or http://www.opensolaris.org/os/licensing.
@@ -29,12 +28,12 @@
 # cmd/loadkeys/type_6/Makefile
 
 KEYTABLES = \
-        us denmark finnish france germany italy japan korea \
+        us belgium denmark finnish france germany italy japan korea \
         netherlands norway portugal reset spain sweden \
         swiss_french swiss_german taiwan uk \
         slovakia slovenia serbiaandmontenegro \
         iceland croatia bulgaria belarus maltaus \
-        maltauk albania
+        maltauk albania turkeyq turkeyf 
 
 include ../../Makefile.cmd
 
@@ -45,11 +44,12 @@ ROOTKEYTABLES= $(KEYTABLES:%=$(ROOTKEYDIR)/%)
 # there is an install target for each ROOT layout link
 #
 LAYOUTS= \
-        layout_00 layout_06 layout_07 layout_08 layout_09 layout_0e \
+        layout_00 layout_02 layout_06 layout_07 layout_08 layout_09 layout_0e \
         layout_0f layout_10 layout_12 layout_13 layout_16 layout_19 \
         layout_1a layout_1b layout_1c layout_1e layout_20 layout_21 \
         layout_100 layout_18 layout_101 layout_102 layout_103 layout_104 \
-        layout_105 layout_106 layout_107 layout_108 layout_10f
+        layout_105 layout_106 layout_107 layout_108 layout_10f layout_1f \
+	layout_23
 
 ROOTLINKS= $(LAYOUTS:%=$(ROOTKEYDIR)/%)
 
@@ -78,6 +78,9 @@ $(ROOTKEYDIR): $(ROOTKEYTABLESDIR)
 $(ROOTKEYDIR)/layout_00: $(ROOTKEYDIR)/us
 	$(RM) $@; $(LN) $(ROOTKEYDIR)/us $@
 
+$(ROOTKEYDIR)/layout_02: $(ROOTKEYDIR)/belgium
+	$(RM) $@; $(LN) $(ROOTKEYDIR)/belgium $@
+
 $(ROOTKEYDIR)/layout_06: $(ROOTKEYDIR)/denmark
 	$(RM) $@; $(LN) $(ROOTKEYDIR)/denmark $@
 
@@ -160,6 +163,13 @@ $(ROOTKEYDIR)/layout_108: $(ROOTKEYDIR)/albania
 	$(RM) $@; $(LN) $(ROOTKEYDIR)/albania  $@
 
 $(ROOTKEYDIR)/layout_10f: $(ROOTKEYDIR)/japan
-	$(RM) $@; $(LN) $(ROOTKEYDIR)/japan $@ 
+	$(RM) $@; $(LN) $(ROOTKEYDIR)/japan $@
+
+$(ROOTKEYDIR)/layout_1f: $(ROOTKEYDIR)/turkeyq
+	$(RM) $@; $(LN) $(ROOTKEYDIR)/turkeyq  $@
+
+$(ROOTKEYDIR)/layout_23: $(ROOTKEYDIR)/turkeyf
+	$(RM) $@; $(LN) $(ROOTKEYDIR)/turkeyf  $@
+
 
 include ../../Makefile.targ
diff --git a/usr/src/cmd/loadkeys/type_6/belgium b/usr/src/cmd/loadkeys/type_6/belgium
new file mode 100644
index 0000000000..6dcde3fc9b
--- /dev/null
+++ b/usr/src/cmd/loadkeys/type_6/belgium
@@ -0,0 +1,85 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Belgian Type 6 (USB) key layout
+#
+key  49  base '\\' shift | caps '\\' ctrl ^\ altg nop
+key  50 all hole
+key 103  all hole
+key  30  base 1 shift ! caps 1 ctrl 1 altg nop
+key  31  base 2 shift @ caps 2 ctrl ^@ altg nop
+key  32  base 3 shift # caps 3 ctrl 3 altg nop
+key  33  base 4 shift $ caps 4 ctrl 4 altg nop
+key  34  base 5 shift % caps 5 ctrl 5 altg nop
+key  35  base 6 shift ^ caps 6 ctrl ^^ altg nop
+key  36  base 7 shift & caps 7 ctrl 7 altg nop
+key  37  base 8 shift * caps 8 ctrl 8 altg nop
+key  38  base 9 shift ( caps 9 ctrl 9 altg nop
+key  39  base 0 shift ) caps 0 ctrl 0 altg nop
+key  45  base - shift _ caps - ctrl ^_ altg nop
+key  46  base = shift + caps = ctrl = altg nop
+key  20  base q shift Q caps Q ctrl ^Q altg nop
+key  26  base w shift W caps W ctrl ^W altg nop
+key  28  base y shift Y caps Y ctrl ^Y altg nop
+key  18  base o shift O caps O ctrl ^O altg nop
+key  19  base p shift P caps P ctrl ^P altg nop
+key  47  base [ shift { caps [ ctrl ^[ altg nop
+key  48  base ] shift } caps ] ctrl ^] altg nop
+key 224  all shiftkeys+leftctrl up shiftkeys+leftctrl
+key   4  base a shift A caps A ctrl ^A altg nop
+key  22  base s shift S caps S ctrl ^S altg nop
+key  51  base ; shift : caps ; ctrl ; altg nop
+key  52  base '\'' shift '"' caps '\'' ctrl '\'' altg nop
+key  53  base ` shift ~ caps ` ctrl ^^ altg nop
+key 100  all hole
+key  29  base z shift Z caps Z ctrl ^Z altg nop
+key  27  base x shift X caps X ctrl ^X altg nop
+key   6  base c shift C caps C ctrl ^C altg nop
+key  25  base v shift V caps V ctrl ^V altg nop
+key   5  base b shift B caps B ctrl ^B altg nop
+key  17  base n shift N caps N ctrl ^N altg nop
+key  16  base m shift M caps M ctrl '\r' altg nop
+key  54  base , shift < caps , ctrl , altg nop
+key  55  base . shift > caps . ctrl . altg nop
+key  56  base / shift ? caps / ctrl ^_ altg nop
+key  57  all shiftkeys+capslock
+key 226  all shiftkeys+alt up shiftkeys+alt
+key 101  all compose
+key 230  all shiftkeys+altgraph up shiftkeys+altgraph
+#
+#
+#
+# New function keys assigned old codes
+#
+key  73  all bf(8)
+key  74  all rf(7)
+key  75  all rf(9)
+key  77  all rf(13)
+key  78  all rf(15)
+key  82  all string+uparrow
+key  80  all string+leftarrow
+key  81  all string+downarrow
+key  79  all string+rightarrow
diff --git a/usr/src/cmd/loadkeys/type_6/turkeyf b/usr/src/cmd/loadkeys/type_6/turkeyf
new file mode 100644
index 0000000000..56d77fffc2
--- /dev/null
+++ b/usr/src/cmd/loadkeys/type_6/turkeyf
@@ -0,0 +1,84 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+# 
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Turkey F Type 6 (USB) key layout
+#
+key  49  base '\\' shift | caps '\\' ctrl ^\ altg nop
+key  50 all hole        
+key 103  all hole        
+key  30  base 1 shift ! caps 1 ctrl 1 altg nop
+key  31  base 2 shift @ caps 2 ctrl ^@ altg nop
+key  32  base 3 shift # caps 3 ctrl 3 altg nop
+key  33  base 4 shift $ caps 4 ctrl 4 altg nop
+key  34  base 5 shift % caps 5 ctrl 5 altg nop
+key  35  base 6 shift ^ caps 6 ctrl ^^ altg nop
+key  36  base 7 shift & caps 7 ctrl 7 altg nop
+key  37  base 8 shift * caps 8 ctrl 8 altg nop
+key  38  base 9 shift ( caps 9 ctrl 9 altg nop
+key  39  base 0 shift ) caps 0 ctrl 0 altg nop
+key  45  base - shift _ caps - ctrl ^_ altg nop
+key  46  base = shift + caps = ctrl = altg nop
+key  20  base q shift Q caps Q ctrl ^Q altg nop
+key  26  base w shift W caps W ctrl ^W altg nop
+key  28  base y shift Y caps Y ctrl ^Y altg nop
+key  18  base o shift O caps O ctrl ^O altg nop
+key  19  base p shift P caps P ctrl ^P altg nop
+key  47  base [ shift { caps [ ctrl ^[ altg nop
+key  48  base ] shift } caps ] ctrl ^] altg nop
+key 224  all shiftkeys+leftctrl up shiftkeys+leftctrl      
+key   4  base a shift A caps A ctrl ^A altg nop
+key  22  base s shift S caps S ctrl ^S altg nop
+key  51  base ; shift : caps ; ctrl ; altg nop
+key  52  base '\'' shift '"' caps '\'' ctrl '\'' altg nop
+key  53  base ` shift ~ caps ` ctrl ^^ altg nop
+key 100  all hole        
+key  29  base z shift Z caps Z ctrl ^Z altg nop
+key  27  base x shift X caps X ctrl ^X altg nop
+key   6  base c shift C caps C ctrl ^C altg nop
+key  25  base v shift V caps V ctrl ^V altg nop
+key   5  base b shift B caps B ctrl ^B altg nop
+key  17  base n shift N caps N ctrl ^N altg nop
+key  16  base m shift M caps M ctrl '\r' altg nop
+key  54  base , shift < caps , ctrl , altg nop
+key  55  base . shift > caps . ctrl . altg nop
+key  56  base / shift ? caps / ctrl ^_ altg nop
+key  57  all shiftkeys+capslock        
+key 226  all shiftkeys+alt up shiftkeys+alt      
+key 101  all compose        
+key 230  all shiftkeys+altgraph up shiftkeys+altgraph      
+#
+#
+#
+# New function keys assigned old codes
+#
+key  73  all bf(8)        
+key  74  all rf(7)        
+key  75  all rf(9)        
+key  77  all rf(13)        
+key  78  all rf(15)        
+key  82  all string+uparrow        
+key  80  all string+leftarrow        
+key  81  all string+downarrow        
+key  79  all string+rightarrow        
diff --git a/usr/src/cmd/loadkeys/type_6/turkeyq b/usr/src/cmd/loadkeys/type_6/turkeyq
new file mode 100644
index 0000000000..e794343a27
--- /dev/null
+++ b/usr/src/cmd/loadkeys/type_6/turkeyq
@@ -0,0 +1,84 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#pragma ident	"%Z%%M%	%I%	%E% SMI"
+#
+# Turkey F Type 6 (USB) key layout
+#
+key  49  base '\\' shift | caps '\\' ctrl ^\ altg nop
+key  50 all hole        
+key 103  all hole        
+key  30  base 1 shift ! caps 1 ctrl 1 altg nop
+key  31  base 2 shift @ caps 2 ctrl ^@ altg nop
+key  32  base 3 shift # caps 3 ctrl 3 altg nop
+key  33  base 4 shift $ caps 4 ctrl 4 altg nop
+key  34  base 5 shift % caps 5 ctrl 5 altg nop
+key  35  base 6 shift ^ caps 6 ctrl ^^ altg nop
+key  36  base 7 shift & caps 7 ctrl 7 altg nop
+key  37  base 8 shift * caps 8 ctrl 8 altg nop
+key  38  base 9 shift ( caps 9 ctrl 9 altg nop
+key  39  base 0 shift ) caps 0 ctrl 0 altg nop
+key  45  base - shift _ caps - ctrl ^_ altg nop
+key  46  base = shift + caps = ctrl = altg nop
+key  20  base q shift Q caps Q ctrl ^Q altg nop
+key  26  base w shift W caps W ctrl ^W altg nop
+key  28  base y shift Y caps Y ctrl ^Y altg nop
+key  18  base o shift O caps O ctrl ^O altg nop
+key  19  base p shift P caps P ctrl ^P altg nop
+key  47  base [ shift { caps [ ctrl ^[ altg nop
+key  48  base ] shift } caps ] ctrl ^] altg nop
+key 224  all shiftkeys+leftctrl up shiftkeys+leftctrl      
+key   4  base a shift A caps A ctrl ^A altg nop
+key  22  base s shift S caps S ctrl ^S altg nop
+key  51  base ; shift : caps ; ctrl ; altg nop
+key  52  base '\'' shift '"' caps '\'' ctrl '\'' altg nop
+key  53  base ` shift ~ caps ` ctrl ^^ altg nop
+key 100  all hole        
+key  29  base z shift Z caps Z ctrl ^Z altg nop
+key  27  base x shift X caps X ctrl ^X altg nop
+key   6  base c shift C caps C ctrl ^C altg nop
+key  25  base v shift V caps V ctrl ^V altg nop
+key   5  base b shift B caps B ctrl ^B altg nop
+key  17  base n shift N caps N ctrl ^N altg nop
+key  16  base m shift M caps M ctrl '\r' altg nop
+key  54  base , shift < caps , ctrl , altg nop
+key  55  base . shift > caps . ctrl . altg nop
+key  56  base / shift ? caps / ctrl ^_ altg nop
+key  57  all shiftkeys+capslock        
+key 226  all shiftkeys+alt up shiftkeys+alt      
+key 101  all compose        
+key 230  all shiftkeys+altgraph up shiftkeys+altgraph      
+#
+#
+#
+# New function keys assigned old codes
+#
+key  73  all bf(8)        
+key  74  all rf(7)        
+key  75  all rf(9)        
+key  77  all rf(13)        
+key  78  all rf(15)        
+key  82  all string+uparrow        
+key  80  all string+leftarrow        
+key  81  all string+downarrow        
+key  79  all string+rightarrow