Merge remote-tracking branch 'origin/released'

* origin/released:
  Changed file permissions
  dos -> unix

Conflicts:
	libX11/include/X11/Xregion.h
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/StrKeysym.c
	libX11/src/Window.c
	libX11/src/xkb/XKBBind.c
	libX11/src/xkb/XKBGetMap.c
	libX11/src/xkb/XKBSetGeom.c
	libX11/src/xkb/XKBUse.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libXdmcp/Key.c
	libXdmcp/Write.c
	libxcb/src/xcb_windefs.h
	xkbcomp/keycodes.c
	xkbcomp/xkbpath.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/xkeyboard-config/rules/bin/ml1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh
	xorg-server/xkeyboard-config/rules/bin/ml_s.sh
	xorg-server/xkeyboard-config/rules/bin/mln_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlnvn_s.sh
	xorg-server/xkeyboard-config/rules/bin/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

5 files changed, 114 insertions, 114 deletions

diff --git a/xorg-server/xkeyboard-config/compat/README b/xorg-server/xkeyboard-config/compat/README
index ea8750fac..00d591e7b 100644
--- a/xorg-server/xkeyboard-config/compat/README
+++ b/xorg-server/xkeyboard-config/compat/README
@@ -1,33 +1,33 @@
-The core protocol interpretation of keyboard modifiers does not include direct

-support for multiple keyboard groups, so XKB reports the effective keyboard

-group to XKB-aware clients using some of reserved bits in the state field of

-some core protocol events. This modified state field would not be interpreted

-correctly by XKB-unaware clients, so XKB provides a group compatibility mapping

-which remaps the keyboard group into a core modifier mask that has similar

-effects, when possible.

-

-XKB maintains three compatibility state components that are used to make

-XKB-unaware clients(*) work as well as possible:

-- The compatibility state which corresponds to the effective modifier and

-  effective group state.

-- The compatibility lookup state which is the core-protocol equivalent of the

-  lookup state.

-- The compatibility grab state which is the nearest core-protocol equivalent

-  of the grab state.

-

-Compatibility state are essentially the corresponding XKB states, but with

-keyboard group possibly encoded as one or more modifiers. 

-

-Modifiers that correspond to each keyboard group are described in this

-group compatibility map.

-

-

-----

-(*) The implementation of XKB invisibly extends the X library to use the

-keyboard extension if it is present. That means, clients that use library or

-toolkit routines to interpret keyboard events automatically use all of XKB

-features; clients that directly interpret the state field of core protocol

-events or the keymap direcly may be affected by some of the XKB differences.

-Thus most clients can take all advantages without modification but it also

-means that XKB state can be reported to clients that have not explicitly

-requested the keyboard extension.

+The core protocol interpretation of keyboard modifiers does not include direct
+support for multiple keyboard groups, so XKB reports the effective keyboard
+group to XKB-aware clients using some of reserved bits in the state field of
+some core protocol events. This modified state field would not be interpreted
+correctly by XKB-unaware clients, so XKB provides a group compatibility mapping
+which remaps the keyboard group into a core modifier mask that has similar
+effects, when possible.
+
+XKB maintains three compatibility state components that are used to make
+XKB-unaware clients(*) work as well as possible:
+- The compatibility state which corresponds to the effective modifier and
+  effective group state.
+- The compatibility lookup state which is the core-protocol equivalent of the
+  lookup state.
+- The compatibility grab state which is the nearest core-protocol equivalent
+  of the grab state.
+
+Compatibility state are essentially the corresponding XKB states, but with
+keyboard group possibly encoded as one or more modifiers. 
+
+Modifiers that correspond to each keyboard group are described in this
+group compatibility map.
+
+
+----
+(*) The implementation of XKB invisibly extends the X library to use the
+keyboard extension if it is present. That means, clients that use library or
+toolkit routines to interpret keyboard events automatically use all of XKB
+features; clients that directly interpret the state field of core protocol
+events or the keymap direcly may be affected by some of the XKB differences.
+Thus most clients can take all advantages without modification but it also
+means that XKB state can be reported to clients that have not explicitly
+requested the keyboard extension.
diff --git a/xorg-server/xkeyboard-config/compat/caps b/xorg-server/xkeyboard-config/compat/caps
index 03c47151e..d787ab63d 100644
--- a/xorg-server/xkeyboard-config/compat/caps
+++ b/xorg-server/xkeyboard-config/compat/caps
@@ -1,12 +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);

-    };

-};

+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/xkeyboard-config/compat/ledcaps b/xorg-server/xkeyboard-config/compat/ledcaps
index 8e3ad4796..fc3084eec 100644
--- a/xorg-server/xkeyboard-config/compat/ledcaps
+++ b/xorg-server/xkeyboard-config/compat/ledcaps
@@ -1,23 +1,23 @@
-// Use Caps Lock LED to show either Caps Lock, Group, or Shift Lock state

-

-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;

-   };

-};

+// Use Caps Lock LED to show either Caps Lock, Group, or Shift Lock state
+
+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/xorg-server/xkeyboard-config/compat/lednum b/xorg-server/xkeyboard-config/compat/lednum
index 57fb2646e..24a60a595 100644
--- a/xorg-server/xkeyboard-config/compat/lednum
+++ b/xorg-server/xkeyboard-config/compat/lednum
@@ -1,23 +1,23 @@
-// Use Num Lock LED to show either Num Lock, Group, or Shift Lock state

-

-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;

-   };

-};

+// Use Num Lock LED to show either Num Lock, Group, or Shift Lock state
+
+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/xorg-server/xkeyboard-config/compat/ledscroll b/xorg-server/xkeyboard-config/compat/ledscroll
index d51fcfc6f..ca5a82c4c 100644
--- a/xorg-server/xkeyboard-config/compat/ledscroll
+++ b/xorg-server/xkeyboard-config/compat/ledscroll
@@ -1,23 +1,23 @@
-// Use Scroll Lock LED to show either Scroll Lock, Group, or Shift Lock state

-

-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;

-   };

-};

+// Use Scroll Lock LED to show either Scroll Lock, Group, or Shift Lock state
+
+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;
+   };
+};