From 00a3aae9f6acac4c0709e1ea30d49313828a138e Mon Sep 17 00:00:00 2001
From: erik <erik@b9310e46-f624-0410-8ea1-cfbb3a30dc96>
Date: Fri, 15 May 2009 05:58:31 +0000
Subject: =?UTF-8?q?=C3=A4nderungen=20aus=20[ticket:135#comment:22]=20hinzu?=
 =?UTF-8?q?gef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.neo-layout.org@1854 b9310e46-f624-0410-8ea1-cfbb3a30dc96
---
 linux/X/base  |  1 +
 linux/X/de    | 10 +---------
 linux/X/shift | 23 +++++++++++++++++++++++
 3 files changed, 25 insertions(+), 9 deletions(-)

(limited to 'linux/X')

diff --git a/linux/X/base b/linux/X/base
index 1279d18..e87c999 100644
--- a/linux/X/base
+++ b/linux/X/base
@@ -856,6 +856,7 @@
   *			misc:typo 	= +typo(base):4
 
 ! option	=	symbols
+  shift:both_capslock	=	+shift(both_capslock)
   grp:shift_toggle	=	+group(shifts_toggle)
   altwin:menu		=	+altwin(menu)
   altwin:meta_alt	=	+altwin(meta_alt)
diff --git a/linux/X/de b/linux/X/de
index 1343db6..0082dac 100644
--- a/linux/X/de
+++ b/linux/X/de
@@ -254,15 +254,7 @@ xkb_symbols "neo" {
     // Shift
     // --------------------------------------------------------------
     // Shift + Shift = Caps_Lock
-    key.type[Group1] = "TWO_LEVEL";
-    key <LFSH> {
-        symbols[Group1] = [ Shift_L,                       Caps_Lock                ],
-        actions[Group1] = [ SetMods(modifiers=Shift),      LockMods(modifiers=Lock) ]
-    };
-    key <RTSH> {
-        symbols[Group1] = [ Shift_R,                       Caps_Lock                ],
-        actions[Group1] = [ SetMods(modifiers=Shift),      LockMods(modifiers=Lock) ]
-    };
+    include "shift(both_capslock)"
 
     // Neo-Mod3
     // --------------------------------------------------------------
diff --git a/linux/X/shift b/linux/X/shift
index eb7533f..1edf13a 100644
--- a/linux/X/shift
+++ b/linux/X/shift
@@ -17,3 +17,26 @@ xkb_symbols "breaks_caps" {
 	]
     };
 };
+
+partial modifier_keys
+xkb_symbols "lshift_both_capslock" {
+  key <LFSH> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1] = [ Shift_L,                       Caps_Lock                ],
+    actions[Group1] = [ SetMods(modifiers=Shift),      LockMods(modifiers=Lock) ]
+  };
+};
+
+partial modifier_keys
+xkb_symbols "rshift_both_capslock" {
+  key <RTSH> {
+    type[Group1]="TWO_LEVEL",
+    symbols[Group1] = [ Shift_R,                       Caps_Lock                ],
+    actions[Group1] = [ SetMods(modifiers=Shift),      LockMods(modifiers=Lock) ]
+  };
+};
+partial modifier_keys
+xkb_symbols "both_capslock" {
+  include "shift(lshift_both_capslock)"
+  include "shift(rshift_both_capslock)"
+};
-- 
cgit v1.2.3