diff options
author | marha <marha@users.sourceforge.net> | 2009-07-24 18:07:33 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2009-07-24 18:07:33 +0000 |
commit | a16c0d6f73877af35ea0519917a82d5919e3c304 (patch) | |
tree | b575998554afa00acc1086ff0a5ef17785c75326 /xorg-server/xkbdata.src/keycodes/evdev | |
parent | 0489d8cc5cc2f0bbdbee7aa2ed771ca0d42f30aa (diff) | |
parent | ea63f0fae5c393ccf198aad0ae4dbda6d2a4391a (diff) | |
download | vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.tar.gz vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.tar.bz2 vcxsrv-a16c0d6f73877af35ea0519917a82d5919e3c304.zip |
svn merge file:///D:/svnrepos/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/keycodes/evdev')
-rw-r--r-- | xorg-server/xkbdata.src/keycodes/evdev | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/xorg-server/xkbdata.src/keycodes/evdev b/xorg-server/xkbdata.src/keycodes/evdev index 673a967e6..d6963a2d5 100644 --- a/xorg-server/xkbdata.src/keycodes/evdev +++ b/xorg-server/xkbdata.src/keycodes/evdev @@ -36,6 +36,7 @@ default xkb_keycodes "evdev" { <AD11> = 34; <AD12> = 35; <BKSL> = 51; + alias <AC12> = <BKSL>; <RTRN> = 36; <CAPS> = 66; @@ -145,7 +146,8 @@ default xkb_keycodes "evdev" { // Keys that are generated on Japanese keyboards - <HZTG> = 93; // Hankaku/Zenkakau toggle + //<HZTG> = 93; // Hankaku/Zenkakau toggle - not actually used + alias <HZTG> = <TLDE>; <HKTG> = 101; // Hiragana/Katakana toggle <AB11> = 97; // backslash/underscore <HENK> = 100; // Henkan @@ -270,7 +272,7 @@ default xkb_keycodes "evdev" { <I244> = 244; // #define KEY_BATTERY 236 <I245> = 245; // #define KEY_BLUETOOTH 237 <I246> = 246; // #define KEY_WLAN 238 - <I247> = 247; // (not defined in input.h) 239 + <I247> = 247; // #define KEY_UWB 239 <I248> = 248; // #define KEY_UNKNOWN 240 <I249> = 249; // #define KEY_VIDEO_NEXT 241 <I250> = 250; // #define KEY_VIDEO_PREV 242 @@ -299,18 +301,9 @@ default xkb_keycodes "evdev" { indicator 11 = "Charging"; alias <ALGR> = <RALT>; -}; -// For japanese 106 keyboard. -xkb_keycodes "jp106" { - include "evdev(evdev)" - <HZTG> = 49; - <AC12> = 51; -}; - -// For brazilian ABNT2 keyboard. -xkb_keycodes "abnt2" { - include "evdev(evdev)" + // For Brazilian ABNT2 + alias <KPPT> = <I129>; }; // PC98 |