From 710752e4be4137730d49614af411ba99b37992cc Mon Sep 17 00:00:00 2001
From: user <user@Nokia-N810-23-14.(none)>
Date: Fri, 19 Sep 2008 10:20:20 +0100
Subject: [PATCH] fixed evdev for abnt2 and jp106

---
 ChangeLog      | 5 +++++
 keycodes/evdev | 8 +++++---
 symbols/inet   | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 304e591..d08bd26 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 2c4e4cd..673a967 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 b243af7..54ec241 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         ]       };
-- 
2.32.0.93.g670b81a890