changeset 9960:1c799f586b2f

6559348 Some keyboard layouts are missing in selection list using "kbd -s"
author javier acosta - Sun Microsystems - Prague Czech Republic <Javier.Acosta@Sun.COM>
date Wed, 24 Jun 2009 16:43:44 +0200
parents acbef346fd18
children 90652b897931
files usr/src/cmd/loadkeys/type_6/Makefile usr/src/cmd/loadkeys/type_6/estonia usr/src/cmd/loadkeys/type_6/kbd_layouts usr/src/cmd/loadkeys/type_6/romania usr/src/pkgdefs/SUNWkey/prototype_com
diffstat 5 files changed, 165 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/cmd/loadkeys/type_6/Makefile	Wed Jun 24 15:30:04 2009 +0100
+++ b/usr/src/cmd/loadkeys/type_6/Makefile	Wed Jun 24 16:43:44 2009 +0200
@@ -34,7 +34,7 @@
         slovakia slovenia serbiaandmontenegro \
         iceland croatia bulgaria belarus maltaus \
         maltauk albania turkeyq turkeyf latvia lithuania macedonia russia \
-        latinamerica canadian_bilingual brazil dvorak
+        latinamerica canadian_bilingual brazil dvorak estonia romania
 
 KEYTABLESCONFIG = kbd_layouts
 
@@ -55,7 +55,7 @@
 	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_1f layout_23 layout_15 layout_05 layout_11 \
-	layout_03 layout_110 layout_111
+	layout_03 layout_110 layout_111 layout_112 layout_113
 
 ROOTLINKS= $(LAYOUTS:%=$(ROOTKEYDIR)/%)
 
@@ -218,4 +218,10 @@
 $(ROOTKEYDIR)/layout_111: $(ROOTKEYDIR)/dvorak
 	$(RM) $@; $(LN) $(ROOTKEYDIR)/dvorak  $@
 
+$(ROOTKEYDIR)/layout_112: $(ROOTKEYDIR)/estonia
+	$(RM) $@; $(LN) $(ROOTKEYDIR)/estonia  $@
+
+$(ROOTKEYDIR)/layout_113: $(ROOTKEYDIR)/romania
+	$(RM) $@; $(LN) $(ROOTKEYDIR)/romania  $@
+
 include ../../Makefile.targ
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/loadkeys/type_6/estonia	Wed Jun 24 16:43:44 2009 +0200
@@ -0,0 +1,75 @@
+#
+# 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 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Estonia Type 6 (USB) key layout
+#
+# Note, on the console, Estonian characters and euro sign are not
+# included into this keymap. This is because the console may not have 
+# full font support for the characters available in this language.
+# However, all necessary ASCII characters are placed onto the right keys. 
+#
+#
+key  53  base ` shift fa_tilde caps ` ctrl ^^ altg '¬'
+key  30  base 1 shift ! caps 1 ctrl 1 altg ¹
+key  31  base 2 shift '"' caps 2 ctrl ^@ altg @
+key  32  base 3 shift # caps 3 ctrl 3 altg £
+key  33  base 4 shift ¤ caps 4 ctrl 4 altg $
+key  34  base 5 shift % caps 5 ctrl 5 altg ½
+key  35  base 6 shift & caps 6 ctrl 6 altg '¬'
+key  36  base 7 shift / caps 7 ctrl 7 altg {
+key  37  base 8 shift ( caps 8 ctrl ^[ altg [
+key  38  base 9 shift ) caps 9 ctrl ^] altg ]
+key  39  base 0 shift = caps 0 ctrl 0 altg }
+key  45  base + shift ? caps + ctrl ^_ altg '\\'
+key  46  base fa_acute shift fa_grave caps fa_acute ctrl fa_acute altg `
+key  20  base q shift Q caps Q ctrl ^Q altg @
+key  47  base ü shift Ü caps Ü ctrl ü altg fa_umlaut
+key  48  base fa_umlaut shift ^ caps fa_umlaut ctrl fa_tilde altg ~
+key  51  base ö shift Ö caps Ö ctrl ö altg nop
+key  52  base ä shift Ä caps Ä ctrl ä altg ^
+key  50  base '\'' shift * caps '\'' ctrl '\'' altg '`' numl nonl up nop
+key  49  all hole
+key 100  base < shift > caps < ctrl ^| altg | numl nonl up nop
+key  29  base z shift Z caps Z ctrl ^Z altg «
+key  27  base x shift X caps X ctrl ^X altg »
+key   6  base c shift C caps C ctrl ^C altg ¢
+key  16  base m shift M caps M ctrl '\r' altg µ
+key  54  base , shift ; caps , ctrl , altg <
+key  55  base . shift : caps . ctrl . altg >
+key  56  base - shift _ caps - ctrl ^_ altg nop
+#
+#
+key  99  all bf(10) numl padsep      
+#
+# 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        
--- a/usr/src/cmd/loadkeys/type_6/kbd_layouts	Wed Jun 24 15:30:04 2009 +0100
+++ b/usr/src/cmd/loadkeys/type_6/kbd_layouts	Wed Jun 24 16:43:44 2009 +0200
@@ -47,6 +47,7 @@
 Danish=6
 Dutch=18
 Dvorak=273
+Estonian=274
 Finnish=7
 French=8
 French-Canadian=4
@@ -67,6 +68,7 @@
 Norwegian=19
 Polish=21
 Portuguese=22
+Romanian=275
 Russian=23
 Serbia-And-Montenegro=257
 Slovak=24
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/loadkeys/type_6/romania	Wed Jun 24 16:43:44 2009 +0200
@@ -0,0 +1,76 @@
+#
+# 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 2009 Sun Microsystems, Inc.  All rights reserved.
+# Use is subject to license terms.
+#
+#
+# Romania Type 6 (USB) key layout
+#
+# Note, on the console, Romanian characters and euro sign are not
+# included into this keymap. This is because the console may not have 
+# full font support for the characters available in this language.
+# However, all necessary ASCII characters are placed onto the right keys. 
+#
+#
+key  53  base ` shift ~ caps ` ctrl ^^ altg nop
+key  30  base 1 shift ! caps 1 ctrl 1 altg fa_tilde
+key  31  base 2 shift @ caps 2 ctrl ^@ altg nop
+key  32  base 3 shift # caps 3 ctrl 3 altg fa_cflex
+key  33  base 4 shift $ caps 4 ctrl 4 altg nop
+key  34  base 5 shift % caps 5 ctrl 5 altg °
+key  35  base 6 shift ^ caps 6 ctrl ^^ altg nop
+key  36  base 7 shift & caps 7 ctrl 7 altg fa_grave
+key  37  base 8 shift * caps 8 ctrl 8 altg nop
+key  38  base 9 shift ( caps 9 ctrl 9 altg fa_acute
+key  39  base 0 shift ) caps 0 ctrl 0 altg nop
+key  45  base - shift _ caps - ctrl ^_ altg fa_umlaut
+key  46  base = shift + caps = ctrl = altg fa_cedilla
+key  20  base q shift Q caps Q ctrl ^Q altg nop
+key  26  base w shift W caps W ctrl ^W altg ß
+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 §
+key  47  base [ shift { caps [ ctrl ^[ altg nop
+key  48  base ] shift } caps ] ctrl ^] altg nop
+key  49  all hole
+key 100  base < shift > caps < ctrl ^| altg | numl nonl up nop
+key  29  base z shift Z caps Z ctrl ^Z altg «
+key  27  base x shift X caps X ctrl ^X altg »
+key   6  base c shift C caps C ctrl ^C altg ¢
+key  16  base m shift M caps M ctrl '\r' altg µ
+key  54  base , shift < caps , ctrl , altg «
+key  55  base . shift > caps . ctrl . altg »
+key  56  base / shift ? caps / ctrl ^_ altg nop
+#
+#
+key  99  all bf(10) numl padsep
+#
+# 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
--- a/usr/src/pkgdefs/SUNWkey/prototype_com	Wed Jun 24 15:30:04 2009 +0100
+++ b/usr/src/pkgdefs/SUNWkey/prototype_com	Wed Jun 24 16:43:44 2009 +0200
@@ -111,6 +111,7 @@
 f none usr/share/lib/keytables/type_6/czech 444 root bin
 f none usr/share/lib/keytables/type_6/denmark  444 root bin
 f none usr/share/lib/keytables/type_6/dvorak 444 root bin
+f none usr/share/lib/keytables/type_6/estonia 444 root bin
 f none usr/share/lib/keytables/type_6/finnish 444 root bin
 f none usr/share/lib/keytables/type_6/france 444 root bin
 f none usr/share/lib/keytables/type_6/germany 444 root bin
@@ -129,6 +130,7 @@
 f none usr/share/lib/keytables/type_6/korea  444 root bin
 f none usr/share/lib/keytables/type_6/us 444 root bin
 f none usr/share/lib/keytables/type_6/reset 444 root bin
+f none usr/share/lib/keytables/type_6/romania 444 root bin
 f none usr/share/lib/keytables/type_6/slovakia 444 root bin
 f none usr/share/lib/keytables/type_6/slovenia 444 root bin
 f none usr/share/lib/keytables/type_6/serbiaandmontenegro 444 root bin
@@ -187,6 +189,8 @@
 l none usr/share/lib/keytables/type_6/layout_10f=../../../../../usr/share/lib/keytables/type_6/japan
 l none usr/share/lib/keytables/type_6/layout_110=../../../../../usr/share/lib/keytables/type_6/brazil
 l none usr/share/lib/keytables/type_6/layout_111=../../../../../usr/share/lib/keytables/type_6/dvorak
+l none usr/share/lib/keytables/type_6/layout_112=../../../../../usr/share/lib/keytables/type_6/estonia
+l none usr/share/lib/keytables/type_6/layout_113=../../../../../usr/share/lib/keytables/type_6/romania
 l none usr/share/lib/keytables/type_6/layout_04=../../../../../usr/share/lib/keytables/type_6/canadian_french
 l none usr/share/lib/keytables/type_6/layout_0a=../../../../../usr/share/lib/keytables/type_6/greece
 l none usr/share/lib/keytables/type_6/layout_0c=../../../../../usr/share/lib/keytables/type_6/hungary