Merge remote-tracking branch 'origin/released'

Conflicts:
	fontconfig/.gitignore
	libX11/src/ConvSel.c
	libX11/src/CrGlCur.c
	libX11/src/CrWindow.c
	libX11/src/GetDflt.c
	libX11/src/Window.c
	libX11/src/xlibi18n/XimProto.h
	libX11/src/xlibi18n/lcDynamic.c
	libxcb/src/.gitignore
	libxcb/src/xcb_ext.c
	libxcb/src/xcb_xid.c
	mesalib/src/glsl/.gitignore
	mesalib/src/glsl/glcpp/.gitignore
	mesalib/src/mapi/glapi/gen/glX_API.xml
	mesalib/src/mapi/glapi/glapi_getproc.c
	mesalib/src/mesa/main/.gitignore
	mesalib/src/mesa/main/syncobj.c
	mesalib/src/mesa/program/.gitignore
	xkbcomp/listing.c
	xkbcomp/xkbpath.c
	xorg-server/.gitignore
	xorg-server/Xext/xvmain.c
	xorg-server/dix/dispatch.c
	xorg-server/hw/xwin/glx/winpriv.h
	xorg-server/hw/xwin/winprefsyacc.y
	xorg-server/hw/xwin/winscrinit.c
	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/mlv_s.sh
	xorg-server/xkeyboard-config/rules/compat/.gitignore

1 files changed, 202 insertions, 202 deletions

diff --git a/xorg-server/xkeyboard-config/compat/mousekeys b/xorg-server/xkeyboard-config/compat/mousekeys
index bdd3d7c5d..f60c756c4 100644
--- a/xorg-server/xkeyboard-config/compat/mousekeys
+++ b/xorg-server/xkeyboard-config/compat/mousekeys
@@ -1,202 +1,202 @@
-// Interpretations for arrow keys and a bunch of other 

-// common keysyms which make it possible to bind "mouse" 

-// keys using xmodmap and activate or deactivate them 

-// from the keyboard.

-

-default partial xkb_compatibility "mousekeys" {

-

-    // Keypad actions.

-    //

-    interpret.repeat= True;

-

-    interpret KP_1 { 

-	action = MovePtr(x=-1,y= +1); 

-    };

-    interpret KP_End { 

-	action = MovePtr(x=-1,y= +1); 

-    };

-

-    interpret KP_2 { 

-	action = MovePtr(x=+0,y= +1); 

-    };

-    interpret KP_Down { 

-	action = MovePtr(x=+0,y= +1); 

-    };

-

-    interpret KP_3 { 

-	action = MovePtr(x=+1,y=+1); 

-    };

-    interpret KP_Next { 

- 	action = MovePtr(x=+1,y=+1); 

-    };

-

-    interpret KP_4 { 

-	action = MovePtr(x=-1,y=+0); 

-    };

-    interpret KP_Left { 

-	action = MovePtr(x=-1,y=+0); 

-    };

-

-    interpret KP_6 { 

-	action = MovePtr(x=+1,y=+0); 

-    };

-    interpret KP_Right { 

- 	action = MovePtr(x=+1,y=+0); 

-    };

-

-    interpret KP_7 { 

-	action = MovePtr(x=-1,y=-1); 

-    };

-    interpret KP_Home { 

-	action = MovePtr(x=-1,y=-1); 

-    };

-

-    interpret KP_8 { 

-	action = MovePtr(x=+0,y=-1); 

-    };

-    interpret KP_Up { 

-	action = MovePtr(x=+0,y=-1); 

-    };

-

-    interpret KP_9 { 

-	action = MovePtr(x=+1,y=-1); 

-    };

-    interpret KP_Prior { 

-	action = MovePtr(x=+1,y=-1); 

-    };

-

-    interpret KP_5 { 

-	action = PointerButton(button=default); 

-    };

-    interpret KP_Begin { 

-	action = PointerButton(button=default); 

-    };

-

-    interpret KP_F2 { 

-	action = SetPtrDflt(affect=defaultButton,button=1); 

-    };

-    interpret KP_Divide { 

-	action = SetPtrDflt(affect=defaultButton,button=1); 

-    };

-

-    interpret KP_F3 { 

-	action = SetPtrDflt(affect=defaultButton,button=2); 

-    };

-    interpret KP_Multiply { 

-	action = SetPtrDflt(affect=defaultButton,button=2); 

-    };

-

-    interpret KP_F4 { 

-	action = SetPtrDflt(affect=defaultButton,button=3); 

-    };

-    interpret KP_Subtract { 

-	action = SetPtrDflt(affect=defaultButton,button=3); 

-    };

-

-    interpret KP_Separator { 

-	action = PointerButton(button=default,count=2); 

-    };

-    interpret KP_Add { 

-	action = PointerButton(button=default,count=2);

-    };

-

-    interpret KP_0 { 

-	action = LockPointerButton(button=default,affect=lock); 

-    };

-    interpret KP_Insert { 

-	action = LockPointerButton(button=default,affect=lock); 

-    };

-

-    interpret KP_Decimal { 

-	action = LockPointerButton(button=default,affect=unlock); 

-    };

-    interpret KP_Delete { 

-	action = LockPointerButton(button=default,affect=unlock); 

-    };

-

-    // Additional mappings for Solaris keypad compatibility

-    interpret F25 { // aka KP_Divide

-	action = SetPtrDflt(affect=defaultButton,button=1); 

-    };

-    interpret F26 { // aka KP_Multiply

-	action = SetPtrDflt(affect=defaultButton,button=2); 

-    };

-    interpret F27 { // aka KP_Home

-	action = MovePtr(x=-1,y=-1); 

-    };

-    interpret F29 { // aka KP_Prior

-	action = MovePtr(x=+1,y=-1); 

-    };

-    interpret F31 { // aka KP_Begin

-	action = PointerButton(button=default); 

-    };

-    interpret F33 { // aka KP_End

-	action = MovePtr(x=-1,y= +1); 

-    };

-    interpret F35 { // aka KP_Next

- 	action = MovePtr(x=+1,y=+1); 

-    };

-

-    interpret.repeat= False;

-

-

-    // New Keysym Actions.

-    //

-    interpret Pointer_Button_Dflt {

-	action= PointerButton(button=default);

-    };

-    interpret Pointer_Button1 {

-	action= PointerButton(button=1);

-    };

-    interpret Pointer_Button2 {

-	action= PointerButton(button=2);

-    };

-    interpret Pointer_Button3 {

-	action= PointerButton(button=3);

-    };

-    interpret Pointer_DblClick_Dflt {

-	action= PointerButton(button=default,count=2);

-    };

-    interpret Pointer_DblClick1 {

-	action= PointerButton(button=1,count=2);

-    };

-    interpret Pointer_DblClick2 {

-	action= PointerButton(button=2,count=2);

-    };

-    interpret Pointer_DblClick3 {

-	action= PointerButton(button=3,count=2);

-    };

-    interpret Pointer_Drag_Dflt	{

-	action= LockPointerButton(button=default);

-    };

-    interpret Pointer_Drag1 {

-	action= LockPointerButton(button=1);

-    };

-    interpret Pointer_Drag2 {

-	action= LockPointerButton(button=2);

-    };

-    interpret Pointer_Drag3 {

-	action= LockPointerButton(button=3);

-    };

-

-    interpret Pointer_EnableKeys {

-	action= LockControls(controls=MouseKeys);

-    };

-    interpret Pointer_Accelerate {

-	action= LockControls(controls=MouseKeysAccel);

-    };

-    interpret Pointer_DfltBtnNext {

-	action= SetPtrDflt(affect=defaultButton,button= +1);

-    };

-    interpret Pointer_DfltBtnPrev {

-	action= SetPtrDflt(affect=defaultButton,button= -1);

-    };

-

-

-    // Allow an indicator for MouseKeys.

-    indicator "Mouse Keys" {

-//	!allowExplicit;

-	indicatorDrivesKeyboard;

-	controls= MouseKeys;

-    };

-};

+// Interpretations for arrow keys and a bunch of other 
+// common keysyms which make it possible to bind "mouse" 
+// keys using xmodmap and activate or deactivate them 
+// from the keyboard.
+
+default partial xkb_compatibility "mousekeys" {
+
+    // Keypad actions.
+    //
+    interpret.repeat= True;
+
+    interpret KP_1 { 
+	action = MovePtr(x=-1,y= +1); 
+    };
+    interpret KP_End { 
+	action = MovePtr(x=-1,y= +1); 
+    };
+
+    interpret KP_2 { 
+	action = MovePtr(x=+0,y= +1); 
+    };
+    interpret KP_Down { 
+	action = MovePtr(x=+0,y= +1); 
+    };
+
+    interpret KP_3 { 
+	action = MovePtr(x=+1,y=+1); 
+    };
+    interpret KP_Next { 
+ 	action = MovePtr(x=+1,y=+1); 
+    };
+
+    interpret KP_4 { 
+	action = MovePtr(x=-1,y=+0); 
+    };
+    interpret KP_Left { 
+	action = MovePtr(x=-1,y=+0); 
+    };
+
+    interpret KP_6 { 
+	action = MovePtr(x=+1,y=+0); 
+    };
+    interpret KP_Right { 
+ 	action = MovePtr(x=+1,y=+0); 
+    };
+
+    interpret KP_7 { 
+	action = MovePtr(x=-1,y=-1); 
+    };
+    interpret KP_Home { 
+	action = MovePtr(x=-1,y=-1); 
+    };
+
+    interpret KP_8 { 
+	action = MovePtr(x=+0,y=-1); 
+    };
+    interpret KP_Up { 
+	action = MovePtr(x=+0,y=-1); 
+    };
+
+    interpret KP_9 { 
+	action = MovePtr(x=+1,y=-1); 
+    };
+    interpret KP_Prior { 
+	action = MovePtr(x=+1,y=-1); 
+    };
+
+    interpret KP_5 { 
+	action = PointerButton(button=default); 
+    };
+    interpret KP_Begin { 
+	action = PointerButton(button=default); 
+    };
+
+    interpret KP_F2 { 
+	action = SetPtrDflt(affect=defaultButton,button=1); 
+    };
+    interpret KP_Divide { 
+	action = SetPtrDflt(affect=defaultButton,button=1); 
+    };
+
+    interpret KP_F3 { 
+	action = SetPtrDflt(affect=defaultButton,button=2); 
+    };
+    interpret KP_Multiply { 
+	action = SetPtrDflt(affect=defaultButton,button=2); 
+    };
+
+    interpret KP_F4 { 
+	action = SetPtrDflt(affect=defaultButton,button=3); 
+    };
+    interpret KP_Subtract { 
+	action = SetPtrDflt(affect=defaultButton,button=3); 
+    };
+
+    interpret KP_Separator { 
+	action = PointerButton(button=default,count=2); 
+    };
+    interpret KP_Add { 
+	action = PointerButton(button=default,count=2);
+    };
+
+    interpret KP_0 { 
+	action = LockPointerButton(button=default,affect=lock); 
+    };
+    interpret KP_Insert { 
+	action = LockPointerButton(button=default,affect=lock); 
+    };
+
+    interpret KP_Decimal { 
+	action = LockPointerButton(button=default,affect=unlock); 
+    };
+    interpret KP_Delete { 
+	action = LockPointerButton(button=default,affect=unlock); 
+    };
+
+    // Additional mappings for Solaris keypad compatibility
+    interpret F25 { // aka KP_Divide
+	action = SetPtrDflt(affect=defaultButton,button=1); 
+    };
+    interpret F26 { // aka KP_Multiply
+	action = SetPtrDflt(affect=defaultButton,button=2); 
+    };
+    interpret F27 { // aka KP_Home
+	action = MovePtr(x=-1,y=-1); 
+    };
+    interpret F29 { // aka KP_Prior
+	action = MovePtr(x=+1,y=-1); 
+    };
+    interpret F31 { // aka KP_Begin
+	action = PointerButton(button=default); 
+    };
+    interpret F33 { // aka KP_End
+	action = MovePtr(x=-1,y= +1); 
+    };
+    interpret F35 { // aka KP_Next
+ 	action = MovePtr(x=+1,y=+1); 
+    };
+
+    interpret.repeat= False;
+
+
+    // New Keysym Actions.
+    //
+    interpret Pointer_Button_Dflt {
+	action= PointerButton(button=default);
+    };
+    interpret Pointer_Button1 {
+	action= PointerButton(button=1);
+    };
+    interpret Pointer_Button2 {
+	action= PointerButton(button=2);
+    };
+    interpret Pointer_Button3 {
+	action= PointerButton(button=3);
+    };
+    interpret Pointer_DblClick_Dflt {
+	action= PointerButton(button=default,count=2);
+    };
+    interpret Pointer_DblClick1 {
+	action= PointerButton(button=1,count=2);
+    };
+    interpret Pointer_DblClick2 {
+	action= PointerButton(button=2,count=2);
+    };
+    interpret Pointer_DblClick3 {
+	action= PointerButton(button=3,count=2);
+    };
+    interpret Pointer_Drag_Dflt	{
+	action= LockPointerButton(button=default);
+    };
+    interpret Pointer_Drag1 {
+	action= LockPointerButton(button=1);
+    };
+    interpret Pointer_Drag2 {
+	action= LockPointerButton(button=2);
+    };
+    interpret Pointer_Drag3 {
+	action= LockPointerButton(button=3);
+    };
+
+    interpret Pointer_EnableKeys {
+	action= LockControls(controls=MouseKeys);
+    };
+    interpret Pointer_Accelerate {
+	action= LockControls(controls=MouseKeysAccel);
+    };
+    interpret Pointer_DfltBtnNext {
+	action= SetPtrDflt(affect=defaultButton,button= +1);
+    };
+    interpret Pointer_DfltBtnPrev {
+	action= SetPtrDflt(affect=defaultButton,button= -1);
+    };
+
+
+    // Allow an indicator for MouseKeys.
+    indicator "Mouse Keys" {
+//	!allowExplicit;
+	indicatorDrivesKeyboard;
+	controls= MouseKeys;
+    };
+};