From 118898c84d3dfea814d7f58a08cd4ee4d8123731 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 6 May 2010 07:51:35 +0000 Subject: svn merge -r575:HEAD "^/branches/released" . --- xorg-server/xkbdata.src/compat/Makefile.am | 2 +- xorg-server/xkbdata.src/compat/caps | 12 ++++++++++++ xorg-server/xkbdata.src/compat/makefile | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 xorg-server/xkbdata.src/compat/caps (limited to 'xorg-server/xkbdata.src/compat') 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 \ -- cgit v1.2.3