[Xorg-commit] xc/programs/xkbcomp/symbols group,1.1.4.1,1.1.4.2 hr,1.1.4.1,1.1.4.2 inet,1.1.4.1,1.1.4.2
Kaleb Keithley
xorg-commit at pdx.freedesktop.org
Wed May 9 17:30:30 EEST 2007
Committed by: kaleb
Update of /cvs/xorg/xc/programs/xkbcomp/symbols
In directory pdx:/home/kaleb/xorg/xc.XORG-CURRENT/programs/xkbcomp/symbols
Modified Files:
Tag: XORG-CURRENT
group hr inet
Log Message:
merge most of XFree86 RC3 (4.3.99.903) from vendor branch.
bug #214
Index: group
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/symbols/group,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/group 17 Nov 2003 19:04:09 -0000 1.1.4.1
+++ b/group 23 Feb 2004 21:37:59 -0000 1.1.4.2
@@ -2,7 +2,7 @@
// using the group(switch) map, the right alt key temporarily chooses
// the second keyboard group (until it is released).
//
-// $XFree86: xc/programs/xkbcomp/symbols/group,v 3.8 2003/01/20 03:48:39 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/group,v 3.9 2003/12/30 13:26:25 pascal Exp $
partial modifier_keys
xkb_symbols "switch" {
key <RALT> {
@@ -109,6 +109,13 @@
key <CAPS> { [ ISO_Next_Group, Caps_Lock ] };
};
+// using the group(shift_caps_toggle) map, pressing:
+// Shift+Caps Lock toggles group
+partial modifier_keys
+xkb_symbols "shift_caps_toggle" {
+ key <CAPS> { [ Caps_Lock, ISO_Next_Group ] };
+};
+
// using the group(ctrl_alt_toggle) map, pressing:
// Control_L+Alt_L locks the previous group
// Control_R+Alt_R locks the next group
Index: hr
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/symbols/hr,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/hr 26 Nov 2003 22:49:11 -0000 1.1.4.1
+++ b/hr 23 Feb 2004 21:37:59 -0000 1.1.4.2
@@ -6,11 +6,12 @@
//
// Changelog
// =========
+// 2003-04-11 Fixes from joy (AltGr+, i AltGr+.)
// 2003-04-03 Added <KPDL> (Delete/Separator)
// 2000-02-06 Initial version
//
// xc/programs/xkbcomp/symbols/hr
-// $XFree86: xc/programs/xkbcomp/symbols/hr,v 1.2 2003/04/13 18:22:19 dawes Exp $
+// $XFree86: xc/programs/xkbcomp/symbols/hr,v 1.3 2003/12/31 06:06:29 dawes Exp $
default partial alphanumeric_keys
xkb_symbols "basic" {
@@ -84,9 +85,10 @@
[ braceright ] };
key <AB07> { [ m, M ],
[ section ] };
- key <AB08> { [ comma, semicolon ] };
+ key <AB08> { [ comma, semicolon ],
+ [ less ] };
key <AB09> { [ period, colon ],
- [ periodcentered ] };
+ [ greater ] };
key <AB10> { [ minus, underscore ] };
key <BKSL> { [ zcaron, Zcaron ],
[ currency ] };
Index: inet
===================================================================
RCS file: /cvs/xorg/xc/programs/xkbcomp/symbols/inet,v
retrieving revision 1.1.4.1
retrieving revision 1.1.4.2
diff -u -d -r1.1.4.1 -r1.1.4.2
--- a/inet 26 Nov 2003 22:49:11 -0000 1.1.4.1
+++ b/inet 23 Feb 2004 21:38:00 -0000 1.1.4.2
@@ -1,4 +1,4 @@
- // $XFree86: xc/programs/xkbcomp/symbols/inet,v 1.35 2003/10/14 13:41:19 pascal Exp $
+ // $XFree86: xc/programs/xkbcomp/symbols/inet,v 1.38 2004/01/17 14:59:37 pascal Exp $
// EAK (Easy Access, Internet, Multimedia, PDA) keyboards
// Copyright (C) 2002 Stanislav Brabec <sbrabec at suse.cz>
@@ -38,6 +38,32 @@
key <I5E> { [ XF86PowerOff ] };
};
+// Azona
+
+partial alphanumeric_keys
+xkb_symbols "azonaRF2300" {
+ // From Radics Laszlo <garaboncias at mailbox.hu>
+ name[Group1]= "Azona RF2300 wireless Internet Keyboard";
+
+ key <I02> { [ XF86WWW ] };
+ key <I17> { [ XF86AudioStop ] };
+ key <I1E> { [ XF86AudioRaiseVolume ] };
+ key <I1F> { [ XF86AudioPlay, XF86AudioPause ] };
+ key <I21> { [ XF86Calculator ] };
+ key <I22> { [ XF86AudioNext ] };
+ key <I24> { [ XF86AudioPrev ] };
+ key <I25> { [ XF86AudioLowerVolume ] };
+ key <I26> { [ XF86AudioMute ] };
+ key <I3C> { [ XF86Copy ] };
+ key <I5F> { [ XF86Standby ] };
+ key <I65> { [ XF86Search ] };
+ key <I66> { [ XF86Favorites ] };
+ key <I69> { [ XF86Forward ] };
+ key <I6A> { [ XF86Back ] };
+ key <I6C> { [ XF86Mail ] };
+ key <I78> { [ XF86Cut ] };
+// key <RCTL> { [ XF86Paste ] };
+};
// ACPI Standard
@@ -533,6 +559,38 @@
key <I63> { [ XF86WakeUp ] };
};
+// DTK
+
+partial alphanumeric_keys
+xkb_symbols "dtk2000" {
+ // From Radics Laszlo <garaboncias at mailbox.hu>
+ // Describes the extra keys on a DTK2000 Internet keyboard.
+
+ name[Group1]= "DTK2000";
+ key <I10> { [ XF86AudioPrev ] };
+ key <I19> { [ XF86AudioNext ] };
+ key <I20> { [ XF86AudioMute ] };
+ key <I2E> { [ XF86AudioLowerVolume ] };
+ key <I21> { [ XF86Calculator ] };
+ key <I22> { [ XF86AudioPlay, XF86AudioPause ] };
+ key <I24> { [ XF86AudioStop ] };
+ key <I30> { [ XF86AudioRaiseVolume ] };
+ key <I32> { [ XF86HomePage ] };
+ key <I5E> { [ XF86PowerOff ] };
+ key <I5F> { [ XF86Sleep ] };
+ key <I63> { [ XF86WakeUp ] };
+ key <I65> { [ XF86Search ] };
+ key <I66> { [ XF86Favorites ] };
+ key <I67> { [ XF86Refresh ] };
+ key <I68> { [ XF86Stop ] };
+ key <I69> { [ XF86Forward ] };
+ key <I6A> { [ XF86Back ] };
+ key <I6B> { [ XF86MyComputer ] };
+ key <I6C> { [ XF86Mail ] };
+ key <I6D> { [ XF86AudioMedia ] };
+};
+
+
// Ennyah
partial alphanumeric_keys
@@ -585,6 +643,36 @@
key <I63> { [ XF86WakeUp ] };
};
+partial alphanumeric_keys
+xkb_symbols "geniuscomfy2" {
+ // From Radics Laszlo <garaboncias at mailbox.hu>
+ // Describes the extra keys on a Genius Comfy KB-21e-Scroll
+
+ name[Group1]= "GeniusComfy21e";
+
+ key <I10> { [ XF86AudioPrev ] };
+ key <I13> { [ XF86Word ] };
+ key <I14> { [ XF86Excel ] };
+ key <I19> { [ XF86AudioNext ] };
+ key <I20> { [ XF86AudioMute ] };
+ key <I2E> { [ XF86AudioLowerVolume ] };
+ key <I21> { [ XF86Calculator ] };
+ key <I22> { [ XF86AudioPlay, XF86AudioPause ] };
+ key <I23> { [ Return ] };
+ key <I24> { [ XF86AudioStop ] };
+ key <I30> { [ XF86AudioRaiseVolume ] };
+ key <I32> { [ XF86HomePage ] };
+ key <I5F> { [ XF86Sleep ] };
+ key <I65> { [ XF86Search ] };
+ key <I66> { [ XF86Favorites ] };
+ key <I67> { [ XF86Refresh ] };
+ key <I68> { [ XF86Stop ] };
+ key <I69> { [ XF86Forward ] };
+ key <I6A> { [ XF86Back ] };
+ key <I6B> { [ XF86MyComputer ] };
+ key <I6C> { [ XF86Mail ] };
+ key <I6D> { [ XF86AudioMedia ] };
+};
// Hewlett-Packard
@@ -944,6 +1032,37 @@
key <I66> { [ XF86Go ] };
};
+partial alphanumeric_keys
+xkb_symbols "logiaccess" {
+ name[Group1]= "Logitech Access Keyboard";
+
+ key <I20> { [ XF86AudioMute ] };
+ key <I6D> { [ XF86AudioMedia ] };
+ key <I2E> { [ XF86AudioLowerVolume ] };
+ key <I30> { [ XF86AudioRaiseVolume ] };
+ key <I22> { [ XF86AudioPlay, XF86AudioPause ] };
+ key <I24> { [ XF86AudioStop ] };
+ key <I10> { [ XF86AudioPrev ] };
+ key <I19> { [ XF86AudioNext ] };
+
+ key <I5F> { [ XF86Standby ] };
+ key <I6C> { [ XF86Mail ] };
+ key <I11> { [ XF86Messenger ] };
+ key <I12> { [ XF86WebCam ] };
+
+ key <I32> { [ XF86HomePage ] };
+
+ key <I3B> { [ XF86New ] };
+ key <I3C> { [ XF86Reply ] };
+ key <K62> { [ XF86MailForward ] };
+ key <K63> { [ XF86Send ] };
+
+ key <I43> { [ XF86MyComputer ] };
+ key <I44> { [ XF86Documents ] };
+ key <I57> { [ XF86Pictures ] };
+ key <I58> { [ XF86Music ] };
+};
+
partial alphanumeric_keys
xkb_symbols "logicdp" {
name[Group1]= "Logitech Cordless Desktop Pro";
@@ -1411,6 +1530,49 @@
key <I70> { [ Redo ] };
};
+partial alphanumeric_keys
+xkb_symbols "microsoftmult" {
+ name[Group1]= "Microsoft Wireless Multimedia Keyboard 1.0A";
+
+// My Computer Section -- Left Side
+ key <I80> { [ XF86Documents ] };
+ key <I64> { [ XF86Pictures ] };
+ key <I3C> { [ XF86Music ] };
+
+// Multimedia Section -- Centre
+ key <I20> { [ XF86AudioMute ] };
+ key <I22> { [ XF86AudioPlay, XF86AudioPause ] };
+ key <I24> { [ XF86AudioStop ] };
+ key <I30> { [ XF86AudioRaiseVolume ] };
+ key <I2E> { [ XF86AudioLowerVolume ] };
+ key <I10> { [ XF86AudioPrev ] };
+ key <I19> { [ XF86AudioNext ] };
+ key <I6D> { [ XF86AudioMedia ] };
+
+// Internet Section -- Right Side
+ key <I6C> { [ XF86Mail ] };
+ key <I32> { [ XF86HomePage ] };
+ key <AE13> { [ XF86Messenger ] };
+
+// Control Section -- Far Right
+ key <I21> { [ XF86Calculator ] };
+ key <I16> { [ XF86LogOff ] };
+ key <I5F> { [ XF86Sleep ] };
+
+// F-Locked Function keys
+ key <I3B> { [ Help ] };
+ key <I08> { [ Undo ] };
+ key <I07> { [ Redo ] };
+ key <FK14> { [ XF86New ] };
+ key <FK15> { [ XF86Open ] };
+ key <FK16> { [ XF86Close ] };
+ key <FK17> { [ XF86Reply ] };
+ key <I42> { [ XF86Forward ] };
+ key <I43> { [ XF86Send ] };
+ key <I23> { [ XF86Spell ] };
+ key <I57> { [ XF86Save ] };
+ key <I58> { [ Print ] };
+};
// Oretec
More information about the xorg-commit
mailing list