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, 138 insertions, 69 deletions

diff --git a/xorg-server/dix/initatoms.c b/xorg-server/dix/initatoms.c
index de101bd0f..bcc38a0f1 100644
--- a/xorg-server/dix/initatoms.c
+++ b/xorg-server/dix/initatoms.c
@@ -11,74 +11,143 @@
 #include <X11/Xatom.h>
 #include "misc.h"
 #include "dix.h"
-void MakePredeclaredAtoms(void)
+void
+MakePredeclaredAtoms(void)
 {
-    if (MakeAtom("PRIMARY", 7, 1) != XA_PRIMARY) AtomError();
-    if (MakeAtom("SECONDARY", 9, 1) != XA_SECONDARY) AtomError();
-    if (MakeAtom("ARC", 3, 1) != XA_ARC) AtomError();
-    if (MakeAtom("ATOM", 4, 1) != XA_ATOM) AtomError();
-    if (MakeAtom("BITMAP", 6, 1) != XA_BITMAP) AtomError();
-    if (MakeAtom("CARDINAL", 8, 1) != XA_CARDINAL) AtomError();
-    if (MakeAtom("COLORMAP", 8, 1) != XA_COLORMAP) AtomError();
-    if (MakeAtom("CURSOR", 6, 1) != XA_CURSOR) AtomError();
-    if (MakeAtom("CUT_BUFFER0", 11, 1) != XA_CUT_BUFFER0) AtomError();
-    if (MakeAtom("CUT_BUFFER1", 11, 1) != XA_CUT_BUFFER1) AtomError();
-    if (MakeAtom("CUT_BUFFER2", 11, 1) != XA_CUT_BUFFER2) AtomError();
-    if (MakeAtom("CUT_BUFFER3", 11, 1) != XA_CUT_BUFFER3) AtomError();
-    if (MakeAtom("CUT_BUFFER4", 11, 1) != XA_CUT_BUFFER4) AtomError();
-    if (MakeAtom("CUT_BUFFER5", 11, 1) != XA_CUT_BUFFER5) AtomError();
-    if (MakeAtom("CUT_BUFFER6", 11, 1) != XA_CUT_BUFFER6) AtomError();
-    if (MakeAtom("CUT_BUFFER7", 11, 1) != XA_CUT_BUFFER7) AtomError();
-    if (MakeAtom("DRAWABLE", 8, 1) != XA_DRAWABLE) AtomError();
-    if (MakeAtom("FONT", 4, 1) != XA_FONT) AtomError();
-    if (MakeAtom("INTEGER", 7, 1) != XA_INTEGER) AtomError();
-    if (MakeAtom("PIXMAP", 6, 1) != XA_PIXMAP) AtomError();
-    if (MakeAtom("POINT", 5, 1) != XA_POINT) AtomError();
-    if (MakeAtom("RECTANGLE", 9, 1) != XA_RECTANGLE) AtomError();
-    if (MakeAtom("RESOURCE_MANAGER", 16, 1) != XA_RESOURCE_MANAGER) AtomError();
-    if (MakeAtom("RGB_COLOR_MAP", 13, 1) != XA_RGB_COLOR_MAP) AtomError();
-    if (MakeAtom("RGB_BEST_MAP", 12, 1) != XA_RGB_BEST_MAP) AtomError();
-    if (MakeAtom("RGB_BLUE_MAP", 12, 1) != XA_RGB_BLUE_MAP) AtomError();
-    if (MakeAtom("RGB_DEFAULT_MAP", 15, 1) != XA_RGB_DEFAULT_MAP) AtomError();
-    if (MakeAtom("RGB_GRAY_MAP", 12, 1) != XA_RGB_GRAY_MAP) AtomError();
-    if (MakeAtom("RGB_GREEN_MAP", 13, 1) != XA_RGB_GREEN_MAP) AtomError();
-    if (MakeAtom("RGB_RED_MAP", 11, 1) != XA_RGB_RED_MAP) AtomError();
-    if (MakeAtom("STRING", 6, 1) != XA_STRING) AtomError();
-    if (MakeAtom("VISUALID", 8, 1) != XA_VISUALID) AtomError();
-    if (MakeAtom("WINDOW", 6, 1) != XA_WINDOW) AtomError();
-    if (MakeAtom("WM_COMMAND", 10, 1) != XA_WM_COMMAND) AtomError();
-    if (MakeAtom("WM_HINTS", 8, 1) != XA_WM_HINTS) AtomError();
-    if (MakeAtom("WM_CLIENT_MACHINE", 17, 1) != XA_WM_CLIENT_MACHINE) AtomError();
-    if (MakeAtom("WM_ICON_NAME", 12, 1) != XA_WM_ICON_NAME) AtomError();
-    if (MakeAtom("WM_ICON_SIZE", 12, 1) != XA_WM_ICON_SIZE) AtomError();
-    if (MakeAtom("WM_NAME", 7, 1) != XA_WM_NAME) AtomError();
-    if (MakeAtom("WM_NORMAL_HINTS", 15, 1) != XA_WM_NORMAL_HINTS) AtomError();
-    if (MakeAtom("WM_SIZE_HINTS", 13, 1) != XA_WM_SIZE_HINTS) AtomError();
-    if (MakeAtom("WM_ZOOM_HINTS", 13, 1) != XA_WM_ZOOM_HINTS) AtomError();
-    if (MakeAtom("MIN_SPACE", 9, 1) != XA_MIN_SPACE) AtomError();
-    if (MakeAtom("NORM_SPACE", 10, 1) != XA_NORM_SPACE) AtomError();
-    if (MakeAtom("MAX_SPACE", 9, 1) != XA_MAX_SPACE) AtomError();
-    if (MakeAtom("END_SPACE", 9, 1) != XA_END_SPACE) AtomError();
-    if (MakeAtom("SUPERSCRIPT_X", 13, 1) != XA_SUPERSCRIPT_X) AtomError();
-    if (MakeAtom("SUPERSCRIPT_Y", 13, 1) != XA_SUPERSCRIPT_Y) AtomError();
-    if (MakeAtom("SUBSCRIPT_X", 11, 1) != XA_SUBSCRIPT_X) AtomError();
-    if (MakeAtom("SUBSCRIPT_Y", 11, 1) != XA_SUBSCRIPT_Y) AtomError();
-    if (MakeAtom("UNDERLINE_POSITION", 18, 1) != XA_UNDERLINE_POSITION) AtomError();
-    if (MakeAtom("UNDERLINE_THICKNESS", 19, 1) != XA_UNDERLINE_THICKNESS) AtomError();
-    if (MakeAtom("STRIKEOUT_ASCENT", 16, 1) != XA_STRIKEOUT_ASCENT) AtomError();
-    if (MakeAtom("STRIKEOUT_DESCENT", 17, 1) != XA_STRIKEOUT_DESCENT) AtomError();
-    if (MakeAtom("ITALIC_ANGLE", 12, 1) != XA_ITALIC_ANGLE) AtomError();
-    if (MakeAtom("X_HEIGHT", 8, 1) != XA_X_HEIGHT) AtomError();
-    if (MakeAtom("QUAD_WIDTH", 10, 1) != XA_QUAD_WIDTH) AtomError();
-    if (MakeAtom("WEIGHT", 6, 1) != XA_WEIGHT) AtomError();
-    if (MakeAtom("POINT_SIZE", 10, 1) != XA_POINT_SIZE) AtomError();
-    if (MakeAtom("RESOLUTION", 10, 1) != XA_RESOLUTION) AtomError();
-    if (MakeAtom("COPYRIGHT", 9, 1) != XA_COPYRIGHT) AtomError();
-    if (MakeAtom("NOTICE", 6, 1) != XA_NOTICE) AtomError();
-    if (MakeAtom("FONT_NAME", 9, 1) != XA_FONT_NAME) AtomError();
-    if (MakeAtom("FAMILY_NAME", 11, 1) != XA_FAMILY_NAME) AtomError();
-    if (MakeAtom("FULL_NAME", 9, 1) != XA_FULL_NAME) AtomError();
-    if (MakeAtom("CAP_HEIGHT", 10, 1) != XA_CAP_HEIGHT) AtomError();
-    if (MakeAtom("WM_CLASS", 8, 1) != XA_WM_CLASS) AtomError();
-    if (MakeAtom("WM_TRANSIENT_FOR", 16, 1) != XA_WM_TRANSIENT_FOR) AtomError();
+    if (MakeAtom("PRIMARY", 7, 1) != XA_PRIMARY)
+        AtomError();
+    if (MakeAtom("SECONDARY", 9, 1) != XA_SECONDARY)
+        AtomError();
+    if (MakeAtom("ARC", 3, 1) != XA_ARC)
+        AtomError();
+    if (MakeAtom("ATOM", 4, 1) != XA_ATOM)
+        AtomError();
+    if (MakeAtom("BITMAP", 6, 1) != XA_BITMAP)
+        AtomError();
+    if (MakeAtom("CARDINAL", 8, 1) != XA_CARDINAL)
+        AtomError();
+    if (MakeAtom("COLORMAP", 8, 1) != XA_COLORMAP)
+        AtomError();
+    if (MakeAtom("CURSOR", 6, 1) != XA_CURSOR)
+        AtomError();
+    if (MakeAtom("CUT_BUFFER0", 11, 1) != XA_CUT_BUFFER0)
+        AtomError();
+    if (MakeAtom("CUT_BUFFER1", 11, 1) != XA_CUT_BUFFER1)
+        AtomError();
+    if (MakeAtom("CUT_BUFFER2", 11, 1) != XA_CUT_BUFFER2)
+        AtomError();
+    if (MakeAtom("CUT_BUFFER3", 11, 1) != XA_CUT_BUFFER3)
+        AtomError();
+    if (MakeAtom("CUT_BUFFER4", 11, 1) != XA_CUT_BUFFER4)
+        AtomError();
+    if (MakeAtom("CUT_BUFFER5", 11, 1) != XA_CUT_BUFFER5)
+        AtomError();
+    if (MakeAtom("CUT_BUFFER6", 11, 1) != XA_CUT_BUFFER6)
+        AtomError();
+    if (MakeAtom("CUT_BUFFER7", 11, 1) != XA_CUT_BUFFER7)
+        AtomError();
+    if (MakeAtom("DRAWABLE", 8, 1) != XA_DRAWABLE)
+        AtomError();
+    if (MakeAtom("FONT", 4, 1) != XA_FONT)
+        AtomError();
+    if (MakeAtom("INTEGER", 7, 1) != XA_INTEGER)
+        AtomError();
+    if (MakeAtom("PIXMAP", 6, 1) != XA_PIXMAP)
+        AtomError();
+    if (MakeAtom("POINT", 5, 1) != XA_POINT)
+        AtomError();
+    if (MakeAtom("RECTANGLE", 9, 1) != XA_RECTANGLE)
+        AtomError();
+    if (MakeAtom("RESOURCE_MANAGER", 16, 1) != XA_RESOURCE_MANAGER)
+        AtomError();
+    if (MakeAtom("RGB_COLOR_MAP", 13, 1) != XA_RGB_COLOR_MAP)
+        AtomError();
+    if (MakeAtom("RGB_BEST_MAP", 12, 1) != XA_RGB_BEST_MAP)
+        AtomError();
+    if (MakeAtom("RGB_BLUE_MAP", 12, 1) != XA_RGB_BLUE_MAP)
+        AtomError();
+    if (MakeAtom("RGB_DEFAULT_MAP", 15, 1) != XA_RGB_DEFAULT_MAP)
+        AtomError();
+    if (MakeAtom("RGB_GRAY_MAP", 12, 1) != XA_RGB_GRAY_MAP)
+        AtomError();
+    if (MakeAtom("RGB_GREEN_MAP", 13, 1) != XA_RGB_GREEN_MAP)
+        AtomError();
+    if (MakeAtom("RGB_RED_MAP", 11, 1) != XA_RGB_RED_MAP)
+        AtomError();
+    if (MakeAtom("STRING", 6, 1) != XA_STRING)
+        AtomError();
+    if (MakeAtom("VISUALID", 8, 1) != XA_VISUALID)
+        AtomError();
+    if (MakeAtom("WINDOW", 6, 1) != XA_WINDOW)
+        AtomError();
+    if (MakeAtom("WM_COMMAND", 10, 1) != XA_WM_COMMAND)
+        AtomError();
+    if (MakeAtom("WM_HINTS", 8, 1) != XA_WM_HINTS)
+        AtomError();
+    if (MakeAtom("WM_CLIENT_MACHINE", 17, 1) != XA_WM_CLIENT_MACHINE)
+        AtomError();
+    if (MakeAtom("WM_ICON_NAME", 12, 1) != XA_WM_ICON_NAME)
+        AtomError();
+    if (MakeAtom("WM_ICON_SIZE", 12, 1) != XA_WM_ICON_SIZE)
+        AtomError();
+    if (MakeAtom("WM_NAME", 7, 1) != XA_WM_NAME)
+        AtomError();
+    if (MakeAtom("WM_NORMAL_HINTS", 15, 1) != XA_WM_NORMAL_HINTS)
+        AtomError();
+    if (MakeAtom("WM_SIZE_HINTS", 13, 1) != XA_WM_SIZE_HINTS)
+        AtomError();
+    if (MakeAtom("WM_ZOOM_HINTS", 13, 1) != XA_WM_ZOOM_HINTS)
+        AtomError();
+    if (MakeAtom("MIN_SPACE", 9, 1) != XA_MIN_SPACE)
+        AtomError();
+    if (MakeAtom("NORM_SPACE", 10, 1) != XA_NORM_SPACE)
+        AtomError();
+    if (MakeAtom("MAX_SPACE", 9, 1) != XA_MAX_SPACE)
+        AtomError();
+    if (MakeAtom("END_SPACE", 9, 1) != XA_END_SPACE)
+        AtomError();
+    if (MakeAtom("SUPERSCRIPT_X", 13, 1) != XA_SUPERSCRIPT_X)
+        AtomError();
+    if (MakeAtom("SUPERSCRIPT_Y", 13, 1) != XA_SUPERSCRIPT_Y)
+        AtomError();
+    if (MakeAtom("SUBSCRIPT_X", 11, 1) != XA_SUBSCRIPT_X)
+        AtomError();
+    if (MakeAtom("SUBSCRIPT_Y", 11, 1) != XA_SUBSCRIPT_Y)
+        AtomError();
+    if (MakeAtom("UNDERLINE_POSITION", 18, 1) != XA_UNDERLINE_POSITION)
+        AtomError();
+    if (MakeAtom("UNDERLINE_THICKNESS", 19, 1) != XA_UNDERLINE_THICKNESS)
+        AtomError();
+    if (MakeAtom("STRIKEOUT_ASCENT", 16, 1) != XA_STRIKEOUT_ASCENT)
+        AtomError();
+    if (MakeAtom("STRIKEOUT_DESCENT", 17, 1) != XA_STRIKEOUT_DESCENT)
+        AtomError();
+    if (MakeAtom("ITALIC_ANGLE", 12, 1) != XA_ITALIC_ANGLE)
+        AtomError();
+    if (MakeAtom("X_HEIGHT", 8, 1) != XA_X_HEIGHT)
+        AtomError();
+    if (MakeAtom("QUAD_WIDTH", 10, 1) != XA_QUAD_WIDTH)
+        AtomError();
+    if (MakeAtom("WEIGHT", 6, 1) != XA_WEIGHT)
+        AtomError();
+    if (MakeAtom("POINT_SIZE", 10, 1) != XA_POINT_SIZE)
+        AtomError();
+    if (MakeAtom("RESOLUTION", 10, 1) != XA_RESOLUTION)
+        AtomError();
+    if (MakeAtom("COPYRIGHT", 9, 1) != XA_COPYRIGHT)
+        AtomError();
+    if (MakeAtom("NOTICE", 6, 1) != XA_NOTICE)
+        AtomError();
+    if (MakeAtom("FONT_NAME", 9, 1) != XA_FONT_NAME)
+        AtomError();
+    if (MakeAtom("FAMILY_NAME", 11, 1) != XA_FAMILY_NAME)
+        AtomError();
+    if (MakeAtom("FULL_NAME", 9, 1) != XA_FULL_NAME)
+        AtomError();
+    if (MakeAtom("CAP_HEIGHT", 10, 1) != XA_CAP_HEIGHT)
+        AtomError();
+    if (MakeAtom("WM_CLASS", 8, 1) != XA_WM_CLASS)
+        AtomError();
+    if (MakeAtom("WM_TRANSIENT_FOR", 16, 1) != XA_WM_TRANSIENT_FOR)
+        AtomError();
 }