summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruser <user@Nokia-N810-23-14.(none)>2008-09-19 10:20:20 +0100
committeruser <user@Nokia-N810-23-14.(none)>2008-09-19 10:20:20 +0100
commit710752e4be4137730d49614af411ba99b37992cc (patch)
tree9a5b41b308f768bc886a26025a53cd879887c791
parent1e917a4483c12ae29d89972a3669a7d5d1343313 (diff)
downloadxkeyboard-config-710752e4be4137730d49614af411ba99b37992cc.tar.gz
xkeyboard-config-710752e4be4137730d49614af411ba99b37992cc.tar.bz2
xkeyboard-config-710752e4be4137730d49614af411ba99b37992cc.zip
fixed evdev for abnt2 and jp106
-rw-r--r--ChangeLog5
-rw-r--r--keycodes/evdev8
-rw-r--r--symbols/inet2
3 files changed, 11 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 304e5915..d08bd267 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-19 Sergey Udaltsov
+
+ * keycodes/evdev, symbols/inet: fixed evdev for abnt2 and jp106
+ http://bugs.freedesktop.org/show_bug.cgi?id=17656
+
2008-09-18 Sergey Udaltsov
* rules/base.o_s.part, rules/base.xml.in: more mismatches fixed,
diff --git a/keycodes/evdev b/keycodes/evdev
index 2c4e4cd6..673a967e 100644
--- a/keycodes/evdev
+++ b/keycodes/evdev
@@ -147,14 +147,14 @@ default xkb_keycodes "evdev" {
<HZTG> = 93; // Hankaku/Zenkakau toggle
<HKTG> = 101; // Hiragana/Katakana toggle
- <AB11> = 211; // backslash/underscore
+ <AB11> = 97; // backslash/underscore
<HENK> = 100; // Henkan
<MUHE> = 102; // Muhenkan
<AE13> = 132; // Yen
<KATA> = 98; // Katakana
<HIRA> = 99; // Hiragana
<JPCM> = 103; // KPJPComma
- <RO> = 97; // Romaji
+ //<RO> = 97; // Romaji
// Keys that are generated on Korean keyboards
@@ -235,7 +235,7 @@ default xkb_keycodes "evdev" {
<I208> = 208; // #define KEY_PLAYCD 200
<I209> = 209; // #define KEY_PAUSECD 201
<I210> = 210; // #define KEY_PROG3 202
- //<I211> = 211; // #define KEY_PROG4 203 conflicts with AB11
+ <I211> = 211; // #define KEY_PROG4 203 conflicts with AB11
<I213> = 213; // #define KEY_SUSPEND 205
<I214> = 214; // #define KEY_CLOSE 206
<I215> = 215; // #define KEY_PLAY 207
@@ -304,6 +304,8 @@ default xkb_keycodes "evdev" {
// For japanese 106 keyboard.
xkb_keycodes "jp106" {
include "evdev(evdev)"
+ <HZTG> = 49;
+ <AC12> = 51;
};
// For brazilian ABNT2 keyboard.
diff --git a/symbols/inet b/symbols/inet
index b243af7a..54ec2418 100644
--- a/symbols/inet
+++ b/symbols/inet
@@ -126,7 +126,7 @@ xkb_symbols "evdev" {
key <I208> { [ XF86AudioPlay ] };
key <I209> { [ XF86AudioPause ] };
key <I210> { [ XF86Launch3 ] };
- key <AB11> { [ XF86Launch4 ] };
+ key <I211> { [ XF86Launch4 ] };
key <I213> { [ XF86Standby ] };
key <I214> { [ XF86Close ] };
key <I215> { [ XF86AudioPlay ] };