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, 214 insertions, 217 deletions

diff --git a/xorg-server/hw/xfree86/modes/xf86DiDGA.c b/xorg-server/hw/xfree86/modes/xf86DiDGA.c
index b2bbefa62..fafd95aed 100644
--- a/xorg-server/hw/xfree86/modes/xf86DiDGA.c
+++ b/xorg-server/hw/xfree86/modes/xf86DiDGA.c
@@ -1,217 +1,214 @@
-/*

- * Copyright © 2006 Keith Packard

- *

- * Permission to use, copy, modify, distribute, and sell this software and its

- * documentation for any purpose is hereby granted without fee, provided that

- * the above copyright notice appear in all copies and that both that copyright

- * notice and this permission notice appear in supporting documentation, and

- * that the name of the copyright holders not be used in advertising or

- * publicity pertaining to distribution of the software without specific,

- * written prior permission.  The copyright holders make no representations

- * about the suitability of this software for any purpose.  It is provided "as

- * is" without express or implied warranty.

- *

- * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

- * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR

- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE

- * OF THIS SOFTWARE.

- */

-

-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#else

-#ifdef HAVE_CONFIG_H

-#include <config.h>

-#endif

-#endif

-

-#include "xf86.h"

-#include "xf86DDC.h"

-#include "xf86_OSproc.h"

-#include "dgaproc.h"

-#include "xf86Crtc.h"

-#include "xf86Modes.h"

-#include "gcstruct.h"

-#include "scrnintstr.h"

-#include "windowstr.h"

-

-static Bool

-xf86_dga_get_modes (ScreenPtr pScreen)

-{

-    ScrnInfoPtr		scrn = xf86Screens[pScreen->myNum];

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    DGAModePtr		modes, mode;

-    DisplayModePtr	display_mode;

-    int			bpp = scrn->bitsPerPixel >> 3;

-    int			num;

-

-    num = 0;

-    display_mode = scrn->modes;

-    while (display_mode) 

-    {

-	num++;

-	display_mode = display_mode->next;

-	if (display_mode == scrn->modes)

-	    break;

-    }

-    

-    if (!num)

-	return FALSE;

-    

-    modes = malloc(num * sizeof(DGAModeRec));

-    if (!modes)

-	return FALSE;

-    

-    num = 0;

-    display_mode = scrn->modes;

-    while (display_mode) 

-    {

-	mode = modes + num++;

-

-	mode->mode = display_mode;

-	mode->flags = DGA_CONCURRENT_ACCESS;

-	if (display_mode->Flags & V_DBLSCAN)

-	    mode->flags |= DGA_DOUBLESCAN;

-	if (display_mode->Flags & V_INTERLACE)

-	    mode->flags |= DGA_INTERLACED;

-	mode->byteOrder = scrn->imageByteOrder;

-	mode->depth = scrn->depth;

-	mode->bitsPerPixel = scrn->bitsPerPixel;

-	mode->red_mask = scrn->mask.red;

-	mode->green_mask = scrn->mask.green;

-	mode->blue_mask = scrn->mask.blue;

-	mode->visualClass = (bpp == 1) ? PseudoColor : TrueColor;

-	mode->viewportWidth = display_mode->HDisplay;

-	mode->viewportHeight = display_mode->VDisplay;

-	mode->xViewportStep = (bpp == 3) ? 2 : 1;

-	mode->yViewportStep = 1;

-	mode->viewportFlags = DGA_FLIP_RETRACE;

-	mode->offset = 0;

-	mode->address = 0;

-	mode->imageWidth = mode->viewportWidth;

-	mode->imageHeight = mode->viewportHeight;

-	mode->bytesPerScanline = (mode->imageWidth * scrn->bitsPerPixel) >> 3;

-	mode->pixmapWidth = mode->imageWidth;

-	mode->pixmapHeight = mode->imageHeight;

-	mode->maxViewportX = 0;

-	mode->maxViewportY = 0;

-

-	display_mode = display_mode->next;

-	if (display_mode == scrn->modes)

-	    break;

-    }

-    free(xf86_config->dga_modes);

-    xf86_config->dga_nmode = num;

-    xf86_config->dga_modes = modes;

-    return TRUE;

-}

-

-static Bool

-xf86_dga_set_mode(ScrnInfoPtr scrn, DGAModePtr display_mode)

-{

-    ScreenPtr		pScreen = scrn->pScreen;

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-

-    if (!display_mode) 

-    {

-	if (xf86_config->dga_save_mode)

-	{

-	    xf86SwitchMode(pScreen, xf86_config->dga_save_mode);

-	    xf86_config->dga_save_mode = NULL;

-	}

-    }

-    else

-    {

-	if (!xf86_config->dga_save_mode)

-	{

-	    xf86_config->dga_save_mode = scrn->currentMode;

-	    xf86SwitchMode(pScreen, display_mode->mode);

-	}

-    }

-    return TRUE;

-}

-

-static int

-xf86_dga_get_viewport(ScrnInfoPtr scrn)

-{

-    return 0;

-}

-

-static void

-xf86_dga_set_viewport(ScrnInfoPtr scrn, int x, int y, int flags)

-{

-   scrn->AdjustFrame(scrn->pScreen->myNum, x, y, flags);

-}

-

-static Bool

-xf86_dga_open_framebuffer(ScrnInfoPtr scrn,

-			  char **name,

-			  unsigned char **mem, int *size, int *offset, int *flags)

-{

-    return FALSE;

-}

-

-static void

-xf86_dga_close_framebuffer(ScrnInfoPtr scrn)

-{

-}

-

-static DGAFunctionRec xf86_dga_funcs = {

-   xf86_dga_open_framebuffer,

-   xf86_dga_close_framebuffer,

-   xf86_dga_set_mode,

-   xf86_dga_set_viewport,

-   xf86_dga_get_viewport,

-   NULL,

-   NULL,

-   NULL,

-   NULL

-};

-

-Bool

-xf86DiDGAReInit (ScreenPtr pScreen)

-{

-    return TRUE;

-}

-

-Bool

-_xf86_di_dga_reinit_internal (ScreenPtr pScreen)

-{

-    ScrnInfoPtr		scrn = xf86Screens[pScreen->myNum];

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-    

-    if (!DGAAvailable(pScreen->myNum))

-	return TRUE;

-

-    if (!xf86_dga_get_modes (pScreen))

-	return FALSE;

-    

-    return DGAReInitModes (pScreen, xf86_config->dga_modes, xf86_config->dga_nmode);

-}

-

-Bool

-xf86DiDGAInit (ScreenPtr pScreen, unsigned long dga_address)

-{

-    return TRUE;

-}

-

-Bool

-_xf86_di_dga_init_internal (ScreenPtr pScreen)

-{

-    ScrnInfoPtr		scrn = xf86Screens[pScreen->myNum];

-    xf86CrtcConfigPtr   xf86_config = XF86_CRTC_CONFIG_PTR(scrn);

-

-    xf86_config->dga_flags = 0;

-    xf86_config->dga_address = 0;

-    xf86_config->dga_width = 0;

-    xf86_config->dga_height = 0;

-    xf86_config->dga_stride = 0;

-    

-    if (!xf86_dga_get_modes (pScreen))

-	return FALSE;

-    

-    return DGAInit(pScreen, &xf86_dga_funcs, xf86_config->dga_modes, xf86_config->dga_nmode);

-}

+/*
+ * Copyright © 2006 Keith Packard
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+ * documentation for any purpose is hereby granted without fee, provided that
+ * the above copyright notice appear in all copies and that both that copyright
+ * notice and this permission notice appear in supporting documentation, and
+ * that the name of the copyright holders not be used in advertising or
+ * publicity pertaining to distribution of the software without specific,
+ * written prior permission.  The copyright holders make no representations
+ * about the suitability of this software for any purpose.  It is provided "as
+ * is" without express or implied warranty.
+ *
+ * THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+ * EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
+ * OF THIS SOFTWARE.
+ */
+
+#ifdef HAVE_XORG_CONFIG_H
+#include <xorg-config.h>
+#else
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#endif
+
+#include "xf86.h"
+#include "xf86DDC.h"
+#include "xf86_OSproc.h"
+#include "dgaproc.h"
+#include "xf86Crtc.h"
+#include "xf86Modes.h"
+#include "gcstruct.h"
+#include "scrnintstr.h"
+#include "windowstr.h"
+
+static Bool
+xf86_dga_get_modes(ScreenPtr pScreen)
+{
+    ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+    DGAModePtr modes, mode;
+    DisplayModePtr display_mode;
+    int bpp = scrn->bitsPerPixel >> 3;
+    int num;
+
+    num = 0;
+    display_mode = scrn->modes;
+    while (display_mode) {
+        num++;
+        display_mode = display_mode->next;
+        if (display_mode == scrn->modes)
+            break;
+    }
+
+    if (!num)
+        return FALSE;
+
+    modes = malloc(num * sizeof(DGAModeRec));
+    if (!modes)
+        return FALSE;
+
+    num = 0;
+    display_mode = scrn->modes;
+    while (display_mode) {
+        mode = modes + num++;
+
+        mode->mode = display_mode;
+        mode->flags = DGA_CONCURRENT_ACCESS;
+        if (display_mode->Flags & V_DBLSCAN)
+            mode->flags |= DGA_DOUBLESCAN;
+        if (display_mode->Flags & V_INTERLACE)
+            mode->flags |= DGA_INTERLACED;
+        mode->byteOrder = scrn->imageByteOrder;
+        mode->depth = scrn->depth;
+        mode->bitsPerPixel = scrn->bitsPerPixel;
+        mode->red_mask = scrn->mask.red;
+        mode->green_mask = scrn->mask.green;
+        mode->blue_mask = scrn->mask.blue;
+        mode->visualClass = (bpp == 1) ? PseudoColor : TrueColor;
+        mode->viewportWidth = display_mode->HDisplay;
+        mode->viewportHeight = display_mode->VDisplay;
+        mode->xViewportStep = (bpp == 3) ? 2 : 1;
+        mode->yViewportStep = 1;
+        mode->viewportFlags = DGA_FLIP_RETRACE;
+        mode->offset = 0;
+        mode->address = 0;
+        mode->imageWidth = mode->viewportWidth;
+        mode->imageHeight = mode->viewportHeight;
+        mode->bytesPerScanline = (mode->imageWidth * scrn->bitsPerPixel) >> 3;
+        mode->pixmapWidth = mode->imageWidth;
+        mode->pixmapHeight = mode->imageHeight;
+        mode->maxViewportX = 0;
+        mode->maxViewportY = 0;
+
+        display_mode = display_mode->next;
+        if (display_mode == scrn->modes)
+            break;
+    }
+    free(xf86_config->dga_modes);
+    xf86_config->dga_nmode = num;
+    xf86_config->dga_modes = modes;
+    return TRUE;
+}
+
+static Bool
+xf86_dga_set_mode(ScrnInfoPtr scrn, DGAModePtr display_mode)
+{
+    ScreenPtr pScreen = scrn->pScreen;
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+
+    if (!display_mode) {
+        if (xf86_config->dga_save_mode) {
+            xf86SwitchMode(pScreen, xf86_config->dga_save_mode);
+            xf86_config->dga_save_mode = NULL;
+        }
+    }
+    else {
+        if (!xf86_config->dga_save_mode) {
+            xf86_config->dga_save_mode = scrn->currentMode;
+            xf86SwitchMode(pScreen, display_mode->mode);
+        }
+    }
+    return TRUE;
+}
+
+static int
+xf86_dga_get_viewport(ScrnInfoPtr scrn)
+{
+    return 0;
+}
+
+static void
+xf86_dga_set_viewport(ScrnInfoPtr scrn, int x, int y, int flags)
+{
+    scrn->AdjustFrame(scrn->pScreen->myNum, x, y, flags);
+}
+
+static Bool
+xf86_dga_open_framebuffer(ScrnInfoPtr scrn,
+                          char **name,
+                          unsigned char **mem, int *size, int *offset,
+                          int *flags)
+{
+    return FALSE;
+}
+
+static void
+xf86_dga_close_framebuffer(ScrnInfoPtr scrn)
+{
+}
+
+static DGAFunctionRec xf86_dga_funcs = {
+    xf86_dga_open_framebuffer,
+    xf86_dga_close_framebuffer,
+    xf86_dga_set_mode,
+    xf86_dga_set_viewport,
+    xf86_dga_get_viewport,
+    NULL,
+    NULL,
+    NULL,
+    NULL
+};
+
+Bool
+xf86DiDGAReInit(ScreenPtr pScreen)
+{
+    return TRUE;
+}
+
+Bool
+_xf86_di_dga_reinit_internal(ScreenPtr pScreen)
+{
+    ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+
+    if (!DGAAvailable(pScreen->myNum))
+        return TRUE;
+
+    if (!xf86_dga_get_modes(pScreen))
+        return FALSE;
+
+    return DGAReInitModes(pScreen, xf86_config->dga_modes,
+                          xf86_config->dga_nmode);
+}
+
+Bool
+xf86DiDGAInit(ScreenPtr pScreen, unsigned long dga_address)
+{
+    return TRUE;
+}
+
+Bool
+_xf86_di_dga_init_internal(ScreenPtr pScreen)
+{
+    ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+    xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn);
+
+    xf86_config->dga_flags = 0;
+    xf86_config->dga_address = 0;
+    xf86_config->dga_width = 0;
+    xf86_config->dga_height = 0;
+    xf86_config->dga_stride = 0;
+
+    if (!xf86_dga_get_modes(pScreen))
+        return FALSE;
+
+    return DGAInit(pScreen, &xf86_dga_funcs, xf86_config->dga_modes,
+                   xf86_config->dga_nmode);
+}