xkbdesc/compat Makefile.am, 1.1, 1.2 basic, 1.1, 1.2 group_led, 1.1, NONE ledcaps, NONE, 1.1 lednum, NONE, 1.1 leds, 1.1, NONE ledscroll, NONE, 1.1 misc, 1.1, 1.2

[Sergey V. Oudaltsov]

Committed by: svu

Update of /cvs/xlibs/xkbdesc/compat
In directory gabe:/tmp/cvs-serv14530/compat

Modified Files:
	Makefile.am basic misc 
Added Files:
	ledcaps lednum ledscroll 
Removed Files:
	group_led leds 
Log Message:
reorganizing indicators, thanks to Frank Murphy

Index: Makefile.am
===================================================================
RCS file: /cvs/xlibs/xkbdesc/compat/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am	10 Apr 2004 02:08:51 -0000	1.1
+++ Makefile.am	4 Sep 2004 21:39:34 -0000	1.2
@@ -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)

Index: basic
===================================================================
RCS file: /cvs/xlibs/xkbdesc/compat/basic,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- basic	10 Apr 2004 02:08:51 -0000	1.1
+++ basic	4 Sep 2004 21:39:34 -0000	1.2
@@ -42,18 +42,11 @@
     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;
 };

--- group_led DELETED ---

--- NEW FILE: ledcaps ---
// 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;
   };
};

--- NEW FILE: lednum ---
// 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;
   };
};

--- leds DELETED ---

--- NEW FILE: ledscroll ---
// 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;
   };
};

Index: misc
===================================================================
RCS file: /cvs/xlibs/xkbdesc/compat/misc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- misc	10 Apr 2004 02:08:51 -0000	1.1
+++ misc	4 Sep 2004 21:39:34 -0000	1.2
@@ -113,9 +113,5 @@
 	action = LockMods(modifiers=modMapMods);
     };
 
-    indicator "Scroll Lock" {
-	allowExplicit;
-	whichModState= Locked;
-	modifiers= ScrollLock;
-    };
+    include "ledscroll"
 };