diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-12 08:32:17 +0100 |
| commit | 285bce5f59c5466a6fd1e3af601daa7cce066ea4 (patch) | |
| tree | e1a9205dd5acd2c0ef7dc8a20ec3fac3a3aecf7f /xorg-server/xkeyboard-config/compat | |
| parent | f7eb7329c8efe023b304d5e66b08d1a998973220 (diff) | |
| parent | b91444584a64f4f7b3eaeee05ef36ac53691fb24 (diff) | |
| download | vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.gz vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.tar.bz2 vcxsrv-285bce5f59c5466a6fd1e3af601daa7cce066ea4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/src/OpenDis.c
libX11/src/xcb_io.c
xorg-server/xkeyboard-config/keymap/sun_vndr/all.in
xorg-server/xkeyboard-config/semantics/default.in
Diffstat (limited to 'xorg-server/xkeyboard-config/compat')
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/Makefile.am | 4 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/keypad | 58 | ||||
| -rw-r--r-- | xorg-server/xkeyboard-config/compat/norepeat | 9 |
3 files changed, 2 insertions, 69 deletions
diff --git a/xorg-server/xkeyboard-config/compat/Makefile.am b/xorg-server/xkeyboard-config/compat/Makefile.am index 54a659eec..2be8154a2 100644 --- a/xorg-server/xkeyboard-config/compat/Makefile.am +++ b/xorg-server/xkeyboard-config/compat/Makefile.am @@ -3,9 +3,9 @@ compatdir = $(xkb_base)/compat dist_compat_DATA = \ accessx basic caps complete \ default iso9995 \ -japan keypad ledcaps \ +japan ledcaps \ lednum ledscroll level5 \ -misc mousekeys norepeat \ +misc mousekeys \ olpc pc pc98 xfree86 \ xtest README diff --git a/xorg-server/xkeyboard-config/compat/keypad b/xorg-server/xkeyboard-config/compat/keypad deleted file mode 100644 index f28ca1497..000000000 --- a/xorg-server/xkeyboard-config/compat/keypad +++ /dev/null @@ -1,58 +0,0 @@ -// Interpretations needed to implement the numeric keypad
-// as an overlay instead of a modifier.
-
-partial hidden xkb_compatibility "overlay" {
- include "keypad(overlay1)"
-};
-partial hidden xkb_compatibility "overlay1" {
- virtual_modifiers NumLock,AltGr;
-
- interpret.repeat= False;
- setMods.clearLocks= True;
- latchMods.clearLocks= True;
- latchMods.latchToLock= True;
-
- interpret Num_Lock {
- virtualModifier= NumLock;
- action= LockControls(ctrls=overlay1);
- };
- interpret Num_Lock+Any {
- virtualModifier= NumLock;
- action= LockControls(ctrls=overlay1);
- };
-
- indicator.allowExplicit= True;
- indicator.driveskbd= True;
- replace indicator "Num Lock" {
- whichModState= Locked;
- modifiers= NumLock;
- controls= Overlay1;
- };
- indicator.allowExplicit= True;
-};
-partial hidden xkb_compatibility "overlay2" {
- virtual_modifiers NumLock,AltGr;
-
- interpret.repeat= False;
- setMods.clearLocks= True;
- latchMods.clearLocks= True;
- latchMods.latchToLock= True;
-
- interpret Num_Lock {
- virtualModifier= NumLock;
- action= LockControls(ctrls=overlay2);
- };
- interpret Num_Lock+Any {
- virtualModifier= NumLock;
- action= LockControls(ctrls=overlay1);
- };
-
- indicator.allowExplicit= True;
- indicator.driveskbd= True;
- replace indicator "Num Lock" {
- whichModState= Locked;
- modifiers= NumLock;
- controls= Overlay2;
- };
- indicator.allowExplicit= True;
-};
diff --git a/xorg-server/xkeyboard-config/compat/norepeat b/xorg-server/xkeyboard-config/compat/norepeat deleted file mode 100644 index 1f47d7e17..000000000 --- a/xorg-server/xkeyboard-config/compat/norepeat +++ /dev/null @@ -1,9 +0,0 @@ -// Put any otherwise normal keys that you don't want to repeat in
-// this file
-
-default partial xkb_compatibility "norepeat" {
- interpret Return {
- action= NoAction();
- repeat= False;
- };
-};
|