summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <hrw@openedhand.com>2007-10-19 11:43:22 +0000
committerMarcin Juszkiewicz <hrw@openedhand.com>2007-10-19 11:43:22 +0000
commit09a71d0e11cc0fbee1948235c18a4ad6e4c79852 (patch)
tree0c190afbab5bb604e9af8dd6609ca2ae7eed3c5e /meta
parent548750d58c89ff8e5e6385fee5b0b972e57a269b (diff)
downloadopenembedded-core-09a71d0e11cc0fbee1948235c18a4ad6e4c79852.tar.gz
openembedded-core-09a71d0e11cc0fbee1948235c18a4ad6e4c79852.tar.bz2
openembedded-core-09a71d0e11cc0fbee1948235c18a4ad6e4c79852.zip
keymaps: sync with OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2921 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/keymaps/files/collie/keymap-2.6.map6
-rw-r--r--meta/packages/keymaps/files/jornada6xx/keymap-uk.map42
-rw-r--r--meta/packages/keymaps/keymaps_1.0.bb2
3 files changed, 25 insertions, 25 deletions
diff --git a/meta/packages/keymaps/files/collie/keymap-2.6.map b/meta/packages/keymaps/files/collie/keymap-2.6.map
index 9aca5abb38..13eb7d2881 100644
--- a/meta/packages/keymaps/files/collie/keymap-2.6.map
+++ b/meta/packages/keymaps/files/collie/keymap-2.6.map
@@ -6,7 +6,6 @@
# as Altgr, and simply use a proper keymap. Said keymap is as
# follows.
# keymaps 0-2,4-5,8,12,20
-keycode 1 = Escape Escape
keycode 14 = BackSpace
shift keycode 14 = BackSpace
control keycode 14 = Delete
@@ -147,7 +146,7 @@ keycode 53 = slash
control keycode 53 = Num_Lock
shiftl control keycode 53 = Num_Lock
control shiftr keycode 53 = Num_Lock
-keycode 54 = Shift
+keycode 54 = AltGr
keycode 55 = KP_Multiply
keycode 56 = Alt
keycode 57 = space
@@ -155,7 +154,7 @@ keycode 57 = space
control keycode 57 = nul
shiftl control keycode 57 = grave
control shiftr keycode 57 = grave
-keycode 97 = Control
+keycode 67 = Control
keycode 99 = Control_backslash
control keycode 99 = Control_backslash
keycode 100 = AltGr
@@ -164,6 +163,7 @@ keycode 105 = Left
keycode 106 = Right
keycode 107 = Select
keycode 108 = Down
+keycode 116 = Escape
string F1 = "\033[[A"
string F2 = "\033[[B"
string F3 = "\033[[C"
diff --git a/meta/packages/keymaps/files/jornada6xx/keymap-uk.map b/meta/packages/keymaps/files/jornada6xx/keymap-uk.map
index 4f511c8847..a7bb082464 100644
--- a/meta/packages/keymaps/files/jornada6xx/keymap-uk.map
+++ b/meta/packages/keymaps/files/jornada6xx/keymap-uk.map
@@ -26,14 +26,14 @@ keycode 7 = six asciicircum
alt keycode 7 = Meta_six
keycode 8 = seven ampersand braceleft
control keycode 8 = Control_underscore
- alt keycode 8 = KP_7
+ altgr keycode 8 = KP_7
keycode 9 = eight asterisk bracketleft
control keycode 9 = Delete
- alt keycode 9 = KP_8
+ altgr keycode 9 = KP_8
keycode 10 = nine parenleft bracketright
- alt keycode 10 = KP_9
+ altgr keycode 10 = KP_9
keycode 11 = zero parenright braceright
- alt keycode 11 = KP_Divide
+ altgr keycode 11 = KP_Divide
keycode 12 = minus underscore backslash
control keycode 11 = Control_underscore
shift control keycode 11 = Control_underscore
@@ -52,13 +52,13 @@ keycode 18 = e
keycode 19 = r
keycode 20 = t
keycode 21 = y
- alt keycode 21 = KP_4
+ altgr keycode 21 = KP_4
keycode 22 = u
- alt keycode 22 = KP_5
+ altgr keycode 22 = KP_5
keycode 23 = i
- alt keycode 23 = KP_6
+ altgr keycode 23 = KP_6
keycode 24 = o
- alt keycode 24 = KP_Multiply
+ altgr keycode 24 = KP_Multiply
keycode 25 = p
AltGr keycode 25 = braceleft
keycode 26 = backslash bar
@@ -73,13 +73,13 @@ keycode 32 = d
keycode 33 = f
keycode 34 = g
keycode 35 = h
- alt keycode 35 = KP_1
+ altgr keycode 35 = KP_1
keycode 36 = j
- alt keycode 36 = KP_2
+ altgr keycode 36 = KP_2
keycode 37 = k
- alt keycode 37 = KP_3
+ altgr keycode 37 = KP_3
keycode 38 = l
- alt keycode 38 = KP_Subtract
+ altgr keycode 38 = KP_Subtract
keycode 39 = semicolon colon bracketleft
alt keycode 39 = Meta_semicolon
keycode 40 = apostrophe quotedbl bracketright
@@ -98,14 +98,14 @@ keycode 46 = c
keycode 47 = v
keycode 48 = b
keycode 49 = n
- alt keycode 49 = KP_0
+ altgr keycode 49 = KP_0
keycode 50 = m
- alt keycode 50 = KP_Comma
+ altgr keycode 50 = KP_Comma
keycode 51 = comma less
- alt keycode 51 = KP_Period
+ altgr keycode 51 = KP_Period
keycode 52 = period greater
control keycode 52 = Compose
- alt keycode 52 = KP_Add
+ altgr keycode 52 = KP_Add
keycode 54 = Shift
keycode 56 = Alt
keycode 57 = space space
@@ -180,11 +180,11 @@ keycode 115 = slash question
alt keycode 115 = Meta_slash
keycode 123 = AltGr
keycode 219 = Insert
-string F1 = "\033[[A"
-string F2 = "\033[[B"
-string F3 = "\033[[C"
-string F4 = "\033[[D"
-string F5 = "\033[[E"
+string F1 = "\033[11~"
+string F2 = "\033[12~"
+string F3 = "\033[13~"
+string F4 = "\033[14~"
+string F5 = "\033[15~"
string F6 = "\033[17~"
string F7 = "\033[18~"
string F8 = "\033[19~"
diff --git a/meta/packages/keymaps/keymaps_1.0.bb b/meta/packages/keymaps/keymaps_1.0.bb
index 5d4417955c..813ba41011 100644
--- a/meta/packages/keymaps/keymaps_1.0.bb
+++ b/meta/packages/keymaps/keymaps_1.0.bb
@@ -3,7 +3,7 @@ SECTION = "base"
RDEPENDS = "initscripts console-tools"
LICENSE = "GPL"
PACKAGE_ARCH = "${MACHINE}"
-PR = "r14"
+PR = "r15"
inherit update-rc.d