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, 264 insertions, 264 deletions

diff --git a/xorg-server/xkeyboard-config/geometry/amiga b/xorg-server/xkeyboard-config/geometry/amiga
index 79793eabf..9c5f65e57 100644
--- a/xorg-server/xkeyboard-config/geometry/amiga
+++ b/xorg-server/xkeyboard-config/geometry/amiga
@@ -1,264 +1,264 @@
-default xkb_geometry "usa1" {

-

-    description= "Amiga (usa1)";

-    width= 490;

-    height= 175;

-

-    shape.cornerRadius= 1;

-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };

-    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };

-    shape "FCTS" { { [ 23,18] }, { [2,1], [ 21,17] } };

-    shape "TLDE" { { [ 28,18] }, { [2,1], [ 21,17] } };

-    shape "TABK" { { [ 37,18] }, { [2,1], [ 35,17] } };

-    shape "CTRL" { { [ 23,18] }, { [2,1], [ 21,17] } };

-    shape "CAPS" { { [ 18,18] }, { [2,1], [ 16,17] } };

-    shape "RTRN" {

-	approx = { [ 16, 0], [42,37] },

-	{ [16, 0], [42, 0], [42,37],

-	  [ 0,37], [ 0,19], [16,19] },

-	{ [18, 1], [40, 1], [40,36],

-	  [ 2,36], [ 2,20], [18,20] } };

-    shape "LFSH" { { [ 52,18] }, { [2,1], [ 50,17] } };

-    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };

-    shape "MODK" { { [ 23,18] }, { [2,1], [ 21,17] } };

-    shape "SPCE" { { [172,18] }, { [2,1], [170,17] } };

-    shape "DELE" { { [ 28,18] }, { [2,1], [ 26,17] } };

-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };

-    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };

-

-    section.left= 22;

-    row.left= 1;

-    key.shape= "FCTS";

-    key.gap=  1;

-    section "Function" {

-	top= 28;

-	row {

-	    top= 1;

-	    keys { { <ESC>, shape="NORM" },

-		   { <FK01>, 9 }, <FK02>, <FK03>, <FK04>, <FK05>,

-		   { <FK06>, 9 }, <FK07>, <FK08>, <FK09>, <FK10>

-	    };

-	};

-    }; // End of "Function" section

-

-    key.shape= "NORM";

-    section "Alpha" {

-	top= 56;

-	row {

-	    top= 1;

-	    keys { { <TLDE>, shape="TLDE" },

-		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,

-		   <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,

-		   <BKSL>, { <BKSP>, "BKSP" }

-	    };

-	};

-	row {

-	    top= 20;

-	    keys { { <TAB>, "TABK" },

-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 

-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 

-		   <AD11>, <AD12>, { <RTRN>, "RTRN", -15 }

-	    };

-	};

-	row {

-	    top= 39;

-	    keys { { <LCTL>, "CTRL" }, { <CAPS>, "CAPS" },

-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,

-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,

-		   <AC11>

-	    };

-	};

-	row {

-	    top= 58;

-	    keys { { <LFSH>, "LFSH" },

-		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 

-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 

-		    { <RTSH>, "RTSH" }

-	    };

-	};

-	row {

-	    top= 77;

-	    key.shape= "MODK";

-	    keys { { <LALT>, 10 }, <LAMI>,

-		   { <SPCE>, "SPCE" },

-		   <RAMI>, <RALT>

-	    };

-	};

-    }; // End of "Alpha" section

-

-    section "Editing" {

-	top= 56;

-	left= 326;

-	row {

-	    top= 1;

-	    key.shape = "DELE";

-	    keys { <DELE>, <HELP> };

-	};

-	row {

-	    top= 39;

-	    left = 20;

-	    keys { <UP> };

-	};

-	row {

-	    top= 58;

-	    keys { <LEFT>, <DOWN>, <RGHT> };

-	};

-    }; // End of "Editing" section

-

-    section "Keypad" {

-	top= 56;

-	left= 392;

-	row {

-	    top= 1;

-	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };

-	};

-	row {

-	    top= 20;

-	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };

-	};

-	row {

-	    top= 39;

-	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };

-	};

-	row {

-	    top= 58;

-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };

-	};

-	row {

-	    top= 77;

-	    keys { { <KP0>, "KP0" }, <KPDC> };

-	};

-    }; // End of "Keypad" section

-

-};

-

-xkb_geometry "de" {

-

-    description= "Amiga (de)";

-    width= 490;

-    height= 175;

-

-    shape.cornerRadius= 1;

-    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };

-    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };

-    shape "FCTS" { { [ 23,18] }, { [2,1], [ 21,17] } };

-    shape "TLDE" { { [ 28,18] }, { [2,1], [ 26,17] } };

-    shape "TABK" { { [ 37,18] }, { [2,1], [ 35,17] } };

-    shape "CTRL" { { [ 23,18] }, { [2,1], [ 21,17] } };

-    shape "CAPS" { { [ 18,18] }, { [2,1], [ 16,17] } };

-    shape "RTRN" {

-	{ [ 0, 0], [28,0], [28,37], [5,37], [5,18], [ 0,18] },

-	{ [ 2, 1], [26,1], [26,36], [7,36], [7,17], [ 2,17] } };

-    shape "LFSH" { { [ 32,18] }, { [2,1], [ 29,17] } };

-    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };

-    shape "MODK" { { [ 23,18] }, { [2,1], [ 21,17] } };

-    shape "SPCE" { { [172,18] }, { [2,1], [170,17] } };

-    shape "DELE" { { [ 28,18] }, { [2,1], [ 26,17] } };

-    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };

-    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };

-

-    section.left= 22;

-    row.left= 1;

-    key.shape= "FCTS";

-    key.gap=  1;

-    section "Function" {

-	top= 28;

-	row {

-	    top= 1;

-	    keys { { <ESC>, shape="NORM" },

-		   { <FK01>, 9 }, <FK02>, <FK03>, <FK04>, <FK05>,

-		   { <FK06>, 9 }, <FK07>, <FK08>, <FK09>, <FK10>

-	    };

-	};

-    }; // End of "Function" section

-

-    key.shape= "NORM";

-    section "Alpha" {

-	top= 56;

-	row {

-	    top= 1;

-	    keys { { <TLDE>, shape="TLDE" },

-		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,

-		   <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,

-		   <BKSL>, { <BKSP>, "BKSP" }

-	    };

-	};

-	row {

-	    top= 20;

-	    keys { { <TAB>, "TABK" },

-		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 

-		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 

-		   <AD11>, <AD12>, { <RTRN>, "RTRN" }

-	    };

-	};

-	row {

-	    top= 39;

-	    keys { { <LCTL>, "CTRL" }, { <CAPS>, "CAPS" },

-		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,

-		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,

-		   <AC11>, <AC12>

-	    };

-	};

-	row {

-	    top= 58;

-	    keys { { <LFSH>, "LFSH" },

-		    <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,

-		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 

-		    { <RTSH>, "RTSH" }

-	    };

-	};

-	row {

-	    top= 77;

-	    key.shape= "MODK";

-	    keys { { <LALT>, 14 }, <LAMI>,

-		   { <SPCE>, "SPCE" },

-		   <RAMI>, <RALT>

-	    };

-	};

-    }; // End of "Alpha" section

-

-    section "Editing" {

-	top= 56;

-	left= 326;

-	row {

-	    top= 1;

-	    key.shape = "DELE";

-	    keys { <DELE>, <HELP> };

-	};

-	row {

-	    top= 39;

-	    left = 20;

-	    keys { <UP> };

-	};

-	row {

-	    top= 58;

-	    keys { <LEFT>, <DOWN>, <RGHT> };

-	};

-    }; // End of "Editing" section

-

-    section "Keypad" {

-	top= 56;

-	left= 392;

-	row {

-	    top= 1;

-	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };

-	};

-	row {

-	    top= 20;

-	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };

-	};

-	row {

-	    top= 39;

-	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };

-	};

-	row {

-	    top= 58;

-	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };

-	};

-	row {

-	    top= 77;

-	    keys { { <KP0>, "KP0" }, <KPDC> };

-	};

-    }; // End of "Keypad" section

-

-};

+default xkb_geometry "usa1" {
+
+    description= "Amiga (usa1)";
+    width= 490;
+    height= 175;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "FCTS" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "TLDE" { { [ 28,18] }, { [2,1], [ 21,17] } };
+    shape "TABK" { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "CTRL" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "CAPS" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "RTRN" {
+	approx = { [ 16, 0], [42,37] },
+	{ [16, 0], [42, 0], [42,37],
+	  [ 0,37], [ 0,19], [16,19] },
+	{ [18, 1], [40, 1], [40,36],
+	  [ 2,36], [ 2,20], [18,20] } };
+    shape "LFSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
+    shape "MODK" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "SPCE" { { [172,18] }, { [2,1], [170,17] } };
+    shape "DELE" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    section.left= 22;
+    row.left= 1;
+    key.shape= "FCTS";
+    key.gap=  1;
+    section "Function" {
+	top= 28;
+	row {
+	    top= 1;
+	    keys { { <ESC>, shape="NORM" },
+		   { <FK01>, 9 }, <FK02>, <FK03>, <FK04>, <FK05>,
+		   { <FK06>, 9 }, <FK07>, <FK08>, <FK09>, <FK10>
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 56;
+	row {
+	    top= 1;
+	    keys { { <TLDE>, shape="TLDE" },
+		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
+		   <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		   <BKSL>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN", -15 }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <LCTL>, "CTRL" }, { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+		   <AC11>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" },
+		    <AB01>, <AB02>, <AB03>, <AB04>, <AB05>, 
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    keys { { <LALT>, 10 }, <LAMI>,
+		   { <SPCE>, "SPCE" },
+		   <RAMI>, <RALT>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 56;
+	left= 326;
+	row {
+	    top= 1;
+	    key.shape = "DELE";
+	    keys { <DELE>, <HELP> };
+	};
+	row {
+	    top= 39;
+	    left = 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 58;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 56;
+	left= 392;
+	row {
+	    top= 1;
+	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDC> };
+	};
+    }; // End of "Keypad" section
+
+};
+
+xkb_geometry "de" {
+
+    description= "Amiga (de)";
+    width= 490;
+    height= 175;
+
+    shape.cornerRadius= 1;
+    shape "NORM" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "BKSP" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "FCTS" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "TLDE" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "TABK" { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "CTRL" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "CAPS" { { [ 18,18] }, { [2,1], [ 16,17] } };
+    shape "RTRN" {
+	{ [ 0, 0], [28,0], [28,37], [5,37], [5,18], [ 0,18] },
+	{ [ 2, 1], [26,1], [26,36], [7,36], [7,17], [ 2,17] } };
+    shape "LFSH" { { [ 32,18] }, { [2,1], [ 29,17] } };
+    shape "RTSH" { { [ 52,18] }, { [2,1], [ 50,17] } };
+    shape "MODK" { { [ 23,18] }, { [2,1], [ 21,17] } };
+    shape "SPCE" { { [172,18] }, { [2,1], [170,17] } };
+    shape "DELE" { { [ 28,18] }, { [2,1], [ 26,17] } };
+    shape "KP0"  { { [ 37,18] }, { [2,1], [ 35,17] } };
+    shape "KPEN" { { [ 18,37] }, { [2,1], [ 16,36] } };
+
+    section.left= 22;
+    row.left= 1;
+    key.shape= "FCTS";
+    key.gap=  1;
+    section "Function" {
+	top= 28;
+	row {
+	    top= 1;
+	    keys { { <ESC>, shape="NORM" },
+		   { <FK01>, 9 }, <FK02>, <FK03>, <FK04>, <FK05>,
+		   { <FK06>, 9 }, <FK07>, <FK08>, <FK09>, <FK10>
+	    };
+	};
+    }; // End of "Function" section
+
+    key.shape= "NORM";
+    section "Alpha" {
+	top= 56;
+	row {
+	    top= 1;
+	    keys { { <TLDE>, shape="TLDE" },
+		   <AE01>, <AE02>, <AE03>, <AE04>, <AE05>, <AE06>,
+		   <AE07>, <AE08>, <AE09>, <AE10>, <AE11>, <AE12>,
+		   <BKSL>, { <BKSP>, "BKSP" }
+	    };
+	};
+	row {
+	    top= 20;
+	    keys { { <TAB>, "TABK" },
+		   <AD01>, <AD02>, <AD03>, <AD04>, <AD05>, 
+		   <AD06>, <AD07>, <AD08>, <AD09>, <AD10>, 
+		   <AD11>, <AD12>, { <RTRN>, "RTRN" }
+	    };
+	};
+	row {
+	    top= 39;
+	    keys { { <LCTL>, "CTRL" }, { <CAPS>, "CAPS" },
+		   <AC01>, <AC02>, <AC03>, <AC04>, <AC05>,
+		   <AC06>, <AC07>, <AC08>, <AC09>, <AC10>,
+		   <AC11>, <AC12>
+	    };
+	};
+	row {
+	    top= 58;
+	    keys { { <LFSH>, "LFSH" },
+		    <LSGT>, <AB01>, <AB02>, <AB03>, <AB04>, <AB05>,
+		    <AB06>, <AB07>, <AB08>, <AB09>, <AB10>, 
+		    { <RTSH>, "RTSH" }
+	    };
+	};
+	row {
+	    top= 77;
+	    key.shape= "MODK";
+	    keys { { <LALT>, 14 }, <LAMI>,
+		   { <SPCE>, "SPCE" },
+		   <RAMI>, <RALT>
+	    };
+	};
+    }; // End of "Alpha" section
+
+    section "Editing" {
+	top= 56;
+	left= 326;
+	row {
+	    top= 1;
+	    key.shape = "DELE";
+	    keys { <DELE>, <HELP> };
+	};
+	row {
+	    top= 39;
+	    left = 20;
+	    keys { <UP> };
+	};
+	row {
+	    top= 58;
+	    keys { <LEFT>, <DOWN>, <RGHT> };
+	};
+    }; // End of "Editing" section
+
+    section "Keypad" {
+	top= 56;
+	left= 392;
+	row {
+	    top= 1;
+	    keys { <KPLP>, <KPRP>, <KPDV>, <KPMU> };
+	};
+	row {
+	    top= 20;
+	    keys { <KP7>, <KP8>, <KP9>, <KPSU> };
+	};
+	row {
+	    top= 39;
+	    keys { <KP4>, <KP5>, <KP6>, <KPAD> };
+	};
+	row {
+	    top= 58;
+	    keys { <KP1>, <KP2>, <KP3>, { <KPEN>, "KPEN" } };
+	};
+	row {
+	    top= 77;
+	    keys { { <KP0>, "KP0" }, <KPDC> };
+	};
+    }; // End of "Keypad" section
+
+};