Merge remote-tracking branch 'origin/released'

Conflicts:
	pixman/pixman/pixman-mmx.c
	xorg-server/Xext/shm.c
	xorg-server/Xext/syncsrv.h
	xorg-server/Xext/xvmain.c
	xorg-server/Xi/exevents.c
	xorg-server/Xi/opendev.c
	xorg-server/composite/compalloc.c
	xorg-server/composite/compoverlay.c
	xorg-server/dix/colormap.c
	xorg-server/dix/devices.c
	xorg-server/dix/dispatch.c
	xorg-server/dix/dixfonts.c
	xorg-server/dix/eventconvert.c
	xorg-server/dix/events.c
	xorg-server/dix/gc.c
	xorg-server/dix/getevents.c
	xorg-server/dix/main.c
	xorg-server/dix/privates.c
	xorg-server/dix/registry.c
	xorg-server/dix/resource.c
	xorg-server/exa/exa_accel.c
	xorg-server/exa/exa_migration_classic.c
	xorg-server/exa/exa_unaccel.c
	xorg-server/fb/fb.h
	xorg-server/fb/fbcopy.c
	xorg-server/fb/fbpixmap.c
	xorg-server/glx/dispatch.h
	xorg-server/glx/glapi.h
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glapitable.h
	xorg-server/glx/glprocs.h
	xorg-server/glx/glxcmds.c
	xorg-server/glx/glxcmdsswap.c
	xorg-server/glx/glxdricommon.c
	xorg-server/glx/glxdriswrast.c
	xorg-server/glx/glxext.c
	xorg-server/glx/indirect_dispatch.c
	xorg-server/glx/indirect_dispatch.h
	xorg-server/glx/indirect_dispatch_swap.c
	xorg-server/glx/indirect_size.h
	xorg-server/glx/indirect_size_get.h
	xorg-server/glx/indirect_table.c
	xorg-server/glx/indirect_util.c
	xorg-server/glx/rensize.c
	xorg-server/glx/single2swap.c
	xorg-server/glx/singlepix.c
	xorg-server/glx/singlepixswap.c
	xorg-server/glx/singlesize.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/ephyr/ephyr.c
	xorg-server/hw/kdrive/ephyr/hostx.c
	xorg-server/hw/kdrive/ephyr/hostx.h
	xorg-server/hw/kdrive/src/kinput.c
	xorg-server/hw/xfree86/common/compiler.h
	xorg-server/hw/xwin/InitInput.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/ddraw.h
	xorg-server/hw/xwin/glx/glwrap.c
	xorg-server/hw/xwin/glx/indirect.c
	xorg-server/hw/xwin/glx/wgl_ext_api.h
	xorg-server/hw/xwin/glx/winpriv.c
	xorg-server/hw/xwin/win.h
	xorg-server/hw/xwin/winallpriv.c
	xorg-server/hw/xwin/winauth.c
	xorg-server/hw/xwin/winclipboard.h
	xorg-server/hw/xwin/winclipboardinit.c
	xorg-server/hw/xwin/winclipboardthread.c
	xorg-server/hw/xwin/winclipboardunicode.c
	xorg-server/hw/xwin/winclipboardwndproc.c
	xorg-server/hw/xwin/winclipboardwrappers.c
	xorg-server/hw/xwin/winclipboardxevents.c
	xorg-server/hw/xwin/wincmap.c
	xorg-server/hw/xwin/winconfig.c
	xorg-server/hw/xwin/wincreatewnd.c
	xorg-server/hw/xwin/wincursor.c
	xorg-server/hw/xwin/windialogs.c
	xorg-server/hw/xwin/winengine.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/wingc.c
	xorg-server/hw/xwin/wingetsp.c
	xorg-server/hw/xwin/winkeybd.c
	xorg-server/hw/xwin/winkeybd.h
	xorg-server/hw/xwin/winlayouts.h
	xorg-server/hw/xwin/winmisc.c
	xorg-server/hw/xwin/winmonitors.c
	xorg-server/hw/xwin/winmouse.c
	xorg-server/hw/xwin/winmsg.c
	xorg-server/hw/xwin/winmsg.h
	xorg-server/hw/xwin/winmultiwindowclass.c
	xorg-server/hw/xwin/winmultiwindowicons.c
	xorg-server/hw/xwin/winmultiwindowshape.c
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwm.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/hw/xwin/winnativegdi.c
	xorg-server/hw/xwin/winpfbdd.c
	xorg-server/hw/xwin/winpixmap.c
	xorg-server/hw/xwin/winpolyline.c
	xorg-server/hw/xwin/winprefs.c
	xorg-server/hw/xwin/winprocarg.c
	xorg-server/hw/xwin/winregistry.c
	xorg-server/hw/xwin/winscrinit.c
	xorg-server/hw/xwin/winsetsp.c
	xorg-server/hw/xwin/winshaddd.c
	xorg-server/hw/xwin/winshadddnl.c
	xorg-server/hw/xwin/winshadgdi.c
	xorg-server/hw/xwin/wintrayicon.c
	xorg-server/hw/xwin/winwin32rootless.c
	xorg-server/hw/xwin/winwin32rootlesswindow.c
	xorg-server/hw/xwin/winwin32rootlesswndproc.c
	xorg-server/hw/xwin/winwindow.c
	xorg-server/hw/xwin/winwindow.h
	xorg-server/hw/xwin/winwindowswm.c
	xorg-server/hw/xwin/winwndproc.c
	xorg-server/include/callback.h
	xorg-server/include/dixstruct.h
	xorg-server/include/misc.h
	xorg-server/include/os.h
	xorg-server/include/scrnintstr.h
	xorg-server/mi/micmap.c
	xorg-server/mi/miinitext.c
	xorg-server/mi/mioverlay.c
	xorg-server/mi/misprite.c
	xorg-server/mi/mivaltree.c
	xorg-server/mi/miwindow.c
	xorg-server/miext/damage/damage.c
	xorg-server/miext/rootless/rootlessGC.c
	xorg-server/miext/rootless/rootlessWindow.c
	xorg-server/os/WaitFor.c
	xorg-server/os/access.c
	xorg-server/os/connection.c
	xorg-server/os/io.c
	xorg-server/os/log.c
	xorg-server/os/osinit.c
	xorg-server/os/utils.c
	xorg-server/os/xdmcp.c
	xorg-server/os/xprintf.c
	xorg-server/os/xstrans.c
	xorg-server/render/mipict.c
	xorg-server/xkb/xkbActions.c
	xorg-server/xkb/xkbInit.c
	xorg-server/xkeyboard-config/compat/default.in

1 files changed, 98 insertions, 96 deletions

diff --git a/xorg-server/hw/xwin/winlayouts.h b/xorg-server/hw/xwin/winlayouts.h
index c53f0e054..82da2da63 100644
--- a/xorg-server/hw/xwin/winlayouts.h
+++ b/xorg-server/hw/xwin/winlayouts.h
@@ -1,96 +1,98 @@
-/*

- * Copyright (c) 2005 Alexander Gottwald

- *

- * Permission is hereby granted, free of charge, to any person obtaining a

- * copy of this software and associated documentation files (the "Software"),

- * to deal in the Software without restriction, including without limitation

- * the rights to use, copy, modify, merge, publish, distribute, sublicense,

- * and/or sell copies of the Software, and to permit persons to whom the

- * Software is furnished to do so, subject to the following conditions:

- *

- * The above copyright notice and this permission notice shall be included in

- * all copies or substantial portions of the Software.

- *

- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL

- * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR

- * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,

- * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER

- * DEALINGS IN THE SOFTWARE.

- *

- * Except as contained in this notice, the name(s) of the above copyright

- * holders shall not be used in advertising or otherwise to promote the sale,

- * use or other dealings in this Software without prior written authorization.

- */

-/* Definitions for various keyboard layouts from windows and their 

- * XKB settings.

- */

-

-typedef struct 

-{

-    unsigned int winlayout;

-    int winkbtype;

-    char *xkbmodel;

-    char *xkblayout;

-    char *xkbvariant;

-    char *xkboptions;

-    char *layoutname;

-} WinKBLayoutRec, *WinKBLayoutPtr;

-

-/*

-   This table is sorted by low byte of winlayout, then by next byte, etc.

-*/

-

-WinKBLayoutRec winKBLayouts[] =

-{

-    {  0x00000404, -1, "pc105",     "zh_TW",     NULL,        NULL, "Chinese (Taiwan)"},

-    {  0x00000405, -1, "pc105",     "cz",        NULL,        NULL, "Czech"},

-    {  0x00010405, -1, "pc105",     "cz_qwerty", NULL,        NULL, "Czech (QWERTY)"},

-    {  0x00000406, -1, "pc105",     "dk",        NULL,        NULL, "Danish"},

-    {  0x00000407, -1, "pc105",     "de",        NULL,        NULL, "German (Germany)"},

-    {  0x00010407, -1, "pc105",     "de",        NULL,        NULL, "German (Germany,IBM)"},

-    {  0x00000807, -1, "pc105",     "ch",        "de",        NULL, "German (Switzerland)"},

-    {  0x00000409, -1, "pc105",     "us",        NULL,        NULL, "English (USA)"},

-    {  0x00010409, -1, "pc105",     "dvorak",    NULL,        NULL, "English (USA,Dvorak)"},

-    {  0x00020409, -1, "pc105",     "us_intl",   NULL,        NULL, "English (USA,International)"},

-    {  0x00000809, -1, "pc105",     "gb",        NULL,        NULL, "English (United Kingdom)"},

-    {  0x00001009, -1, "pc105",     "ca",        "fr",        NULL, "French (Canada)"},

-    {  0x00011009, -1, "pc105",     "ca",        "multix",    NULL, "Canadian Multilingual Standard"},

-    {  0x00001809, -1, "pc105",     "ie",        NULL,        NULL, "Irish"},

-    {  0x0000040a, -1, "pc105",     "es",        NULL,        NULL, "Spanish (Spain,Traditional Sort)"},

-    {  0x0000080a, -1, "pc105",     "latam",     NULL,        NULL, "Latin American"},

-    {  0x0000040b, -1, "pc105",     "fi",        NULL,        NULL, "Finnish"},

-    {  0x0000040c, -1, "pc105",     "fr",        NULL,        NULL, "French (Standard)"},

-    {  0x0000080c, -1, "pc105",     "be",        NULL,        NULL, "French (Belgian)"},

-    {  0x0001080c, -1, "pc105",     "be",        NULL,        NULL, "Belgian (Comma)"},

-    {  0x00000c0c, -1, "pc105",     "ca",        "fr-legacy", NULL, "French (Canada, Legacy)"},

-    {  0x0000100c, -1, "pc105",     "ch",        "fr",        NULL, "French (Switzerland)"},

-    {  0x0000040d, -1, "pc105",     "il",        NULL,        NULL, "Hebrew"},

-    {  0x0000040e, -1, "pc105",     "hu",        NULL,        NULL, "Hungarian"},

-    {  0x0000040f, -1, "pc105",     "is",        NULL,        NULL, "Icelandic"},

-    {  0x00000410, -1, "pc105",     "it",        NULL,        NULL, "Italian"},

-    {  0x00010410, -1, "pc105",     "it",        NULL,        NULL, "Italian (142)"},

-    {  0xa0000410, -1, "macbook79", "it",        "mac",       NULL, "Italiano (Apple)"},

-    {  0x00000411,  7, "jp106",     "jp",        NULL,        NULL, "Japanese"},

-    {  0x00000413, -1, "pc105",     "nl",        NULL,        NULL, "Dutch"},

-    {  0x00000813, -1, "pc105",     "be",        NULL,        NULL, "Dutch (Belgian)"},

-    {  0x00000414, -1, "pc105",     "no",        NULL,        NULL, "Norwegian"},

-    {  0x00000415, -1, "pc105",     "pl",        NULL,        NULL, "Polish (Programmers)"},

-    {  0x00000416, -1, "pc105",     "br",        NULL,        NULL, "Portuguese (Brazil,ABNT)"},

-    {  0x00010416, -1, "abnt2",     "br",        NULL,        NULL, "Portuguese (Brazil,ABNT2)"},

-    {  0x00000816, -1, "pc105",     "pt",        NULL,        NULL, "Portuguese (Portugal)"},

-    {  0x0000041a, -1, "pc105",     "hr",        NULL,        NULL, "Croatian"},

-    {  0x0000041d, -1, "pc105",     "se",        NULL,        NULL, "Swedish (Sweden)"},

-    {  0x0000041f, -1, "pc105",     "tr",        NULL,        NULL, "Turkish (Q)"},

-    {  0x0001041f, -1, "pc105",     "tr",        "f",         NULL, "Turkish (F)"},

-    {  0x00000424, -1, "pc105",     "si",        NULL,        NULL, "Slovenian"},

-    {  0x00000425, -1, "pc105",     "ee",        NULL,        NULL, "Estonian"},

-    {  0x00000452, -1, "pc105",     "gb",        "intl",      NULL, "United Kingdom (Extended)"},

-    {          -1, -1, NULL,        NULL,        NULL,        NULL, NULL}

-};

-

-/*

-  See http://technet.microsoft.com/en-us/library/cc766503%28WS.10%29.aspx

-  for a listing of input locale (keyboard layout) codes

-*/

+/*
+ * Copyright (c) 2005 Alexander Gottwald
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ *
+ * Except as contained in this notice, the name(s) of the above copyright
+ * holders shall not be used in advertising or otherwise to promote the sale,
+ * use or other dealings in this Software without prior written authorization.
+ */
+/* Definitions for various keyboard layouts from windows and their 
+ * XKB settings.
+ */
+
+typedef struct {
+    unsigned int winlayout;
+    int winkbtype;
+    char *xkbmodel;
+    char *xkblayout;
+    char *xkbvariant;
+    char *xkboptions;
+    char *layoutname;
+} WinKBLayoutRec, *WinKBLayoutPtr;
+
+/*
+   This table is sorted by low byte of winlayout, then by next byte, etc.
+*/
+
+WinKBLayoutRec winKBLayouts[] = {
+    {0x00000404, -1, "pc105", "zh_TW", NULL, NULL, "Chinese (Taiwan)"},
+    {0x00000405, -1, "pc105", "cz", NULL, NULL, "Czech"},
+    {0x00010405, -1, "pc105", "cz_qwerty", NULL, NULL, "Czech (QWERTY)"},
+    {0x00000406, -1, "pc105", "dk", NULL, NULL, "Danish"},
+    {0x00000407, -1, "pc105", "de", NULL, NULL, "German (Germany)"},
+    {0x00010407, -1, "pc105", "de", NULL, NULL, "German (Germany,IBM)"},
+    {0x00000807, -1, "pc105", "ch", "de", NULL, "German (Switzerland)"},
+    {0x00000409, -1, "pc105", "us", NULL, NULL, "English (USA)"},
+    {0x00010409, -1, "pc105", "dvorak", NULL, NULL, "English (USA,Dvorak)"},
+    {0x00020409, -1, "pc105", "us_intl", NULL, NULL,
+     "English (USA,International)"},
+    {0x00000809, -1, "pc105", "gb", NULL, NULL, "English (United Kingdom)"},
+    {0x00001009, -1, "pc105", "ca", "fr", NULL, "French (Canada)"},
+    {0x00011009, -1, "pc105", "ca", "multix", NULL,
+     "Canadian Multilingual Standard"},
+    {0x00001809, -1, "pc105", "ie", NULL, NULL, "Irish"},
+    {0x0000040a, -1, "pc105", "es", NULL, NULL,
+     "Spanish (Spain,Traditional Sort)"},
+    {0x0000080a, -1, "pc105", "latam", NULL, NULL, "Latin American"},
+    {0x0000040b, -1, "pc105", "fi", NULL, NULL, "Finnish"},
+    {0x0000040c, -1, "pc105", "fr", NULL, NULL, "French (Standard)"},
+    {0x0000080c, -1, "pc105", "be", NULL, NULL, "French (Belgian)"},
+    {0x0001080c, -1, "pc105", "be", NULL, NULL, "Belgian (Comma)"},
+    {0x00000c0c, -1, "pc105", "ca", "fr-legacy", NULL,
+     "French (Canada, Legacy)"},
+    {0x0000100c, -1, "pc105", "ch", "fr", NULL, "French (Switzerland)"},
+    {0x0000040d, -1, "pc105", "il", NULL, NULL, "Hebrew"},
+    {0x0000040e, -1, "pc105", "hu", NULL, NULL, "Hungarian"},
+    {0x0000040f, -1, "pc105", "is", NULL, NULL, "Icelandic"},
+    {0x00000410, -1, "pc105", "it", NULL, NULL, "Italian"},
+    {0x00010410, -1, "pc105", "it", NULL, NULL, "Italian (142)"},
+    {0xa0000410, -1, "macbook79", "it", "mac", NULL, "Italiano (Apple)"},
+    {0x00000411, 7, "jp106", "jp", NULL, NULL, "Japanese"},
+    {0x00000413, -1, "pc105", "nl", NULL, NULL, "Dutch"},
+    {0x00000813, -1, "pc105", "be", NULL, NULL, "Dutch (Belgian)"},
+    {0x00000414, -1, "pc105", "no", NULL, NULL, "Norwegian"},
+    {0x00000415, -1, "pc105", "pl", NULL, NULL, "Polish (Programmers)"},
+    {0x00000416, -1, "pc105", "br", NULL, NULL, "Portuguese (Brazil,ABNT)"},
+    {0x00010416, -1, "abnt2", "br", NULL, NULL, "Portuguese (Brazil,ABNT2)"},
+    {0x00000816, -1, "pc105", "pt", NULL, NULL, "Portuguese (Portugal)"},
+    {0x0000041a, -1, "pc105", "hr", NULL, NULL, "Croatian"},
+    {0x0000041d, -1, "pc105", "se", NULL, NULL, "Swedish (Sweden)"},
+    {0x0000041f, -1, "pc105", "tr", NULL, NULL, "Turkish (Q)"},
+    {0x0001041f, -1, "pc105", "tr", "f", NULL, "Turkish (F)"},
+    {0x00000424, -1, "pc105", "si", NULL, NULL, "Slovenian"},
+    {0x00000425, -1, "pc105", "ee", NULL, NULL, "Estonian"},
+    {0x00000452, -1, "pc105", "gb", "intl", NULL, "United Kingdom (Extended)"},
+    {-1, -1, NULL, NULL, NULL, NULL, NULL}
+};
+
+/*
+  See http://technet.microsoft.com/en-us/library/cc766503%28WS.10%29.aspx
+  for a listing of input locale (keyboard layout) codes
+*/