mesa xkeyboard-config xserver git update 15 jan 2014

xserver          commit 2d2d49dab5c5718989de97d7227aac793479745e
xkeyboard-config commit 78af7aa79c6552924295644b911e45d07a0fcdad
mesa             commit a05c596a00916ce6a9c9d35ff36cd1e401fddd43

1 files changed, 76 insertions, 77 deletions

diff --git a/xorg-server/xkeyboard-config/compat/mousekeys b/xorg-server/xkeyboard-config/compat/mousekeys
index f60c756c4..6b96fbcf8 100644
--- a/xorg-server/xkeyboard-config/compat/mousekeys
+++ b/xorg-server/xkeyboard-config/compat/mousekeys
@@ -1,147 +1,147 @@
-// 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.
+// 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_1 {
+	action = MovePtr(x=-1,y= +1);
     };
-    interpret KP_End { 
-	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_2 {
+	action = MovePtr(x=+0,y= +1);
     };
-    interpret KP_Down { 
-	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_3 {
+	action = MovePtr(x=+1,y=+1);
     };
-    interpret KP_Next { 
- 	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_4 {
+	action = MovePtr(x=-1,y=+0);
     };
-    interpret KP_Left { 
-	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_6 {
+	action = MovePtr(x=+1,y=+0);
     };
-    interpret KP_Right { 
- 	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_7 {
+	action = MovePtr(x=-1,y=-1);
     };
-    interpret KP_Home { 
-	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_8 {
+	action = MovePtr(x=+0,y=-1);
     };
-    interpret KP_Up { 
-	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_9 {
+	action = MovePtr(x=+1,y=-1);
     };
-    interpret KP_Prior { 
-	action = MovePtr(x=+1,y=-1); 
+    interpret KP_Prior {
+	action = MovePtr(x=+1,y=-1);
     };
 
-    interpret KP_5 { 
-	action = PointerButton(button=default); 
+    interpret KP_5 {
+	action = PointerButton(button=default);
     };
-    interpret KP_Begin { 
-	action = PointerButton(button=default); 
+    interpret KP_Begin {
+	action = PointerButton(button=default);
     };
 
-    interpret KP_F2 { 
-	action = SetPtrDflt(affect=defaultButton,button=1); 
+    interpret KP_F2 {
+	action = SetPtrDflt(affect=defaultButton,button=1);
     };
-    interpret KP_Divide { 
-	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_F3 {
+	action = SetPtrDflt(affect=defaultButton,button=2);
     };
-    interpret KP_Multiply { 
-	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_F4 {
+	action = SetPtrDflt(affect=defaultButton,button=3);
     };
-    interpret KP_Subtract { 
-	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_Separator {
+	action = PointerButton(button=default,count=2);
     };
-    interpret KP_Add { 
+    interpret KP_Add {
 	action = PointerButton(button=default,count=2);
     };
 
-    interpret KP_0 { 
-	action = LockPointerButton(button=default,affect=lock); 
+    interpret KP_0 {
+	action = LockPointerButton(button=default,affect=lock);
     };
-    interpret KP_Insert { 
-	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_Decimal {
+	action = LockPointerButton(button=default,affect=unlock);
     };
-    interpret KP_Delete { 
-	action = LockPointerButton(button=default,affect=unlock); 
+    interpret KP_Delete {
+	action = LockPointerButton(button=default,affect=unlock);
     };
 
-    // Additional mappings for Solaris keypad compatibility
+    // Additional mappings for Solaris keypad compatibility.
+
     interpret F25 { // aka KP_Divide
-	action = SetPtrDflt(affect=defaultButton,button=1); 
+	action = SetPtrDflt(affect=defaultButton,button=1);
     };
     interpret F26 { // aka KP_Multiply
-	action = SetPtrDflt(affect=defaultButton,button=2); 
+	action = SetPtrDflt(affect=defaultButton,button=2);
     };
     interpret F27 { // aka KP_Home
-	action = MovePtr(x=-1,y=-1); 
+	action = MovePtr(x=-1,y=-1);
     };
     interpret F29 { // aka KP_Prior
-	action = MovePtr(x=+1,y=-1); 
+	action = MovePtr(x=+1,y=-1);
     };
     interpret F31 { // aka KP_Begin
-	action = PointerButton(button=default); 
+	action = PointerButton(button=default);
     };
     interpret F33 { // aka KP_End
-	action = MovePtr(x=-1,y= +1); 
+	action = MovePtr(x=-1,y= +1);
     };
     interpret F35 { // aka KP_Next
- 	action = MovePtr(x=+1,y=+1); 
+	action = MovePtr(x=+1,y=+1);
     };
 
     interpret.repeat= False;
 
+    // New keysym actions.
 
-    // New Keysym Actions.
-    //
     interpret Pointer_Button_Dflt {
 	action= PointerButton(button=default);
     };
@@ -166,7 +166,7 @@ default partial xkb_compatibility "mousekeys" {
     interpret Pointer_DblClick3 {
 	action= PointerButton(button=3,count=2);
     };
-    interpret Pointer_Drag_Dflt	{
+    interpret Pointer_Drag_Dflt {
 	action= LockPointerButton(button=default);
     };
     interpret Pointer_Drag1 {
@@ -192,10 +192,9 @@ default partial xkb_compatibility "mousekeys" {
 	action= SetPtrDflt(affect=defaultButton,button= -1);
     };
 
-
     // Allow an indicator for MouseKeys.
     indicator "Mouse Keys" {
-//	!allowExplicit;
+        //!allowExplicit;
 	indicatorDrivesKeyboard;
 	controls= MouseKeys;
     };