reorganizing indicators, thanks to Frank Murphy

8 files changed, 83 insertions, 64 deletions

diff --git a/compat/Makefile.am b/compat/Makefile.am
index b667bd14..01e56a18 100644
--- a/compat/Makefile.am
+++ b/compat/Makefile.am
@@ -1,9 +1,10 @@
 compat_DATA = \
 accessx basic complete \
-default group_led iso9995 \
-japan keypad leds \
+default iso9995 \
+japan keypad ledcaps \
+lednum ledscroll \
 misc mousekeys norepeat \
-pc pc98 xfree86 \
+pc pc98 xfree86 capsled \
 xtest README
                                                                                           
 EXTRA_DIST= $(compat_DATA)
diff --git a/compat/basic b/compat/basic
index f369b0be..8f99c7b7 100644
--- a/compat/basic
+++ b/compat/basic
@@ -42,18 +42,11 @@ default xkb_compatibility "basic"  {
     group 3 = AltGr;
     group 4 = AltGr;
 
-    indicator.allowExplicit= False;
-    indicator "Caps Lock" { 
-	whichModState= Locked;
-	modifiers= Lock;
-    };
-    indicator "Num Lock" {
-	whichModState= Locked;
-	modifiers= NumLock;
-    };
+    include "ledcaps"
+    include "lednum"
     indicator "Shift Lock" {
+	!allowExplicit;
 	whichModState= Locked;
 	modifiers= Shift;
     };
-    indicator.allowExplicit= True;
 };
diff --git a/compat/group_led b/compat/group_led
deleted file mode 100644
index 0805fa6a..00000000
--- a/compat/group_led
+++ /dev/null
@@ -1,22 +0,0 @@
-// $XFree86: xc/programs/xkbcomp/compat/group_led,v 1.1.2.2 1999/07/22 14:21:30 hohndel Exp $
-// This is a "default" compatibility with a small modification:
-// an "Scroll Lock" LED now shows the active keyboard group
-default xkb_compatibility "group_led"  {
-    include "basic"
-    augment "mousekeys"
-    augment "accessx(basic)"
-    augment "misc"
-    augment "iso9995"
-    augment "japan"
-//  This is to make Mode_switch working even in group 2
-    virtual_modifiers AltGr;
-    interpret Mode_switch {
-	useModMapMods= level1;
-	virtualModifier= AltGr;
-	action= SetGroup(group=+1);
-    };
-    indicator "Scroll Lock" {
-	allowExplicit;
-        groups= All-Group1;
-    };
-};
diff --git a/compat/ledcaps b/compat/ledcaps
new file mode 100644
index 00000000..d52eb2fa
--- /dev/null
+++ b/compat/ledcaps
@@ -0,0 +1,25 @@
+// Use Caps Lock LED to show either Caps Lock, Group, or Shift Lock state
+//
+// $Xorg: $
+
+default partial xkb_compatibility "caps_lock"   {
+   indicator "Caps Lock" {
+       !allowExplicit;
+       whichModState= Locked;
+       modifiers= Lock;
+   };
+};
+
+partial xkb_compatibility "group_lock"   {
+   indicator "Caps Lock" {
+       modifiers= None;
+       groups=All-group1;
+   };
+};
+
+partial xkb_compatibility "shift_lock"   {
+   indicator "Caps Lock" {
+       whichModState= Locked;
+       modifiers= Shift;
+   };
+};
diff --git a/compat/lednum b/compat/lednum
new file mode 100644
index 00000000..e87f52b4
--- /dev/null
+++ b/compat/lednum
@@ -0,0 +1,25 @@
+// Use Num Lock LED to show either Num Lock, Group, or Shift Lock state
+//
+// $Xorg: $
+
+default partial xkb_compatibility "num_lock"   {
+    indicator "Num Lock" {
+       !allowExplicit;
+       whichModState= Locked;
+       modifiers= NumLock;
+   };
+};
+
+partial xkb_compatibility "group_lock"   {
+   indicator "Num Lock" {
+       modifiers= None;
+       groups=All-group1;
+   };
+};
+
+partial xkb_compatibility "shift_lock"   {
+   indicator "Num Lock" {
+       whichModState= Locked;
+       modifiers= Shift;
+   };
+};
diff --git a/compat/leds b/compat/leds
deleted file mode 100644
index 3d616063..00000000
--- a/compat/leds
+++ /dev/null
@@ -1,24 +0,0 @@
-// Use keyboard LEDs to show alternative group
-//
-// $XFree86$
-
-partial xkb_compatibility "scroll" {
-   indicator "Scroll Lock" {
-       modifiers= None;
-       groups=All-group1;
-   };
-};
-
-partial xkb_compatibility "num"    {
-   indicator "Num Lock" {
-       modifiers= None;
-       groups=All-group1;
-   };
-};
-
-partial xkb_compatibility "caps"   {
-   indicator "Caps Lock" {
-       modifiers= None;
-       groups=All-group1;
-   };
-};
diff --git a/compat/ledscroll b/compat/ledscroll
new file mode 100644
index 00000000..9190884b
--- /dev/null
+++ b/compat/ledscroll
@@ -0,0 +1,25 @@
+// Use Scroll Lock LED to show either Scroll Lock, Group, or Shift Lock state
+//
+// $Xorg: $
+
+default partial xkb_compatibility "scroll_lock"   {
+   indicator "Scroll Lock" {
+       allowExplicit;
+       whichModState= Locked;
+       modifiers= ScrollLock;
+   };
+};
+
+partial xkb_compatibility "group_lock"   {
+   indicator "Scroll Lock" {
+       modifiers= None;
+       groups=All-group1;
+   };
+};
+
+partial xkb_compatibility "shift_lock"   {
+   indicator "Scroll Lock" {
+       whichModState= Locked;
+       modifiers= Shift;
+   };
+};
diff --git a/compat/misc b/compat/misc
index e1dbfd54..6bb67602 100644
--- a/compat/misc
+++ b/compat/misc
@@ -113,9 +113,5 @@ default partial xkb_compatibility "misc"  {
 	action = LockMods(modifiers=modMapMods);
     };
 
-    indicator "Scroll Lock" {
-	allowExplicit;
-	whichModState= Locked;
-	modifiers= ScrollLock;
-    };
+    include "ledscroll"
 };