aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/xkbdata.src/compat
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-06 07:51:35 +0000
committermarha <marha@users.sourceforge.net>2010-05-06 07:51:35 +0000
commit118898c84d3dfea814d7f58a08cd4ee4d8123731 (patch)
treed6c528aa9ee55beca5a8787e6041742f0930246c /xorg-server/xkbdata.src/compat
parent0874ae23a16946781dd517cfdb011c691ad0b581 (diff)
downloadvcxsrv-118898c84d3dfea814d7f58a08cd4ee4d8123731.tar.gz
vcxsrv-118898c84d3dfea814d7f58a08cd4ee4d8123731.tar.bz2
vcxsrv-118898c84d3dfea814d7f58a08cd4ee4d8123731.zip
svn merge -r575:HEAD "^/branches/released" .
Diffstat (limited to 'xorg-server/xkbdata.src/compat')
-rw-r--r--xorg-server/xkbdata.src/compat/Makefile.am2
-rw-r--r--xorg-server/xkbdata.src/compat/caps12
-rw-r--r--xorg-server/xkbdata.src/compat/makefile2
3 files changed, 14 insertions, 2 deletions
diff --git a/xorg-server/xkbdata.src/compat/Makefile.am b/xorg-server/xkbdata.src/compat/Makefile.am
index 4e56a2427..54a659eec 100644
--- a/xorg-server/xkbdata.src/compat/Makefile.am
+++ b/xorg-server/xkbdata.src/compat/Makefile.am
@@ -1,7 +1,7 @@
compatdir = $(xkb_base)/compat
dist_compat_DATA = \
-accessx basic complete \
+accessx basic caps complete \
default iso9995 \
japan keypad ledcaps \
lednum ledscroll level5 \
diff --git a/xorg-server/xkbdata.src/compat/caps b/xorg-server/xkbdata.src/compat/caps
new file mode 100644
index 000000000..d787ab63d
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/caps
@@ -0,0 +1,12 @@
+partial xkb_compatibility "caps_lock" {
+ // Keysym Caps_Lock locks Lock modifier.
+ // With this, the keysym Caps_Lock can be used without binding the whole
+ // key to a real modifier.
+ // This is essential when you don't want to use caps lock on the first
+ // level.
+ // This should not have any compatibility issues when used together with
+ // other layouts which don't utilize this capability.
+ interpret Caps_Lock {
+ action = LockMods(modifiers = Lock);
+ };
+};
diff --git a/xorg-server/xkbdata.src/compat/makefile b/xorg-server/xkbdata.src/compat/makefile
index 486ca5541..225163288 100644
--- a/xorg-server/xkbdata.src/compat/makefile
+++ b/xorg-server/xkbdata.src/compat/makefile
@@ -7,7 +7,7 @@ THISDIR=compat
DESTDIR=$(MHMAKECONF)\xorg-server\xkbdata\$(THISDIR)
dist_xkbdata_compat_DATA = \
-accessx basic complete \
+accessx basic caps complete \
default iso9995 \
japan keypad ledcaps \
lednum ledscroll level5 \