From root@gits.dyndns.org  Mon May  8 22:15:35 2000
Return-Path: <root@gits.dyndns.org>
Received: from racine.cybercable.fr (racine.cybercable.fr [212.198.0.201])
	by hub.freebsd.org (Postfix) with SMTP id 05A5337BD96
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  8 May 2000 22:15:34 -0700 (PDT)
	(envelope-from root@gits.dyndns.org)
Received: (qmail 17779654 invoked from network); 9 May 2000 05:15:32 -0000
Received: from r225m254.cybercable.tm.fr (HELO gits.dyndns.org) ([195.132.225.254]) (envelope-sender <root@gits.dyndns.org>)
          by racine.cybercable.fr (qmail-ldap-1.03) with SMTP
          for <FreeBSD-gnats-submit@freebsd.org>; 9 May 2000 05:15:32 -0000
Received: (from root@localhost)
	by gits.dyndns.org (8.9.3/8.9.3) id HAA04164;
	Tue, 9 May 2000 07:15:30 +0200 (CEST)
	(envelope-from root)
Message-Id: <200005090515.HAA04164@gits.dyndns.org>
Date: Tue, 9 May 2000 07:15:30 +0200 (CEST)
From: clefevre@citeweb.net
Sender: root@gits.dyndns.org
Reply-To: clefevre@citeweb.net
To: FreeBSD-gnats-submit@freebsd.org
Subject: us syscons keymap w/ accent
X-Send-Pr-Version: 3.2

>Number:         18459
>Category:       misc
>Synopsis:       us syscons keymap w/ accent
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    murray
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          wish
>Submitter-Id:   current-users
>Arrival-Date:   Mon May 08 22:20:01 PDT 2000
>Closed-Date:    Thu Jul 10 01:30:25 PDT 2003
>Last-Modified:  Thu Jul 10 01:30:25 PDT 2003
>Originator:     Cyrille Lefevre
>Release:        FreeBSD 4.0-STABLE i386
>Organization:
ACME
>Environment:

FreeBSD gits 4.0-STABLE FreeBSD 4.0-STABLE #15: Tue May  9 00:32:14 CEST 2000     root@gits:/disk2/4.0-STABLE/src/sys/compile/CUSTOM  i386

>Description:

	the usual us syscons keymap doesn't handle any dead keys.
	the us syscons keymap bellow is based on us.iso.kbd and
	handle dead keys.

>How-To-Repeat:

	ALT-' + e gives 'e using us.iso.kbd and gives  using us.iso.acc.kbd

>Fix:

# cvs diff INDEX.keymaps Makefile
Index: INDEX.keymaps
===================================================================
RCS file: /home/ncvs/src/share/syscons/keymaps/INDEX.keymaps,v
retrieving revision 1.37
diff -u -r1.37 INDEX.keymaps
--- INDEX.keymaps	2000/03/02 14:43:51	1.37
+++ INDEX.keymaps	2000/05/09 05:00:40
@@ -301,6 +301,12 @@
 us.iso.kbd:pt:Estados Unidos da Amrica ISO-8859-1
 us.iso.kbd:es:Estadounidense ISO-8859-1

+us.iso.acc.kbd:en:United States of America ISO-8859-1 (accent keys)
+us.iso.acc.kbd:de:US-amerikanisch ISO-8859-1 (mit Akzenten)
+us.iso.acc.kbd:fr:tats Unis  d'Amrique ISO-8859-1 (avec accents)
+us.iso.acc.kbd:pt:Estados Unidos da Amrica ISO-8859-1 (com acentos)
+us.iso.acc.kbd:es:Estadounidense ISO-8859-1 (con acentos)
+
 us.dvorak.kbd:en:United States of America dvorak
 us.dvorak.kbd:de:US-amerikanisch dvorak
 us.dvorak.kbd:fr:tats Unis  d'Amrique dvorak
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/share/syscons/keymaps/Makefile,v
retrieving revision 1.44
diff -u -r1.44 Makefile
--- Makefile	2000/03/02 14:43:51	1.44
+++ Makefile	2000/05/09 05:07:34
@@ -30,7 +30,7 @@
 KEYMAPS+= swissfrench.iso.kbd swissfrench.iso.acc.kbd swissfrench.cp850.kbd
 KEYMAPS+= swissgerman.iso.kbd swissgerman.iso.acc.kbd swissgerman.cp850.kbd
 KEYMAPS+= ua.koi8-u.kbd
-KEYMAPS+= uk.iso.kbd uk.cp850.kbd
+KEYMAPS+= uk.iso.acc.kbd uk.cp850.kbd
 KEYMAPS+= us.iso.kbd us.dvorak.kbd us.dvorakx.kbd us.emacs.kbd us.unix.kbd

 MAPSDIR = ${SHAREDIR}/syscons/keymaps

diff -u /dev/null /usr/src/share/syscons/keymaps/us.iso.acc.kbd
--- /dev/null	Tue May  9 06:42:50 2000
+++ /usr/src/share/syscons/keymaps/us.iso.acc.kbd	Wed Apr  5 06:12:38 2000
@@ -0,0 +1,138 @@
+#                                                         alt
+# scan                       cntrl          alt    alt   cntrl lock
+# code  base   shift  cntrl  shift  alt    shift  cntrl  shift state
+# ------------------------------------------------------------------
+  000   nop    nop    nop    nop    nop    nop    nop    nop     O
+  001   esc    esc    esc    esc    esc    esc    debug  debug   O
+  002   '1'    '!'    nop    nop    '1'    '!'    nop    nop     O
+  003   '2'    '@'    nul    nul    '2'    '@'    nul    nul     O
+  004   '3'    '#'    nop    nop    '3'    '#'    nop    nop     O
+  005   '4'    '$'    nop    nop    '4'    '$'    nop    nop     O
+  006   '5'    '%'    nop    nop    '5'    '%'    nop    nop     O
+  007   '6'    '^'    rs     rs     '6'    dcir   rs     rs      O
+  008   '7'    '&'    nop    nop    '7'    '&'    nop    nop     O
+  009   '8'    '*'    nop    nop    '8'    drin   nop    nop     O
+  010   '9'    '('    nop    nop    '9'    '('    nop    nop     O
+  011   '0'    ')'    nop    nop    '0'    ')'    nop    nop     O
+  012   '-'    '_'    us     us     '-'    '_'    us     us      O
+  013   '='    '+'    nop    nop    '='    '+'    nop    nop     O
+  014   bs     bs     del    del    bs     bs     del    del     O
+  015   ht     btab   nscr   nscr   ht     btab   nop    nop     O
+  016   'q'    'Q'    dc1    dc1    'q'    'Q'    dc1    dc1     C
+  017   'w'    'W'    etb    etb    'w'    'W'    etb    etb     C
+  018   'e'    'E'    enq    enq    'e'    'E'    enq    enq     C
+  019   'r'    'R'    dc2    dc2    'r'    'R'    dc2    dc2     C
+  020   't'    'T'    dc4    dc4    't'    'T'    dc4    dc4     C
+  021   'y'    'Y'    em     em     'y'    'Y'    em     em      C
+  022   'u'    'U'    nak    nak    'u'    'U'    nak    nak     C
+  023   'i'    'I'    ht     ht     'i'    'I'    ht     ht      C
+  024   'o'    'O'    si     si     'o'    'O'    si     si      C
+  025   'p'    'P'    dle    dle    'p'    'P'    dle    dle     C
+  026   '['    '{'    esc    esc    '['    '{'    esc    esc     O
+  027   ']'    '}'    gs     gs     ']'    '}'    gs     gs      O
+  028   cr     cr     nl     nl     cr     cr     nl     nl      O
+  029   lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl  lctrl   O
+  030   'a'    'A'    soh    soh    'a'    'A'    soh    soh     C
+  031   's'    'S'    dc3    dc3    's'    'S'    dc3    dc3     C
+  032   'd'    'D'    eot    eot    'd'    'D'    eot    eot     C
+  033   'f'    'F'    ack    ack    'f'    'F'    ack    ack     C
+  034   'g'    'G'    bel    bel    'g'    'G'    bel    bel     C
+  035   'h'    'H'    bs     bs     'h'    'H'    bs     bs      C
+  036   'j'    'J'    nl     nl     'j'    'J'    nl     nl      C
+  037   'k'    'K'    vt     vt     'k'    'K'    vt     vt      C
+  038   'l'    'L'    ff     ff     'l'    'L'    ff     ff      C
+  039   ';'    ':'    nop    nop    ';'    ':'    nop    nop     O
+  040   '''    '"'    nop    nop    dacu   duml   nop    nop     O
+  041   '`'    '~'    nop    nop    dgra   dtil   nop    nop     O
+  042   lshift lshift lshift lshift lshift lshift lshift lshift  O
+  043   '\'    '|'    fs     fs     '\'    '|'    fs     fs      O
+  044   'z'    'Z'    sub    sub    'z'    'Z'    sub    sub     C
+  045   'x'    'X'    can    can    'x'    'X'    can    can     C
+  046   'c'    'C'    etx    etx    'c'    'C'    etx    etx     C
+  047   'v'    'V'    syn    syn    'v'    'V'    syn    syn     C
+  048   'b'    'B'    stx    stx    'b'    'B'    stx    stx     C
+  049   'n'    'N'    so     so     'n'    'N'    so     so      C
+  050   'm'    'M'    cr     cr     'm'    'M'    cr     cr      C
+  051   ','    '<'    nop    nop    dced   '<'    nop    nop     O
+  052   '.'    '>'    nop    nop    '.'    '>'    nop    nop     O
+  053   '/'    '?'    nop    nop    '/'    '?'    nop    nop     O
+  054   rshift rshift rshift rshift rshift rshift rshift rshift  O
+  055   '*'    '*'    '*'    '*'    '*'    '*'    '*'    '*'     O
+  056   lalt   lalt   lalt   lalt   lalt   lalt   lalt   lalt    O
+  057   ' '    ' '    nul    nul    ' '    ' '    susp   susp    O
+  058   clock  clock  clock  clock  clock  clock  clock  clock   O
+  059   fkey01 fkey13 fkey25 fkey37 scr01  scr11  scr01  scr11   O
+  060   fkey02 fkey14 fkey26 fkey38 scr02  scr12  scr02  scr12   O
+  061   fkey03 fkey15 fkey27 fkey39 scr03  scr13  scr03  scr13   O
+  062   fkey04 fkey16 fkey28 fkey40 scr04  scr14  scr04  scr14   O
+  063   fkey05 fkey17 fkey29 fkey41 scr05  scr15  scr05  scr15   O
+  064   fkey06 fkey18 fkey30 fkey42 scr06  scr16  scr06  scr16   O
+  065   fkey07 fkey19 fkey31 fkey43 scr07  scr07  scr07  scr07   O
+  066   fkey08 fkey20 fkey32 fkey44 scr08  scr08  scr08  scr08   O
+  067   fkey09 fkey21 fkey33 fkey45 scr09  scr09  scr09  scr09   O
+  068   fkey10 fkey22 fkey34 fkey46 scr10  scr10  scr10  scr10   O
+  069   nlock  nlock  nlock  nlock  nlock  nlock  nlock  nlock   O
+  070   slock  slock  slock  slock  slock  slock  slock  slock   O
+  071   fkey49 '7'    '7'    '7'    '7'    '7'    '7'    '7'     N
+  072   fkey50 '8'    '8'    '8'    '8'    '8'    '8'    '8'     N
+  073   fkey51 '9'    '9'    '9'    '9'    '9'    '9'    '9'     N
+  074   fkey52 '-'    '-'    '-'    '-'    '-'    '-'    '-'     N
+  075   fkey53 '4'    '4'    '4'    '4'    '4'    '4'    '4'     N
+  076   fkey54 '5'    '5'    '5'    '5'    '5'    '5'    '5'     N
+  077   fkey55 '6'    '6'    '6'    '6'    '6'    '6'    '6'     N
+  078   fkey56 '+'    '+'    '+'    '+'    '+'    '+'    '+'     N
+  079   fkey57 '1'    '1'    '1'    '1'    '1'    '1'    '1'     N
+  080   fkey58 '2'    '2'    '2'    '2'    '2'    '2'    '2'     N
+  081   fkey59 '3'    '3'    '3'    '3'    '3'    '3'    '3'     N
+  082   fkey60 '0'    '0'    '0'    '0'    '0'    '0'    '0'     N
+  083   del    '.'    '.'    '.'    '.'    '.'    boot   boot    N
+  084   nop    nop    nop    nop    nop    nop    nop    nop     O
+  085   nop    nop    nop    nop    nop    nop    nop    nop     O
+  086   nop    nop    nop    nop    nop    nop    nop    nop     O
+  087   fkey11 fkey23 fkey35 fkey47 scr11  scr11  scr11  scr11   O
+  088   fkey12 fkey24 fkey36 fkey48 scr12  scr12  scr12  scr12   O
+  089   cr     cr     nl     nl     cr     cr     nl     nl      O
+  090   rctrl  rctrl  rctrl  rctrl  rctrl  rctrl  rctrl  rctrl   O
+  091   '/'    '/'    '/'    '/'    '/'    '/'    '/'    '/'     N
+  092   nscr   nscr   nop    nop    debug  debug  debug  debug   O
+  093   ralt   ralt   ralt   ralt   ralt   ralt   ralt   ralt    O
+  094   fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49 fkey49  O
+  095   fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50 fkey50  O
+  096   fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51 fkey51  O
+  097   fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53 fkey53  O
+  098   fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55 fkey55  O
+  099   fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57 fkey57  O
+  100   fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58 fkey58  O
+  101   fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59 fkey59  O
+  102   fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60 fkey60  O
+  103   fkey61 fkey61 fkey61 fkey61 fkey61 fkey61 boot   fkey61  O
+  104   saver  saver  susp   susp   nop    nop    susp   susp    O
+  105   fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62 fkey62  O
+  106   fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63 fkey63  O
+  107   fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64 fkey64  O
+  108   nop    nop    nop    nop    nop    nop    nop    nop     O
+
+  dgra  '`'  ( 'a' 224 ) ( 'A' 192 ) ( 'e' 232 ) ( 'E' 200 ) 
+             ( 'i' 236 ) ( 'I' 204 ) ( 'o' 242 ) ( 'O' 210 ) 
+             ( 'u' 249 ) ( 'U' 217 )
+  dacu  180  ( 'a' 225 ) ( 'A' 193 ) ( 'e' 233 ) ( 'E' 201 ) 
+             ( 'i' 237 ) ( 'I' 205 ) ( 'o' 243 ) ( 'O' 211 ) 
+             ( 'u' 250 ) ( 'U' 218 ) ( 'y' 253 ) ( 'Y' 221 ) 
+  dcir  '^'  ( 'a' 226 ) ( 'A' 194 ) ( 'e' 234 ) ( 'E' 202 ) 
+             ( 'i' 238 ) ( 'I' 206 ) ( 'o' 244 ) ( 'O' 212 ) 
+             ( 'u' 251 ) ( 'U' 219 )
+  dtil  '~'  ( 'a' 227 ) ( 'A' 195 ) ( 'n' 241 ) ( 'N' 209 ) 
+             ( 'o' 245 ) ( 'O' 213 )
+  dmac  000
+  dbre  000
+  ddot  000
+  duml  168  ( 'a' 228 ) ( 'A' 196 ) ( 'e' 235 ) ( 'E' 203 ) 
+             ( 'i' 239 ) ( 'I' 207 ) ( 'o' 246 ) ( 'O' 214 ) 
+             ( 'u' 252 ) ( 'U' 220 ) ( 'y' 255 )
+  dsla  000
+  drin  176  ( 'a' 229 ) ( 'A' 197 )
+  dced  184  ( 'c' 231 ) ( 'C' 199 )
+  dapo  000
+  ddac  000
+  dogo  000
+  dcar  000

>Release-Note:
>Audit-Trail:

From: Cyrille Lefevre <root@gits.dyndns.org>
To: freebsd-gnats-submit@FreeBSD.org
Cc:  
Subject: Re: misc/18459: us syscons keymap w/ accent
Date: Sat, 24 Jun 2000 17:09:16 +0200 (CEST)

 the Makefile patch was wrong, this one follow the right way.
 
 Index: /usr/src/share/syscons/keymaps/Makefile
 ===================================================================
 RCS file: /home/ncvs/src/share/syscons/keymaps/Makefile,v
 retrieving revision 1.44
 diff -u -r1.44 Makefile
 --- /usr/src/share/syscons/keymaps/Makefile	2000/03/02 14:43:51	1.44
 +++ /usr/src/share/syscons/keymaps/Makefile	2000/05/21 21:25:23
 @@ -32,6 +32,7 @@
  KEYMAPS+= ua.koi8-u.kbd
  KEYMAPS+= uk.iso.kbd uk.cp850.kbd
  KEYMAPS+= us.iso.kbd us.dvorak.kbd us.dvorakx.kbd us.emacs.kbd us.unix.kbd
 +KEYMAPS+= us.iso.acc.kbd
 
  MAPSDIR = ${SHAREDIR}/syscons/keymaps
  NOMAN = noman
 
Responsible-Changed-From-To: freebsd-bugs->ache 
Responsible-Changed-By: johan 
Responsible-Changed-When: Thu Aug 22 18:13:56 PDT 2002 
Responsible-Changed-Why:  
Over to our localization guru. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=18459 
State-Changed-From-To: open->patched 
State-Changed-By: murray 
State-Changed-When: Thu Jun 19 01:10:37 PDT 2003 
State-Changed-Why:  
This patch has been applied to -CURRENT.  I will MFC this change next 
week.  Thanks for the submission. 



Responsible-Changed-From-To: ache->murray 
Responsible-Changed-By: murray 
Responsible-Changed-When: Thu Jun 19 01:10:37 PDT 2003 
Responsible-Changed-Why:  
This patch has been applied to -CURRENT.  I will MFC this change next 
week.  Thanks for the submission. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=18459 
State-Changed-From-To: patched->closed 
State-Changed-By: murray 
State-Changed-When: Thu Jul 10 01:30:10 PDT 2003 
State-Changed-Why:  
I've MFCed this change to stable.  Thanks for your patience. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=18459 
>Unformatted:
