Merge remote-tracking branch 'origin/released'

* origin/released:
  mesa pixman xserver xkeyboard-config

Conflicts:
	xorg-server/dix/dispatch.c

9 files changed, 49 insertions, 67 deletions

diff --git a/xorg-server/xkeyboard-config/geometry/dell b/xorg-server/xkeyboard-config/geometry/dell
index cb635ef60..5d3f9702f 100644
--- a/xorg-server/xkeyboard-config/geometry/dell
+++ b/xorg-server/xkeyboard-config/geometry/dell
@@ -619,7 +619,7 @@ xkb_geometry "latitude" {
 	section "Arrows" {key.color="grey"; priority=110; top=112; left=240; width=43; height=31;
 		row {top=0; left=18; keys {{<UP>, "ARROW", 0}};};	
 		row {top=16; left=0; keys {{<LEFT>, "ARROW", 0}, {<DOWN>, "ARROW", 1}, {<RGHT>, "ARROW", 1}};};
-		}; // End of "Arrows" section
+	}; // End of "Arrows" section
 
 	shape "LEDS" {corner=3, {[25,7]}};
 	solid "leds" {shape="LEDS"; top=5.7; left=69; color="grey"; priority=10;};
@@ -640,5 +640,5 @@ xkb_geometry "latitude" {
 	section "Topbuttons" {key.color="grey"; priority=110; top=2; left=100;
 		row {top=2; left=0; keys {{<VLUP>, "ROUND", 0}, {<VLDN>, "ROUND", 3}, {<MUTE>, "ROUND", 3}};};	
 		row {top=0; left=45; keys {{<POWR>, "POWER", 0}};};
-		}; // End of "TopButtons" section
+	}; // End of "TopButtons" section
 };
diff --git a/xorg-server/xkeyboard-config/geometry/hhk b/xorg-server/xkeyboard-config/geometry/hhk
index de6fe6f53..97b7d7402 100644
--- a/xorg-server/xkeyboard-config/geometry/hhk
+++ b/xorg-server/xkeyboard-config/geometry/hhk
@@ -191,7 +191,7 @@ xkb_geometry "jp4" {
 	};
 };
 
-// Basic layout for non-swictchable keys
+// Basic layout for non-switchable keys
 partial hidden xkb_geometry "basic" {
 
 	description = "Happy Hacking Keyboard";
diff --git a/xorg-server/xkeyboard-config/geometry/hp b/xorg-server/xkeyboard-config/geometry/hp
index 8cb07b480..caab94fcc 100644
--- a/xorg-server/xkeyboard-config/geometry/hp
+++ b/xorg-server/xkeyboard-config/geometry/hp
@@ -273,7 +273,7 @@ xkb_geometry "hil" {
 	};
     }; // End of "Keypad" section
 
-}; // End of "default" geometry
+};
 
 
 // Created by Alexander Pohoyda <alexander.pohoyda@gmx.net>
@@ -563,7 +563,7 @@ xkb_geometry "dv5" {
 	height=118.4;
 	width=310.6;
 
-    description = "HP Pavilion dv5";
+	description = "HP Pavilion dv5";
 
 	shape.cornerRadius = 1;
 
@@ -610,10 +610,10 @@ xkb_geometry "dv5" {
 		};
 	};
 
-    section "Alpha" {
+	section "Alpha" {
 		top = 17.9;
 		key.shape = "NORM";
-	    left = 3;
+		left = 3;
 
 		row {
 		    top = 0;
@@ -646,29 +646,28 @@ xkb_geometry "dv5" {
 			   { <RTSH>, "RTSH" }
 		    };
 		};
-    }; // End of "Alpha" section
+	}; // End of "Alpha" section
 
-    section "Controls" {
+	section "Controls" {
 		top = 95.9;
 		key.shape = "CTLS";
-	    left = 3;
-
+		left = 3;
 		row {
 		    top = 0;
 		    keys { {<LCTL>, "LCTL"}, <FN>, <LWIN>, <LALT>, {<SPCE>, "SPCE"},
 			   <RALT>, <MENU>, {<RCTL>, "RCTL"}
 		    };
 		};
-    };
+	};
 
-	section "Edition" {
+	section "Editing" {
 		top = 16.5;
-	    left = 289.9;
+		left = 289.9;
 		key.shape = "EDIT";
 		key.gap = 1.4;
 		row {
 		    top = 0;
-			vertical = true;
+		    vertical = true;
 		    keys {
 				<HOME>, <PGUP>, <PGDN>, <END>
 		    };
diff --git a/xorg-server/xkeyboard-config/geometry/kinesis b/xorg-server/xkeyboard-config/geometry/kinesis
index f71cec8c5..1e1b8233b 100644
--- a/xorg-server/xkeyboard-config/geometry/kinesis
+++ b/xorg-server/xkeyboard-config/geometry/kinesis
@@ -159,7 +159,7 @@ default xkb_geometry "model100" {
 	    left= 39;
 	    keys { <LALT>, <HOME>, <END> };
 	};
-    }; // End of "RightEdit" section
+    }; // End of "LeftEdit" section
 
     section "RightEdit" {
 	top= 109;
@@ -182,7 +182,7 @@ default xkb_geometry "model100" {
 	overlay "KPAD" {
 	    <SPCE>= <KP0>
 	};
-    }; // End of "Keypad" section
+    }; // End of "RightEdit" section
 
     alias <AC00> = <CAPS>;
     alias <AA00> = <LCTL>;
diff --git a/xorg-server/xkeyboard-config/geometry/macintosh b/xorg-server/xkeyboard-config/geometry/macintosh
index 1e0e125d7..b6251b4f0 100644
--- a/xorg-server/xkeyboard-config/geometry/macintosh
+++ b/xorg-server/xkeyboard-config/geometry/macintosh
@@ -149,7 +149,6 @@ default xkb_geometry "macintosh" {
 	};
     }; // End of "Editing" section
 
-    // Begin of "Keypad" section
     section "Keypad" {
         top = 87;
         left = 380;
@@ -301,7 +300,6 @@ xkb_geometry "applepro" {
        };
     }; // End of "Editing" section
 
-    // Begin of "Keypad" section
     section "Keypad" {
         top = 48;
         left = 370;
@@ -544,7 +542,6 @@ xkb_geometry "macbook79" {
                    <KPEN>
 	    };
 	};
-
     }; // End of "Alpha" section
 
     key.shape= "ARRO";
@@ -565,7 +562,7 @@ xkb_geometry "macbook79" {
     alias <AC00> = <CAPS>;
     alias <AA00> = <LCTL>;
 
-}; // End of "default" geometry
+};
 
 
 // Aluminium Keyboard, ANSI model (United States, 109 keys)
diff --git a/xorg-server/xkeyboard-config/geometry/microsoft b/xorg-server/xkeyboard-config/geometry/microsoft
index e7f8d7515..4dd4f5416 100644
--- a/xorg-server/xkeyboard-config/geometry/microsoft
+++ b/xorg-server/xkeyboard-config/geometry/microsoft
@@ -255,11 +255,11 @@ default xkb_geometry "natural" {
 // 
 // Modified by Pavel Kurashov <pavell@mail.ru> Mon Oct  8 22:08:20 NOVST 2007
 //
-// * Function, editing and navigation keys are reduced height
-// * Navigation keys are repositioned in two column
+// * Function, editing and navigation keys are reduced in height
+// * Navigation keys are repositioned in two columns
 // * Leds are enlarged for better look
-// * "BKSP"  alligned with "BKSL" and "RTRN"
-// * Ouline Edges slightly modified
+// * "BKSP" is aligned with "BKSL" and "RTRN"
+// * Outline edges are slightly modified
 //
 xkb_geometry "elite" {
 
diff --git a/xorg-server/xkeyboard-config/geometry/pc b/xorg-server/xkeyboard-config/geometry/pc
index 86f546228..c4869a726 100644
--- a/xorg-server/xkeyboard-config/geometry/pc
+++ b/xorg-server/xkeyboard-config/geometry/pc
@@ -665,8 +665,7 @@ xkb_geometry "pc105" {
 }; // End of "pc105" geometry
 
 
-// Added for japanese 106 keyboard
-//                     by tsuka@kawalab.dnj.ynu.ac.jp .
+// Added for Japanese 106 keyboard by <tsuka(at)kawalab.dnj.ynu.ac.jp>.
 xkb_geometry "jp106" {
 
     description= "Japanese 106";
@@ -828,7 +827,7 @@ xkb_geometry "jp106" {
 
 }; // End of "jp106" geometry
 
-// Added for brazilian ABNT2 by Ricardo Y. Igarashi(iga@that.com.br)
+// Added for Brazilian ABNT2 by Ricardo Y. Igarashi <iga(at)that.com.br>.
 xkb_geometry "abnt2" {
     include "pc(pc105)"
 
@@ -1565,4 +1564,4 @@ xkb_geometry "pc104alt" {
     alias <AC00> = <CAPS>;
     alias <AA00> = <LCTL>;
 
-}; // End of "pc104" geometry
+}; // End of "pc104alt" geometry
diff --git a/xorg-server/xkeyboard-config/geometry/sun b/xorg-server/xkeyboard-config/geometry/sun
index 23bd3bf02..fc6d5a639 100644
--- a/xorg-server/xkeyboard-config/geometry/sun
+++ b/xorg-server/xkeyboard-config/geometry/sun
@@ -194,7 +194,6 @@ xkb_geometry "t6" {
     text "ScrollLockLabel"	{ left= 262; text="Scroll\nLock"; };
     text "NumLockLabel"		{ left= 224; text="Num\nLock"; };
 
-
 };
 
 xkb_geometry "t6tuv" {
diff --git a/xorg-server/xkeyboard-config/geometry/typematrix b/xorg-server/xkeyboard-config/geometry/typematrix
index d86976f8f..46f72cb9d 100644
--- a/xorg-server/xkeyboard-config/geometry/typematrix
+++ b/xorg-server/xkeyboard-config/geometry/typematrix
@@ -20,11 +20,11 @@ xkb_geometry "tm2020" {
     // Keyboard total size :
     width  = 308;
     height = 152;
-    // background / foreground colours :
+    // Background / foreground colours
     baseColor  = "white";
     labelColor = "black";
 
-    // Key shapes : base key = 16 mm each side
+    // Key shapes: base key = 16 mm each side
     shape "NORM" { cornerRadius=1, { [16,    16]   }, { [1,   1], [15,   15] }};
     shape "ALPL" { cornerRadius=1, { [24.25, 16]   }, { [1,   1], [23,   15] }};
     shape "DHAL" { cornerRadius=1, { [24.25, 32.5] }, { [1,   1], [23, 31.5] }};
@@ -35,7 +35,6 @@ xkb_geometry "tm2020" {
     shape "LED"  { cornerRadius=2, { [4,      4]   }};
     shape "DECO" { cornerRadius=1, { [3,     18]   }};
 
-    // Function keys row
     section "Function" {
         left = 4;
         top  = 24;
@@ -58,7 +57,6 @@ xkb_geometry "tm2020" {
         };
     };
 
-    // Alpha-numeric keys rows
     section "Alpha" {
         left = 4;
         top  = 36.5;
@@ -119,7 +117,6 @@ xkb_geometry "tm2020" {
         };
     };
 
-    // Control keys rows
     section "Control" {
         left = 4;
         top  = 102.5;
@@ -152,7 +149,7 @@ xkb_geometry "tm2020" {
         };
     };
 
-    // Diods
+    // Leds
     indicator.top      = 12;
     indicator.onColor  = "green";
     indicator.offColor = "grey10";
@@ -168,7 +165,7 @@ xkb_geometry "tm2020" {
 
     text "Logo" { left = 29; top = 10; text="TypeMatrix™"; };
 
-    // other decorations : drawings
+    // Other decorations: drawings
     solid "rainure1"  { shape = "DECO"; top = 1; left = 110; color = "grey10";};
     solid "rainure2"  { shape = "DECO"; top = 1; left = 115; color = "grey10";};
     solid "rainure3"  { shape = "DECO"; top = 1; left = 120; color = "grey10";};
@@ -189,11 +186,11 @@ xkb_geometry "tm2030_shape" {
     // Keyboard total size
     width  = 320;
     height = 130;
-    // background / foreground colours :
+    // Background / foreground colours
     baseColor  = "white";
     labelColor = "black";
 
-    // Key shapes : base key = 20 mm each side
+    // Key shapes: base key = 20 mm each side
     shape "NORM" { cornerRadius=1, { [18,   18] }, { [1.5, 1.5], [16.5, 14] } };
     shape "FUNC" { cornerRadius=1, { [18,   12] }, { [2.5,   0], [15.5, 10] } };
     shape "LFSH" { cornerRadius=1, { [18, 36.5] }, { [2.5,   0], [15.5, 30] } };
@@ -204,7 +201,7 @@ xkb_geometry "tm2030_shape" {
     shape "PAN1" { cornerRadius=1, { [27, 126.5] } };
     shape "PAN2" { cornerRadius=1, { [92,   13] } };
 
-    // other decorations : panels
+    // Other decorations: panels
     solid "panneau1" {
         shape = "PAN1";
         left  = 0;
@@ -218,8 +215,7 @@ xkb_geometry "tm2030_shape" {
         color = "grey40";
     };
 
-    // Diods (Indicators) : they have to be put after panels, either the panels
-    // overwrites them.
+    // Leds: they must be put after panels, otherwise the panels overwrite them
     indicator.left     = 6;
     indicator.onColor  = "green";
     indicator.offColor = "grey10";
@@ -236,31 +232,31 @@ xkb_geometry "tm2030_shape" {
     text "SrollLockLabel"	{ top = 44;   text="scroll";        };
 }; // geometry tm2030_shape
 
+
 xkb_geometry "tm2030_MiscDiod_dvk" {
     text "ModeLabel" { left = 12; top = 58; color = "black";  text="Dvorak"; };
-}; // geometry tm2030_MiscDiod_dvk
+};
 
 xkb_geometry "tm2030_MiscDiod_102" {
     text "ModeLabel" { left = 12; top = 58; color = "black";  text="102"; };
-}; // geometry tm2030_MiscDiod_102
+};
 
 xkb_geometry "tm2030_MiscDiod_106" {
     text "ModeLabel" { left = 12; top = 58; color = "black";  text="106"; };
-}; // geometry tm2030_MiscDiod_106
+};
 
 xkb_geometry "tm2030_MiscDiod_off" {
     indicator "Misc" { left = 6; top = 60.5; shape = "LED";
                        offColor = "grey10"; onColor = "grey10"; };
-}; // geometry tm2030_MiscDiod_off
+};
 
 xkb_geometry "tm2030_MiscDiod_on" {
     indicator "Misc" { left = 6; top = 60.5; shape = "LED";
                        offColor = "green"; onColor = "green"; };
-}; // geometry tm2030_MiscDiod_on
+};
 
 
 xkb_geometry "tm2030USB_func" {
-    // Function keys rows
     section "Function" {
         left      = 27;
         top       = 1.5;
@@ -280,7 +276,6 @@ xkb_geometry "tm2030USB_func" {
 
 
 xkb_geometry "tm2030USB_alpha" {
-    // Alpha-numeric keys rows
     section "Alpha" {
         left = 27;
         top  = 14;
@@ -340,7 +335,6 @@ xkb_geometry "tm2030USB_alpha" {
 
 
 xkb_geometry "tm2030USB_ctrl" {
-    // Control keys rows
     section "Control" {
         left = 27;
         top  = 0;
@@ -387,7 +381,6 @@ xkb_geometry "tm2030PS2" {
 
     description = "TypeMatrix EZ-Reach 2030 PS2";
 
-    // Function keys row
     section "Function" {
         left = 27;
         top  = 1.5;
@@ -423,7 +416,6 @@ xkb_geometry "tm2030PS2" {
         };
     };
 
-    // Alpha-numeric keys rows
     section "Alpha" {
         left = 27;
         top  = 14;
@@ -502,9 +494,8 @@ xkb_geometry "tm2030PS2" {
             left = 74;
             keys { { <SPCE>, "SPCE" } };
         };
-    }; // end section "Alpha"
+    };
 
-    // Control keys rows
     section "Control" {
         left = 27;
         top  = 0;
@@ -558,7 +549,7 @@ xkb_geometry "tm2030PS2" {
             vertical = true;
             keys { <CAPS>, { <BKSP>, "BKSP" }, { <RTRN>, "LFSH" } };
         };
-    }; // end section "Control"
+    };
 }; // geometry tm2030PS2
 
 
@@ -575,8 +566,8 @@ xkb_geometry "tm2030USB" {
 }; // geometry tm2030USB
 
 
-// European 102/105 keys mode :
-// Same as the standard keyboard, except for one key, Play becomes LSGT
+// European 102/105 keys mode.
+// Same as the standard keyboard, except for one key: Play becomes LSGT.
 xkb_geometry "tm2030USB-102" {
     include "typematrix(tm2030_shape)"
     include "typematrix(tm2030_MiscDiod_102)"
@@ -587,7 +578,6 @@ xkb_geometry "tm2030USB-102" {
     include "typematrix(tm2030USB_func)"
     include "typematrix(tm2030USB_alpha)"
 
-    // Control keys rows
     section "Control" {
         left = 27;
         top  = 0;
@@ -627,17 +617,17 @@ xkb_geometry "tm2030USB-102" {
 }; // geometry tm2030USB-102
 
 
-// Japan / Korean 106 keys mode :
-// Same as the standard keyboard, except for following keys :
+// Japan / Korean 106 keys mode.
+// Same as the standard keyboard, except for the following keys:
 // – <TLDE> is replaced by <HZTG>
 // – WWW key becomes <HKTG>
 // — Calc key becomes <AE13>
-// — Mail key becomes <BKSL>, and <BKSL> key becomes <AB11>
+// — <BKSL> key becomes <AB11>
+// — and Mail key becomes <BKSL>
 
-// about Controls:
-// NFER/MEHU and XFER/KANJ : TMx keeps LWIN (and RWIN if it happend to exist)
-// HKTG/HIRA : TMx keeps MENU/COMP, but locates this key in alpha section
-// (see upper).
+// About control keys:
+// NFER/MEHU and XFER/KANJ: TMx keeps LWIN (and RWIN if it happens to exist).
+// HKTG/HIRA: TMx keeps MENU/COMP, but locates this key in alpha section (see above).
 
 xkb_geometry "tm2030USB-106" {
     include "typematrix(tm2030_shape)"
@@ -648,7 +638,6 @@ xkb_geometry "tm2030USB-106" {
 
     include "typematrix(tm2030USB_func)"
 
-    // Alpha-numeric keys rows
     section "Alpha" {
         left = 27;
         top  = 14;
@@ -705,7 +694,6 @@ xkb_geometry "tm2030USB-106" {
         };
     };
 
-    // Control keys rows
     section "Control" {
         left = 27;
         top  = 0;