aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkbdata.src/symbols/inet
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-09-20 20:25:03 +0000
committermarha <marha@users.sourceforge.net>2009-09-20 20:25:03 +0000
commit6341b97eda007223acfe2f7a64dc2c5718867e0a (patch)
tree1793a3e7cda31b9455df3106b60cc01a096b43f7 /xorg-server/xkbdata.src/symbols/inet
parent650fd857a97752ff5ff8b1654ec78b813b78d9c2 (diff)
parentf3d88db0960f1c23e55f2529764b096ac92d78d9 (diff)
downloadvcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.tar.gz
vcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.tar.bz2
vcxsrv-6341b97eda007223acfe2f7a64dc2c5718867e0a.zip
svn merge https://vcxsrv.svn.sourceforge.net/svnroot/vcxsrv/branches/released .
Diffstat (limited to 'xorg-server/xkbdata.src/symbols/inet')
-rw-r--r--xorg-server/xkbdata.src/symbols/inet13
1 files changed, 11 insertions, 2 deletions
diff --git a/xorg-server/xkbdata.src/symbols/inet b/xorg-server/xkbdata.src/symbols/inet
index a159021f8..7300e76da 100644
--- a/xorg-server/xkbdata.src/symbols/inet
+++ b/xorg-server/xkbdata.src/symbols/inet
@@ -122,7 +122,7 @@ xkb_symbols "evdev" {
// key <I120> { [ ] }; // KEY_MACRO
key <I126> { [ plusminus ] };
- key <I129> { [ KP_Separator ] };
+ key <I129> { [ KP_Decimal ] };
key <I147> { [ XF86MenuKB ] };
key <I148> { [ XF86Calculator ] };
// key <I149> { [ ] }; // KEY_SETUP
@@ -174,7 +174,7 @@ xkb_symbols "evdev" {
key <I213> { [ XF86Suspend ] };
key <I214> { [ XF86Close ] };
key <I215> { [ XF86AudioPlay ] };
- key <I216> { [ XF86Forward ] };
+ key <I216> { [ XF86AudioForward ] };
// key <I217> { [ ] }; // KEY_BASSBOOST
key <I218> { [ Print ] };
// key <I219> { [ ] }; // KEY_HP
@@ -1797,6 +1797,15 @@ xkb_symbols "unitekkb1925" {
key <I1A> { [ XF86Reload ] };
};
+// Creative
+
+// Creative Desktop Wireless 7000
+partial alphanumeric_keys
+xkb_symbols "creativedw7000" {
+ include "inet(media_nav_acpi_common)"
+ key <I66> { [ XF86Pictures ] };
+};
+
// Compal
// Compal FL90