libXext xserver pixman git update 6-12-2010

11 files changed, 572 insertions, 504 deletions

diff --git a/xorg-server/configure.ac b/xorg-server/configure.ac
index 5546858cd..e3b9a865d 100644
--- a/xorg-server/configure.ac
+++ b/xorg-server/configure.ac
@@ -1335,7 +1335,7 @@ AC_DEFINE(BIGREQS, 1, [Support BigRequests extension])
 

 if test "x$SPECIAL_DTRACE_OBJECTS" = "xyes" ; then

   DIX_LIB='$(top_builddir)/dix/dix.O'

-  OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS)'

+  OS_LIB='$(top_builddir)/os/os.O $(SHA1_LIBS) $(DLOPEN_LIBS)'

 else

   DIX_LIB='$(top_builddir)/dix/libdix.la'

   OS_LIB='$(top_builddir)/os/libos.la'

@@ -2122,7 +2122,7 @@ if test "$KDRIVE" = yes; then
     KDRIVE_STUB_LIB='$(top_builddir)/hw/kdrive/src/libkdrivestubs.la'

     KDRIVE_LOCAL_LIBS="$MAIN_LIB $DIX_LIB $KDRIVE_LIB $KDRIVE_STUB_LIB"

     KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $FB_LIB $MI_LIB $KDRIVE_PURE_LIBS"

-    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB $OS_LIB"

+    KDRIVE_LOCAL_LIBS="$KDRIVE_LOCAL_LIBS $KDRIVE_OS_LIB"

     KDRIVE_LIBS="$KDRIVE_LOCAL_LIBS $XSERVER_SYS_LIBS $GLX_SYS_LIBS $DLOPEN_LIBS $TSLIB_LIBS"

 

     AC_SUBST([XEPHYR_LIBS])

diff --git a/xorg-server/hw/dmx/glxProxy/glxcmds.c b/xorg-server/hw/dmx/glxProxy/glxcmds.c
index 26ffad825..540fd00cd 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmds.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmds.c
@@ -1531,7 +1531,7 @@ int __glXGetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
     int i, p;

 

     screen = req->screen;

-    if (screen > screenInfo.numScreens) {

+    if (screen >= screenInfo.numScreens) {

 	/* The client library must send a valid screen number. */

 	client->errorValue = screen;

 	return BadValue;

@@ -2680,7 +2680,7 @@ int __glXGetFBConfigs(__GLXclientState *cl, GLbyte *pc)
     int numFBConfigs, i, p;

     __GLXscreenInfo *pGlxScreen;

 

-    if (screen > screenInfo.numScreens) {

+    if (screen >= screenInfo.numScreens) {

 	/* The client library must send a valid screen number. */

 	client->errorValue = screen;

 	return BadValue;

@@ -3102,7 +3102,7 @@ int __glXCreatePbuffer(__GLXclientState *cl, GLbyte *pc)
    /*

     ** Look up screen and FBConfig.

     */

-    if (screen > screenInfo.numScreens) {

+    if (screen >= screenInfo.numScreens) {

         /* The client library must send a valid screen number. */

         client->errorValue = screen;

         return BadValue;

diff --git a/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c b/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
index da5956952..ca41c1585 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
@@ -252,7 +252,7 @@ int __glXSwapGetVisualConfigs(__GLXclientState *cl, GLbyte *pc)
 

     __GLX_SWAP_INT(&req->screen);

     screen = req->screen;

-    if (screen > screenInfo.numScreens) {

+    if (screen >= screenInfo.numScreens) {

 	/* The client library must send a valid screen number. */

 	client->errorValue = screen;

 	return BadValue;

diff --git a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c
index def7a39a8..6db06fca7 100644
--- a/xorg-server/hw/kdrive/ephyr/ephyrdriext.c
+++ b/xorg-server/hw/kdrive/ephyr/ephyrdriext.c
@@ -398,7 +398,7 @@ EphyrDuplicateVisual (unsigned int a_screen,
     int i=0 ;

 

     EPHYR_LOG ("enter\n") ; 

-    if (a_screen > screenInfo.numScreens) {

+    if (a_screen >= screenInfo.numScreens) {

         EPHYR_LOG_ERROR ("bad screen number\n") ;

         goto out;

     }

diff --git a/xorg-server/hw/xfree86/common/xf86str.h b/xorg-server/hw/xfree86/common/xf86str.h
index 0b7685012..74ad759c5 100644
--- a/xorg-server/hw/xfree86/common/xf86str.h
+++ b/xorg-server/hw/xfree86/common/xf86str.h
@@ -498,7 +498,7 @@ typedef struct _confdrirec {
 /* These values should be adjusted when new fields are added to ScrnInfoRec */

 #define NUM_RESERVED_INTS		16

 #define NUM_RESERVED_POINTERS		14

-#define NUM_RESERVED_FUNCS		11

+#define NUM_RESERVED_FUNCS		10

 

 typedef pointer (*funcPointer)(void);

 

@@ -652,6 +652,7 @@ typedef Bool xf86PMEventProc              (int, pmEvent, Bool);
 typedef void xf86DPMSSetProc		  (ScrnInfoPtr, int, int);

 typedef void xf86LoadPaletteProc   (ScrnInfoPtr, int, int *, LOCO *, VisualPtr);

 typedef void xf86SetOverscanProc          (ScrnInfoPtr, int);

+typedef void xf86ModeSetProc              (ScrnInfoPtr);

 

 

 /*

@@ -802,6 +803,7 @@ typedef struct _ScrnInfoRec {
     xf86LoadPaletteProc			*LoadPalette;

     xf86SetOverscanProc			*SetOverscan;

     xorgDriverFuncProc			*DriverFunc;

+    xf86ModeSetProc			*ModeSet;

 

     /*

      * This can be used when the minor ABI version is incremented.

diff --git a/xorg-server/hw/xfree86/common/xf86xv.c b/xorg-server/hw/xfree86/common/xf86xv.c
index 74e76f923..9f62a8397 100644
--- a/xorg-server/hw/xfree86/common/xf86xv.c
+++ b/xorg-server/hw/xfree86/common/xf86xv.c
@@ -104,6 +104,7 @@ static void xf86XVClipNotify(WindowPtr pWin, int dx, int dy);
 static Bool xf86XVEnterVT(int, int);

 static void xf86XVLeaveVT(int, int);

 static void xf86XVAdjustFrame(int index, int x, int y, int flags);

+static void xf86XVModeSet(ScrnInfoPtr pScrn);

 

 /* misc */

 

@@ -287,6 +288,7 @@ xf86XVScreenInit(
   ScreenPriv->EnterVT = pScrn->EnterVT;

   ScreenPriv->LeaveVT = pScrn->LeaveVT;

   ScreenPriv->AdjustFrame = pScrn->AdjustFrame;

+  ScreenPriv->ModeSet = pScrn->ModeSet;

 

   pScreen->DestroyWindow = xf86XVDestroyWindow;

   pScreen->WindowExposures = xf86XVWindowExposures;

@@ -295,6 +297,7 @@ xf86XVScreenInit(
   pScrn->LeaveVT = xf86XVLeaveVT;

   if(pScrn->AdjustFrame)

      pScrn->AdjustFrame = xf86XVAdjustFrame;

+  pScrn->ModeSet = xf86XVModeSet;

 

   if(!xf86XVInitAdaptors(pScreen, adaptors, num))

 	return FALSE;

@@ -556,7 +559,7 @@ xf86XVInitAdaptors(
       adaptorPriv->QueryBestSize = adaptorPtr->QueryBestSize;

       adaptorPriv->QueryImageAttributes = adaptorPtr->QueryImageAttributes;

       adaptorPriv->PutImage = adaptorPtr->PutImage;

-      adaptorPriv->ReputImage = adaptorPtr->ReputImage;

+      adaptorPriv->ReputImage = adaptorPtr->ReputImage; /* image/still */

 

       pa->devPriv.ptr = (pointer)adaptorPriv;

 

@@ -661,8 +664,7 @@ xf86XVUpdateCompositeClip(XvPortRecPrivatePtr portPriv)
    pCompositeClip = RegionCreate(NullBox, 1);

    RegionCopy(pCompositeClip, portPriv->clientClip);

    RegionTranslate(pCompositeClip,

-			portPriv->pDraw->x + portPriv->clipOrg.x,

-			portPriv->pDraw->y + portPriv->clipOrg.y);

+		   portPriv->pDraw->x, portPriv->pDraw->y);

    RegionIntersect(pCompositeClip, pregWin, pCompositeClip);

 

    portPriv->pCompositeClip = pCompositeClip;

@@ -687,6 +689,8 @@ xf86XVCopyClip(
 	    portPriv->clientClip = RegionCreate(NullBox, 1);

 	/* Note: this is in window coordinates */

 	RegionCopy(portPriv->clientClip, pGC->clientClip);

+	RegionTranslate(portPriv->clientClip,

+			pGC->clipOrg.x, pGC->clipOrg.y);

     } else if(portPriv->clientClip) { /* free the old clientClip */

 	RegionDestroy(portPriv->clientClip);

 	portPriv->clientClip = NULL;

@@ -697,7 +701,27 @@ xf86XVCopyClip(
 	RegionDestroy(portPriv->pCompositeClip);

     }

 

-    portPriv->clipOrg = pGC->clipOrg;

+    portPriv->pCompositeClip = pGC->pCompositeClip;

+    portPriv->FreeCompositeClip = FALSE;

+    portPriv->subWindowMode = pGC->subWindowMode;

+}

+

+static void

+xf86XVCopyCompositeClip(XvPortRecPrivatePtr portPriv,

+			GCPtr pGC,

+			DrawablePtr pDraw)

+{

+    if (!portPriv->clientClip)

+	portPriv->clientClip = RegionCreate(NullBox, 1);

+    /* Keep the original GC composite clip around for ReputImage */

+    RegionCopy(portPriv->clientClip, pGC->pCompositeClip);

+    RegionTranslate(portPriv->clientClip,

+		    -pDraw->x, -pDraw->y);

+

+    /* get rid of the old clip list */

+    if (portPriv->pCompositeClip && portPriv->FreeCompositeClip)

+	RegionDestroy(portPriv->pCompositeClip);

+

     portPriv->pCompositeClip = pGC->pCompositeClip;

     portPriv->FreeCompositeClip = FALSE;

     portPriv->subWindowMode = pGC->subWindowMode;

@@ -852,6 +876,7 @@ CLIP_VIDEO_BAILOUT:
   return ret;

 }

 

+/* Reput image/still */

 static int

 xf86XVReputImage(XvPortRecPrivatePtr portPriv)

 {

@@ -863,6 +888,11 @@ xf86XVReputImage(XvPortRecPrivatePtr portPriv)
 

   xf86XVUpdateCompositeClip(portPriv);

 

+  /* the clip can get smaller over time */

+  RegionCopy(portPriv->clientClip, portPriv->pCompositeClip);

+  RegionTranslate(portPriv->clientClip,

+		  -portPriv->pDraw->x, -portPriv->pDraw->y);

+

   /* translate the video region to the screen */

   WinBox.x1 = portPriv->pDraw->x + portPriv->drw_x;

   WinBox.y1 = portPriv->pDraw->y + portPriv->drw_y;

@@ -912,7 +942,10 @@ xf86XVReputImage(XvPortRecPrivatePtr portPriv)
   }

 

   ret = (*portPriv->AdaptorRec->ReputImage)(portPriv->pScrn,

+			portPriv->vid_x, portPriv->vid_y,

 			WinBox.x1, WinBox.y1,

+			portPriv->vid_w, portPriv->vid_h,

+			portPriv->drw_w, portPriv->drw_h,

 			&ClipRegion, portPriv->DevPriv.ptr,

 			portPriv->pDraw);

 

@@ -1004,6 +1037,71 @@ xf86XVRemovePortFromWindow(WindowPtr pWin, XvPortRecPrivatePtr portPriv)
      portPriv->pDraw = NULL;

 }

 

+static void

+xf86XVReputOrStopPort(XvPortRecPrivatePtr pPriv,

+		      WindowPtr pWin,

+		      Bool visible)

+{

+    if (!visible) {

+	if (pPriv->isOn == XV_ON) {

+	    (*pPriv->AdaptorRec->StopVideo)(pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);

+	    pPriv->isOn = XV_PENDING;

+	}

+

+	if (!pPriv->type) /* overlaid still/image*/

+	    xf86XVRemovePortFromWindow(pWin, pPriv);

+

+	return;

+    }

+

+    switch (pPriv->type) {

+    case XvInputMask:

+	xf86XVReputVideo(pPriv);

+	break;

+    case XvOutputMask:

+	xf86XVRegetVideo(pPriv);

+	break;

+    default:  /* overlaid still/image*/

+	if (pPriv->AdaptorRec->ReputImage)

+	    xf86XVReputImage(pPriv);

+	break;

+    }

+}

+

+static void

+xf86XVReputOrStopAllPorts(ScrnInfoPtr pScrn)

+{

+    ScreenPtr pScreen = pScrn->pScreen;

+    XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);

+    XvAdaptorPtr pa;

+    int c, i;

+

+    for (c = pxvs->nAdaptors, pa = pxvs->pAdaptors; c > 0; c--, pa++) {

+	XvPortPtr pPort = pa->pPorts;

+

+	for (i = pa->nPorts; i > 0; i--, pPort++) {

+	    XvPortRecPrivatePtr pPriv = (XvPortRecPrivatePtr)pPort->devPriv.ptr;

+	    WindowPtr pWin = (WindowPtr)pPriv->pDraw;

+	    Bool visible;

+

+	    if (pPriv->isOn == XV_OFF || !pWin)

+		continue;

+

+	    visible = pWin->visibility == VisibilityUnobscured ||

+		      pWin->visibility == VisibilityPartiallyObscured;

+

+	    /*

+	     * Stop and remove still/images if

+	     * ReputImage isn't supported.

+	     */

+	    if (!pPriv->type && !pPriv->AdaptorRec->ReputImage)

+		visible = FALSE;

+

+	    xf86XVReputOrStopPort(pPriv, pWin, visible);

+	}

+    }

+}

+

 /****  ScreenRec fields ****/

 

 static Bool

@@ -1048,7 +1146,6 @@ xf86XVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)
   ScreenPtr pScreen = pWin->drawable.pScreen;

   XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);

   XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);

-  XF86XVWindowPtr pPrev;

   XvPortRecPrivatePtr pPriv;

   Bool AreasExposed;

 

@@ -1061,47 +1158,20 @@ xf86XVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)
   /* filter out XClearWindow/Area */

   if (!pWin->valdata) return;

 

-  pPrev = NULL;

-

   while(WinPriv) {

-     pPriv = WinPriv->PortRec;

-

-     /* Reput anyone with a reput function */

+     Bool visible = TRUE;

 

-     switch(pPriv->type) {

-     case XvInputMask:

-	xf86XVReputVideo(pPriv);

-	break;

-     case XvOutputMask:

-	xf86XVRegetVideo(pPriv);

-	break;

-     default:  /* overlaid still/image*/

-	if (pPriv->AdaptorRec->ReputImage)

-	   xf86XVReputImage(pPriv);

-	else if(AreasExposed) {

-	    XF86XVWindowPtr tmp;

+     pPriv = WinPriv->PortRec;

 

-	    if (pPriv->isOn == XV_ON) {

-		(*pPriv->AdaptorRec->StopVideo)(

-		    pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);

-		pPriv->isOn = XV_PENDING;

-	    }

-	    pPriv->pDraw = NULL;

+     /*

+      * Stop and remove still/images if areas were exposed and

+      * ReputImage isn't supported.

+      */

+     if (!pPriv->type && !pPriv->AdaptorRec->ReputImage)

+	visible = !AreasExposed;

 

-	    if(!pPrev)

-		dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey,

-			      WinPriv->next);

-	    else

-	       pPrev->next = WinPriv->next;

-	    tmp = WinPriv;

-	    WinPriv = WinPriv->next;

-	    free(tmp);

-	    continue;

-	}

-	break;

-     }

-     pPrev = WinPriv;

      WinPriv = WinPriv->next;

+     xf86XVReputOrStopPort(pPriv, pWin, visible);

   }

 }

 

@@ -1112,16 +1182,14 @@ xf86XVClipNotify(WindowPtr pWin, int dx, int dy)
   ScreenPtr pScreen = pWin->drawable.pScreen;

   XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);

   XF86XVWindowPtr WinPriv = GET_XF86XV_WINDOW(pWin);

-  XF86XVWindowPtr tmp, pPrev = NULL;

   XvPortRecPrivatePtr pPriv;

-  Bool visible = (pWin->visibility == VisibilityUnobscured) ||

-		 (pWin->visibility == VisibilityPartiallyObscured);

 

   while(WinPriv) {

+     Bool visible = pWin->visibility == VisibilityUnobscured ||

+		    pWin->visibility == VisibilityPartiallyObscured;

+

      pPriv = WinPriv->PortRec;

 

-     if(!pPriv) goto next;

- 

      if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)

 	RegionDestroy(pPriv->pCompositeClip);

 

@@ -1131,34 +1199,15 @@ xf86XVClipNotify(WindowPtr pWin, int dx, int dy)
         (*pPriv->AdaptorRec->ClipNotify)(pPriv->pScrn, pPriv->DevPriv.ptr,

                                          pWin, dx, dy);

 

-     /* Stop everything except images, but stop them too if the

-	window isn't visible.  But we only remove the images. */

-

-     if(pPriv->type || !visible) {

-	if(pPriv->isOn == XV_ON) {

-	    (*pPriv->AdaptorRec->StopVideo)(

-			pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);

-	    pPriv->isOn = XV_PENDING;

-	}

-

-	if(!pPriv->type) {  /* overlaid still/image */

-	    pPriv->pDraw = NULL;

-

-	    if(!pPrev)

-		dixSetPrivate(&pWin->devPrivates, XF86XVWindowKey,

-			      WinPriv->next);

-	    else

-	       pPrev->next = WinPriv->next;

-	    tmp = WinPriv;

-	    WinPriv = WinPriv->next;

-	    free(tmp);

-	    continue;

-	}

-     }

+     /*

+      * Stop and remove still/images if

+      * ReputImage isn't supported.

+      */

+     if (!pPriv->type && !pPriv->AdaptorRec->ReputImage)

+	visible = FALSE;

 

-next:

-     pPrev = WinPriv;

      WinPriv = WinPriv->next;

+     xf86XVReputOrStopPort(pPriv, pWin, visible);

   }

 

   if(ScreenPriv->ClipNotify) {

@@ -1195,6 +1244,7 @@ xf86XVCloseScreen(int i, ScreenPtr pScreen)
   pScrn->EnterVT = ScreenPriv->EnterVT;

   pScrn->LeaveVT = ScreenPriv->LeaveVT;

   pScrn->AdjustFrame = ScreenPriv->AdjustFrame;

+  pScrn->ModeSet = ScreenPriv->ModeSet;

 

   for(c = 0, pa = pxvs->pAdaptors; c < pxvs->nAdaptors; c++, pa++) {

        xf86XVFreeAdaptor(pa);

@@ -1287,11 +1337,7 @@ xf86XVAdjustFrame(int index, int x, int y, int flags)
 {

   ScrnInfoPtr pScrn = xf86Screens[index];

   ScreenPtr pScreen = pScrn->pScreen;

-  XvScreenPtr pxvs = GET_XV_SCREEN(pScreen);

   XF86XVScreenPtr ScreenPriv = GET_XF86XV_SCREEN(pScreen);

-  WindowPtr pWin;

-  XvAdaptorPtr pa;

-  int c, i;

 

   if(ScreenPriv->AdjustFrame) {

 	pScrn->AdjustFrame = ScreenPriv->AdjustFrame;

@@ -1299,40 +1345,30 @@ xf86XVAdjustFrame(int index, int x, int y, int flags)
 	pScrn->AdjustFrame = xf86XVAdjustFrame;

   }

 

-  for(c = pxvs->nAdaptors, pa = pxvs->pAdaptors; c > 0; c--, pa++) {

-      XvPortPtr pPort = pa->pPorts;

-      XvPortRecPrivatePtr pPriv;

-

-      for(i = pa->nPorts; i > 0; i--, pPort++) {

-	pPriv = (XvPortRecPrivatePtr)pPort->devPriv.ptr;

+  xf86XVReputOrStopAllPorts(pScrn);

+}

 

-	if(!pPriv->type && (pPriv->isOn != XV_OFF)) { /* overlaid still/image */

+static void

+xf86XVModeSet(ScrnInfoPtr pScrn)

+{

+    ScreenPtr pScreen = pScrn->pScreen;

+    XF86XVScreenPtr ScreenPriv;

 

-	  if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)

-	     RegionDestroy(pPriv->pCompositeClip);

+    /* Can be called before pScrn->pScreen is set */

+    if (!pScreen)

+	return;

 

-	  pPriv->pCompositeClip = NULL;

+    ScreenPriv = GET_XF86XV_SCREEN(pScreen);

 

-	  pWin = (WindowPtr)pPriv->pDraw;

+    if (ScreenPriv->ModeSet) {

+	pScrn->ModeSet = ScreenPriv->ModeSet;

+	(*pScrn->ModeSet)(pScrn);

+	pScrn->ModeSet = xf86XVModeSet;

+    }

 

-	  if ((pPriv->AdaptorRec->ReputImage) &&

-	     ((pWin->visibility == VisibilityUnobscured) ||

-	      (pWin->visibility == VisibilityPartiallyObscured)))

-	  {

-	      xf86XVReputImage(pPriv);

-	  } else if (pPriv->isOn == XV_ON) {

-	     (*pPriv->AdaptorRec->StopVideo)(

-				 pPriv->pScrn, pPriv->DevPriv.ptr, FALSE);

-	     xf86XVRemovePortFromWindow(pWin, pPriv);

-	     pPriv->isOn = XV_PENDING;

-	     continue;

-	  }

-	}

-     }

-  }

+    xf86XVReputOrStopAllPorts(pScrn);

 }

 

-

 /**** XvAdaptorRec fields ****/

 

 static int

@@ -1429,6 +1465,8 @@ xf86XVPutStill(
   WinBox.x2 = WinBox.x1 + drw_w;

   WinBox.y2 = WinBox.y1 + drw_h;

 

+  xf86XVCopyCompositeClip(portPriv, pGC, pDraw);

+

   RegionInit(&WinRegion, &WinBox, 1);

   RegionNull(&ClipRegion);

   RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);

@@ -1482,6 +1520,8 @@ xf86XVPutStill(
 

      xf86XVEnlistPortInWindow((WindowPtr)pDraw, portPriv);

      portPriv->isOn = XV_ON;

+     portPriv->vid_x = vid_x;  portPriv->vid_y = vid_y;

+     portPriv->vid_w = vid_w;  portPriv->vid_h = vid_h;

      portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;

      portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;

      portPriv->type = 0;  /* no mask means it's transient and should

@@ -1497,6 +1537,10 @@ PUT_STILL_BAILOUT:
 	portPriv->isOn = XV_PENDING;

   }

 

+  /* This clip was copied and only good for one shot */

+  if(!portPriv->FreeCompositeClip)

+     portPriv->pCompositeClip = NULL;

+

   RegionUninit(&WinRegion);

   RegionUninit(&ClipRegion);

 

@@ -1718,6 +1762,8 @@ xf86XVPutImage(
 

   if(!portPriv->pScrn->vtSema) return Success; /* Success ? */

 

+  xf86XVCopyCompositeClip(portPriv, pGC, pDraw);

+

   WinBox.x1 = pDraw->x + drw_x;

   WinBox.y1 = pDraw->y + drw_y;

   WinBox.x2 = WinBox.x1 + drw_w;

@@ -1779,6 +1825,8 @@ xf86XVPutImage(
 	(portPriv->AdaptorRec->flags & VIDEO_OVERLAID_IMAGES)) {

 

      portPriv->isOn = XV_ON;

+     portPriv->vid_x = src_x;  portPriv->vid_y = src_y;

+     portPriv->vid_w = src_w;  portPriv->vid_h = src_h;

      portPriv->drw_x = drw_x;  portPriv->drw_y = drw_y;

      portPriv->drw_w = drw_w;  portPriv->drw_h = drw_h;

      portPriv->type = 0;  /* no mask means it's transient and should

@@ -1794,6 +1842,10 @@ PUT_IMAGE_BAILOUT:
 	portPriv->isOn = XV_PENDING;

   }

 

+  /* This clip was copied and only good for one shot */

+  if(!portPriv->FreeCompositeClip)

+     portPriv->pCompositeClip = NULL;

+

   RegionUninit(&WinRegion);

   RegionUninit(&ClipRegion);

 

diff --git a/xorg-server/hw/xfree86/common/xf86xv.h b/xorg-server/hw/xfree86/common/xf86xv.h
index c3db6cc73..25f3e4ad3 100644
--- a/xorg-server/hw/xfree86/common/xf86xv.h
+++ b/xorg-server/hw/xfree86/common/xf86xv.h
@@ -1,280 +1,286 @@
-
-/*
- * Copyright (c) 1998-2003 by The XFree86 Project, Inc.
- *
- * 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 COPYRIGHT HOLDER(S) OR AUTHOR(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 of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- */
-
-#ifndef _XF86XV_H_
-#define _XF86XV_H_
-
-#include "xvdix.h"
-#include "xf86str.h"
-
-#define VIDEO_NO_CLIPPING			0x00000001
-#define VIDEO_INVERT_CLIPLIST			0x00000002
-#define VIDEO_OVERLAID_IMAGES			0x00000004
-#define VIDEO_OVERLAID_STILLS			0x00000008
-#define VIDEO_CLIP_TO_VIEWPORT			0x00000010
-
-typedef struct {
-  int id;
-  int type;
-  int byte_order;
-  unsigned char guid[16];               
-  int bits_per_pixel;
-  int format;
-  int num_planes;
-
-  /* for RGB formats only */
-  int depth;
-  unsigned int red_mask;       
-  unsigned int green_mask;   
-  unsigned int blue_mask;   
-
-  /* for YUV formats only */
-  unsigned int y_sample_bits;
-  unsigned int u_sample_bits;
-  unsigned int v_sample_bits;   
-  unsigned int horz_y_period;
-  unsigned int horz_u_period;
-  unsigned int horz_v_period;
-  unsigned int vert_y_period;
-  unsigned int vert_u_period;
-  unsigned int vert_v_period;
-  char component_order[32];
-  int scanline_order;
-} XF86ImageRec, *XF86ImagePtr; 
-
-
-typedef struct {
-  ScrnInfoPtr pScrn;
-  int id;
-  unsigned short width, height;
-  int *pitches; /* bytes */
-  int *offsets; /* in bytes from start of framebuffer */
-  DevUnion devPrivate;  
-} XF86SurfaceRec, *XF86SurfacePtr;
-
-
-typedef int (* PutVideoFuncPtr)( ScrnInfoPtr pScrn, 
-	short vid_x, short vid_y, short drw_x, short drw_y,
-	short vid_w, short vid_h, short drw_w, short drw_h,
-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );
-typedef int (* PutStillFuncPtr)( ScrnInfoPtr pScrn, 
-	short vid_x, short vid_y, short drw_x, short drw_y,
-	short vid_w, short vid_h, short drw_w, short drw_h,
-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );
-typedef int (* GetVideoFuncPtr)( ScrnInfoPtr pScrn, 
-	short vid_x, short vid_y, short drw_x, short drw_y,
-	short vid_w, short vid_h, short drw_w, short drw_h,
-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );
-typedef int (* GetStillFuncPtr)( ScrnInfoPtr pScrn, 
-	short vid_x, short vid_y, short drw_x, short drw_y,
-	short vid_w, short vid_h, short drw_w, short drw_h,
-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );
-typedef void (* StopVideoFuncPtr)(ScrnInfoPtr pScrn, pointer data, Bool Exit);
-typedef int (* SetPortAttributeFuncPtr)(ScrnInfoPtr pScrn, Atom attribute,
-	INT32 value, pointer data);
-typedef int (* GetPortAttributeFuncPtr)(ScrnInfoPtr pScrn, Atom attribute,
-	INT32 *value, pointer data);
-typedef void (* QueryBestSizeFuncPtr)(ScrnInfoPtr pScrn, Bool motion,
-	short vid_w, short vid_h, short drw_w, short drw_h, 
-	unsigned int *p_w, unsigned int *p_h, pointer data);
-typedef int (* PutImageFuncPtr)( ScrnInfoPtr pScrn, 
-	short src_x, short src_y, short drw_x, short drw_y,
-	short src_w, short src_h, short drw_w, short drw_h,
-	int image, unsigned char* buf, short width, short height, Bool Sync,
-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );
-typedef int (* ReputImageFuncPtr)( ScrnInfoPtr pScrn, short drw_x, short drw_y,
-	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );
-typedef int (*QueryImageAttributesFuncPtr)(ScrnInfoPtr pScrn, 
-	int image, unsigned short *width, unsigned short *height, 
-	int *pitches, int *offsets);
-typedef void (*ClipNotifyFuncPtr)(ScrnInfoPtr pScrn, pointer data,
-                                  WindowPtr window, int dx, int dy);
-
-typedef enum {
-    XV_OFF,
-    XV_PENDING,
-    XV_ON
-} XvStatus;
-
-/*** this is what the driver needs to fill out ***/
-
-typedef struct {
-  int id;
-  char *name;
-  unsigned short width, height;
-  XvRationalRec rate;
-} XF86VideoEncodingRec, *XF86VideoEncodingPtr;
-
-typedef struct {
-  char 	depth;  
-  short class;
-} XF86VideoFormatRec, *XF86VideoFormatPtr;
-
-typedef struct {
-  int   flags;
-  int   min_value;
-  int   max_value;
-  char  *name;
-} XF86AttributeRec, *XF86AttributePtr;
-
-typedef struct {
-  unsigned int type; 
-  int flags;
-  char *name;
-  int nEncodings;
-  XF86VideoEncodingPtr pEncodings;  
-  int nFormats;
-  XF86VideoFormatPtr pFormats;  
-  int nPorts;
-  DevUnion *pPortPrivates;
-  int nAttributes;
-  XF86AttributePtr pAttributes;
-  int nImages;
-  XF86ImagePtr pImages;
-  PutVideoFuncPtr PutVideo;
-  PutStillFuncPtr PutStill;
-  GetVideoFuncPtr GetVideo;
-  GetStillFuncPtr GetStill;
-  StopVideoFuncPtr StopVideo;
-  SetPortAttributeFuncPtr SetPortAttribute;
-  GetPortAttributeFuncPtr GetPortAttribute;
-  QueryBestSizeFuncPtr QueryBestSize;
-  PutImageFuncPtr PutImage;
-  ReputImageFuncPtr ReputImage;
-  QueryImageAttributesFuncPtr QueryImageAttributes;
-  ClipNotifyFuncPtr ClipNotify;
-} XF86VideoAdaptorRec, *XF86VideoAdaptorPtr;
-
-typedef struct {
-  XF86ImagePtr image;
-  int flags;
-  int (*alloc_surface)(ScrnInfoPtr pScrn,
-		  int id,
-		  unsigned short width, 	
-		  unsigned short height,
-		  XF86SurfacePtr surface);
-  int (*free_surface)(XF86SurfacePtr surface);
-  int (*display) (XF86SurfacePtr surface,
-		  short vid_x, short vid_y, 
-		  short drw_x, short drw_y,
-		  short vid_w, short vid_h, 
-		  short drw_w, short drw_h,
-		  RegionPtr clipBoxes);
-  int (*stop)    (XF86SurfacePtr surface);
-  int (*getAttribute) (ScrnInfoPtr pScrn, Atom attr, INT32 *value);
-  int (*setAttribute) (ScrnInfoPtr pScrn, Atom attr, INT32 value);
-  int max_width;
-  int max_height;
-  int num_attributes;
-  XF86AttributePtr attributes;
-} XF86OffscreenImageRec, *XF86OffscreenImagePtr;
-
-extern _X_EXPORT Bool
-xf86XVScreenInit(
-   ScreenPtr pScreen, 
-   XF86VideoAdaptorPtr 	*Adaptors,
-   int num
-);
-
-typedef int (* xf86XVInitGenericAdaptorPtr)(ScrnInfoPtr pScrn,
-	XF86VideoAdaptorPtr **Adaptors);
-
-extern _X_EXPORT int
-xf86XVRegisterGenericAdaptorDriver(
-    xf86XVInitGenericAdaptorPtr InitFunc
-);
-
-extern _X_EXPORT int
-xf86XVListGenericAdaptors(
-    ScrnInfoPtr          pScrn,
-    XF86VideoAdaptorPtr  **Adaptors
-);
-
-extern _X_EXPORT Bool
-xf86XVRegisterOffscreenImages(
-   ScreenPtr pScreen,
-   XF86OffscreenImagePtr images,
-   int num
-);
-
-extern _X_EXPORT XF86OffscreenImagePtr
-xf86XVQueryOffscreenImages(
-   ScreenPtr pScreen,
-   int *num
-);
-   
-extern _X_EXPORT XF86VideoAdaptorPtr xf86XVAllocateVideoAdaptorRec(ScrnInfoPtr pScrn);
-
-extern _X_EXPORT void xf86XVFreeVideoAdaptorRec(XF86VideoAdaptorPtr ptr);
-
-extern _X_EXPORT void
-xf86XVFillKeyHelper (ScreenPtr pScreen, CARD32 key, RegionPtr clipboxes);
-
-extern _X_EXPORT void
-xf86XVFillKeyHelperDrawable (DrawablePtr pDraw, CARD32 key, RegionPtr clipboxes);
-
-extern _X_EXPORT Bool
-xf86XVClipVideoHelper(
-    BoxPtr dst,
-    INT32 *xa,
-    INT32 *xb,
-    INT32 *ya,
-    INT32 *yb,
-    RegionPtr reg,
-    INT32 width,
-    INT32 height
-);
-
-extern _X_EXPORT void
-xf86XVCopyYUV12ToPacked(
-    const void *srcy,
-    const void *srcv,
-    const void *srcu,
-    void *dst,
-    int srcPitchy,
-    int srcPitchuv,
-    int dstPitch,
-    int h,
-    int w
-);
-
-extern _X_EXPORT void
-xf86XVCopyPacked(
-    const void *src,
-    void *dst,
-    int srcPitch,
-    int dstPitch,
-    int h,
-    int w
-);
-
-extern _X_EXPORT DevPrivateKey (*XvGetScreenKeyProc)(void);
-extern _X_EXPORT unsigned long (*XvGetRTPortProc)(void);
-extern _X_EXPORT int (*XvScreenInitProc)(ScreenPtr);
-
-#endif  /* _XF86XV_H_ */
+

+/*

+ * Copyright (c) 1998-2003 by The XFree86 Project, Inc.

+ *

+ * 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 COPYRIGHT HOLDER(S) OR AUTHOR(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 of the copyright holder(s)

+ * and author(s) shall not be used in advertising or otherwise to promote

+ * the sale, use or other dealings in this Software without prior written

+ * authorization from the copyright holder(s) and author(s).

+ */

+

+#ifndef _XF86XV_H_

+#define _XF86XV_H_

+

+#include "xvdix.h"

+#include "xf86str.h"

+

+#define VIDEO_NO_CLIPPING			0x00000001

+#define VIDEO_INVERT_CLIPLIST			0x00000002

+#define VIDEO_OVERLAID_IMAGES			0x00000004

+#define VIDEO_OVERLAID_STILLS			0x00000008

+/*

+ * Usage of VIDEO_CLIP_TO_VIEWPORT is not recommended.

+ * It can make reput behaviour inconsistent.

+ */

+#define VIDEO_CLIP_TO_VIEWPORT			0x00000010

+

+typedef struct {

+  int id;

+  int type;

+  int byte_order;

+  unsigned char guid[16];               

+  int bits_per_pixel;

+  int format;

+  int num_planes;

+

+  /* for RGB formats only */

+  int depth;

+  unsigned int red_mask;       

+  unsigned int green_mask;   

+  unsigned int blue_mask;   

+

+  /* for YUV formats only */

+  unsigned int y_sample_bits;

+  unsigned int u_sample_bits;

+  unsigned int v_sample_bits;   

+  unsigned int horz_y_period;

+  unsigned int horz_u_period;

+  unsigned int horz_v_period;

+  unsigned int vert_y_period;

+  unsigned int vert_u_period;

+  unsigned int vert_v_period;

+  char component_order[32];

+  int scanline_order;

+} XF86ImageRec, *XF86ImagePtr; 

+

+

+typedef struct {

+  ScrnInfoPtr pScrn;

+  int id;

+  unsigned short width, height;

+  int *pitches; /* bytes */

+  int *offsets; /* in bytes from start of framebuffer */

+  DevUnion devPrivate;  

+} XF86SurfaceRec, *XF86SurfacePtr;

+

+

+typedef int (* PutVideoFuncPtr)( ScrnInfoPtr pScrn, 

+	short vid_x, short vid_y, short drw_x, short drw_y,

+	short vid_w, short vid_h, short drw_w, short drw_h,

+	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

+typedef int (* PutStillFuncPtr)( ScrnInfoPtr pScrn, 

+	short vid_x, short vid_y, short drw_x, short drw_y,

+	short vid_w, short vid_h, short drw_w, short drw_h,

+	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

+typedef int (* GetVideoFuncPtr)( ScrnInfoPtr pScrn, 

+	short vid_x, short vid_y, short drw_x, short drw_y,

+	short vid_w, short vid_h, short drw_w, short drw_h,

+	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

+typedef int (* GetStillFuncPtr)( ScrnInfoPtr pScrn, 

+	short vid_x, short vid_y, short drw_x, short drw_y,

+	short vid_w, short vid_h, short drw_w, short drw_h,

+	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

+typedef void (* StopVideoFuncPtr)(ScrnInfoPtr pScrn, pointer data, Bool Exit);

+typedef int (* SetPortAttributeFuncPtr)(ScrnInfoPtr pScrn, Atom attribute,

+	INT32 value, pointer data);

+typedef int (* GetPortAttributeFuncPtr)(ScrnInfoPtr pScrn, Atom attribute,

+	INT32 *value, pointer data);

+typedef void (* QueryBestSizeFuncPtr)(ScrnInfoPtr pScrn, Bool motion,

+	short vid_w, short vid_h, short drw_w, short drw_h, 

+	unsigned int *p_w, unsigned int *p_h, pointer data);

+typedef int (* PutImageFuncPtr)( ScrnInfoPtr pScrn, 

+	short src_x, short src_y, short drw_x, short drw_y,

+	short src_w, short src_h, short drw_w, short drw_h,

+	int image, unsigned char* buf, short width, short height, Bool Sync,

+	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

+typedef int (* ReputImageFuncPtr)( ScrnInfoPtr pScrn,

+	short src_x, short src_y, short drw_x, short drw_y,

+	short src_w, short src_h, short drw_w, short drw_h,

+	RegionPtr clipBoxes, pointer data, DrawablePtr pDraw );

+typedef int (*QueryImageAttributesFuncPtr)(ScrnInfoPtr pScrn, 

+	int image, unsigned short *width, unsigned short *height, 

+	int *pitches, int *offsets);

+typedef void (*ClipNotifyFuncPtr)(ScrnInfoPtr pScrn, pointer data,

+                                  WindowPtr window, int dx, int dy);

+

+typedef enum {

+    XV_OFF,

+    XV_PENDING,

+    XV_ON

+} XvStatus;

+

+/*** this is what the driver needs to fill out ***/

+

+typedef struct {

+  int id;

+  char *name;

+  unsigned short width, height;

+  XvRationalRec rate;

+} XF86VideoEncodingRec, *XF86VideoEncodingPtr;

+

+typedef struct {

+  char 	depth;  

+  short class;

+} XF86VideoFormatRec, *XF86VideoFormatPtr;

+

+typedef struct {

+  int   flags;

+  int   min_value;

+  int   max_value;

+  char  *name;

+} XF86AttributeRec, *XF86AttributePtr;

+

+typedef struct {

+  unsigned int type; 

+  int flags;

+  char *name;

+  int nEncodings;

+  XF86VideoEncodingPtr pEncodings;  

+  int nFormats;

+  XF86VideoFormatPtr pFormats;  

+  int nPorts;

+  DevUnion *pPortPrivates;

+  int nAttributes;

+  XF86AttributePtr pAttributes;

+  int nImages;

+  XF86ImagePtr pImages;

+  PutVideoFuncPtr PutVideo;

+  PutStillFuncPtr PutStill;

+  GetVideoFuncPtr GetVideo;

+  GetStillFuncPtr GetStill;

+  StopVideoFuncPtr StopVideo;

+  SetPortAttributeFuncPtr SetPortAttribute;

+  GetPortAttributeFuncPtr GetPortAttribute;

+  QueryBestSizeFuncPtr QueryBestSize;

+  PutImageFuncPtr PutImage;

+  ReputImageFuncPtr ReputImage; /* image/still */

+  QueryImageAttributesFuncPtr QueryImageAttributes;

+  ClipNotifyFuncPtr ClipNotify;

+} XF86VideoAdaptorRec, *XF86VideoAdaptorPtr;

+

+typedef struct {

+  XF86ImagePtr image;

+  int flags;

+  int (*alloc_surface)(ScrnInfoPtr pScrn,

+		  int id,

+		  unsigned short width, 	

+		  unsigned short height,

+		  XF86SurfacePtr surface);

+  int (*free_surface)(XF86SurfacePtr surface);

+  int (*display) (XF86SurfacePtr surface,

+		  short vid_x, short vid_y, 

+		  short drw_x, short drw_y,

+		  short vid_w, short vid_h, 

+		  short drw_w, short drw_h,

+		  RegionPtr clipBoxes);

+  int (*stop)    (XF86SurfacePtr surface);

+  int (*getAttribute) (ScrnInfoPtr pScrn, Atom attr, INT32 *value);

+  int (*setAttribute) (ScrnInfoPtr pScrn, Atom attr, INT32 value);

+  int max_width;

+  int max_height;

+  int num_attributes;

+  XF86AttributePtr attributes;

+} XF86OffscreenImageRec, *XF86OffscreenImagePtr;

+

+extern _X_EXPORT Bool

+xf86XVScreenInit(

+   ScreenPtr pScreen, 

+   XF86VideoAdaptorPtr 	*Adaptors,

+   int num

+);

+

+typedef int (* xf86XVInitGenericAdaptorPtr)(ScrnInfoPtr pScrn,

+	XF86VideoAdaptorPtr **Adaptors);

+

+extern _X_EXPORT int

+xf86XVRegisterGenericAdaptorDriver(

+    xf86XVInitGenericAdaptorPtr InitFunc

+);

+

+extern _X_EXPORT int

+xf86XVListGenericAdaptors(

+    ScrnInfoPtr          pScrn,

+    XF86VideoAdaptorPtr  **Adaptors

+);

+

+extern _X_EXPORT Bool

+xf86XVRegisterOffscreenImages(

+   ScreenPtr pScreen,

+   XF86OffscreenImagePtr images,

+   int num

+);

+

+extern _X_EXPORT XF86OffscreenImagePtr

+xf86XVQueryOffscreenImages(

+   ScreenPtr pScreen,

+   int *num

+);

+   

+extern _X_EXPORT XF86VideoAdaptorPtr xf86XVAllocateVideoAdaptorRec(ScrnInfoPtr pScrn);

+

+extern _X_EXPORT void xf86XVFreeVideoAdaptorRec(XF86VideoAdaptorPtr ptr);

+

+extern _X_EXPORT void

+xf86XVFillKeyHelper (ScreenPtr pScreen, CARD32 key, RegionPtr clipboxes);

+

+extern _X_EXPORT void

+xf86XVFillKeyHelperDrawable (DrawablePtr pDraw, CARD32 key, RegionPtr clipboxes);

+

+extern _X_EXPORT Bool

+xf86XVClipVideoHelper(

+    BoxPtr dst,

+    INT32 *xa,

+    INT32 *xb,

+    INT32 *ya,

+    INT32 *yb,

+    RegionPtr reg,

+    INT32 width,

+    INT32 height

+);

+

+extern _X_EXPORT void

+xf86XVCopyYUV12ToPacked(

+    const void *srcy,

+    const void *srcv,

+    const void *srcu,

+    void *dst,

+    int srcPitchy,

+    int srcPitchuv,

+    int dstPitch,

+    int h,

+    int w

+);

+

+extern _X_EXPORT void

+xf86XVCopyPacked(

+    const void *src,

+    void *dst,

+    int srcPitch,

+    int dstPitch,

+    int h,

+    int w

+);

+

+extern _X_EXPORT DevPrivateKey (*XvGetScreenKeyProc)(void);

+extern _X_EXPORT unsigned long (*XvGetRTPortProc)(void);

+extern _X_EXPORT int (*XvScreenInitProc)(ScreenPtr);

+

+#endif  /* _XF86XV_H_ */

diff --git a/xorg-server/hw/xfree86/common/xf86xvpriv.h b/xorg-server/hw/xfree86/common/xf86xvpriv.h
index 7623d297d..35d72ca9c 100644
--- a/xorg-server/hw/xfree86/common/xf86xvpriv.h
+++ b/xorg-server/hw/xfree86/common/xf86xvpriv.h
@@ -1,88 +1,88 @@
-
-/*
- * Copyright (c) 2003 by The XFree86 Project, Inc.
- *
- * 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 COPYRIGHT HOLDER(S) OR AUTHOR(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 of the copyright holder(s)
- * and author(s) shall not be used in advertising or otherwise to promote
- * the sale, use or other dealings in this Software without prior written
- * authorization from the copyright holder(s) and author(s).
- */
-
-#ifndef _XF86XVPRIV_H_
-#define _XF86XVPRIV_H_
-
-#include "xf86xv.h"
-#include "privates.h"
-
-/*** These are DDX layer privates ***/
-
-extern _X_EXPORT DevPrivateKey XF86XvScreenKey;
-
-typedef struct {
-   DestroyWindowProcPtr		DestroyWindow;
-   ClipNotifyProcPtr		ClipNotify;
-   WindowExposuresProcPtr	WindowExposures;
-   void                         (*AdjustFrame)(int, int, int, int);
-   Bool                         (*EnterVT)(int, int);
-   void                         (*LeaveVT)(int, int);
-   GCPtr			videoGC;
-} XF86XVScreenRec, *XF86XVScreenPtr;
-
-typedef struct {
-  int flags;  
-  PutVideoFuncPtr PutVideo;
-  PutStillFuncPtr PutStill;
-  GetVideoFuncPtr GetVideo;
-  GetStillFuncPtr GetStill;
-  StopVideoFuncPtr StopVideo;
-  SetPortAttributeFuncPtr SetPortAttribute;
-  GetPortAttributeFuncPtr GetPortAttribute;
-  QueryBestSizeFuncPtr QueryBestSize;
-  PutImageFuncPtr PutImage;
-  ReputImageFuncPtr ReputImage;
-  QueryImageAttributesFuncPtr QueryImageAttributes;
-  ClipNotifyFuncPtr ClipNotify;
-} XvAdaptorRecPrivate, *XvAdaptorRecPrivatePtr;
-
-typedef struct {
-   ScrnInfoPtr pScrn;
-   DrawablePtr pDraw;
-   unsigned char type;
-   unsigned int subWindowMode;
-   DDXPointRec clipOrg;
-   RegionPtr clientClip;
-   RegionPtr pCompositeClip;
-   Bool FreeCompositeClip;
-   XvAdaptorRecPrivatePtr AdaptorRec;
-   XvStatus isOn;
-   Bool moved;
-   int vid_x, vid_y, vid_w, vid_h;
-   int drw_x, drw_y, drw_w, drw_h;
-   DevUnion DevPriv;
-} XvPortRecPrivate, *XvPortRecPrivatePtr;
-
-typedef struct _XF86XVWindowRec{
-   XvPortRecPrivatePtr PortRec;
-   struct _XF86XVWindowRec *next;
-   GCPtr pGC;
-} XF86XVWindowRec, *XF86XVWindowPtr;
-
-#endif  /* _XF86XVPRIV_H_ */
+

+/*

+ * Copyright (c) 2003 by The XFree86 Project, Inc.

+ *

+ * 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 COPYRIGHT HOLDER(S) OR AUTHOR(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 of the copyright holder(s)

+ * and author(s) shall not be used in advertising or otherwise to promote

+ * the sale, use or other dealings in this Software without prior written

+ * authorization from the copyright holder(s) and author(s).

+ */

+

+#ifndef _XF86XVPRIV_H_

+#define _XF86XVPRIV_H_

+

+#include "xf86xv.h"

+#include "privates.h"

+

+/*** These are DDX layer privates ***/

+

+extern _X_EXPORT DevPrivateKey XF86XvScreenKey;

+

+typedef struct {

+   DestroyWindowProcPtr		DestroyWindow;

+   ClipNotifyProcPtr		ClipNotify;

+   WindowExposuresProcPtr	WindowExposures;

+   void                         (*AdjustFrame)(int, int, int, int);

+   Bool                         (*EnterVT)(int, int);

+   void                         (*LeaveVT)(int, int);

+   GCPtr			videoGC;

+   xf86ModeSetProc		*ModeSet;

+} XF86XVScreenRec, *XF86XVScreenPtr;

+

+typedef struct {

+  int flags;  

+  PutVideoFuncPtr PutVideo;

+  PutStillFuncPtr PutStill;

+  GetVideoFuncPtr GetVideo;

+  GetStillFuncPtr GetStill;

+  StopVideoFuncPtr StopVideo;

+  SetPortAttributeFuncPtr SetPortAttribute;

+  GetPortAttributeFuncPtr GetPortAttribute;

+  QueryBestSizeFuncPtr QueryBestSize;

+  PutImageFuncPtr PutImage;

+  ReputImageFuncPtr ReputImage;

+  QueryImageAttributesFuncPtr QueryImageAttributes;

+  ClipNotifyFuncPtr ClipNotify;

+} XvAdaptorRecPrivate, *XvAdaptorRecPrivatePtr;

+

+typedef struct {

+   ScrnInfoPtr pScrn;

+   DrawablePtr pDraw;

+   unsigned char type;

+   unsigned int subWindowMode;

+   RegionPtr clientClip;

+   RegionPtr pCompositeClip;

+   Bool FreeCompositeClip;

+   XvAdaptorRecPrivatePtr AdaptorRec;

+   XvStatus isOn;

+   Bool moved;

+   int vid_x, vid_y, vid_w, vid_h;

+   int drw_x, drw_y, drw_w, drw_h;

+   DevUnion DevPriv;

+} XvPortRecPrivate, *XvPortRecPrivatePtr;

+

+typedef struct _XF86XVWindowRec{

+   XvPortRecPrivatePtr PortRec;

+   struct _XF86XVWindowRec *next;

+   GCPtr pGC;

+} XF86XVWindowRec, *XF86XVWindowPtr;

+

+#endif  /* _XF86XVPRIV_H_ */

diff --git a/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c b/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
index 060e5a4d7..f1c740723 100644
--- a/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
+++ b/xorg-server/hw/xfree86/dixmods/extmod/xf86dga2.c
@@ -99,7 +99,7 @@ ProcXDGAOpenFramebuffer(ClientPtr client)
     char *deviceName;

     int nameSize;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if (!DGAAvailable(stuff->screen))

@@ -133,7 +133,7 @@ ProcXDGACloseFramebuffer(ClientPtr client)
 {

     REQUEST(xXDGACloseFramebufferReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if (!DGAAvailable(stuff->screen))

@@ -155,7 +155,7 @@ ProcXDGAQueryModes(ClientPtr client)
     xXDGAModeInfo info;

     XDGAModePtr mode;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     REQUEST_SIZE_MATCH(xXDGAQueryModesReq);

@@ -274,7 +274,7 @@ ProcXDGASetMode(ClientPtr client)
     ClientPtr owner;

     int size;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

     owner = DGA_GETCLIENT(stuff->screen);

 

@@ -363,7 +363,7 @@ ProcXDGASetViewport(ClientPtr client)
 {

     REQUEST(xXDGASetViewportReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -383,7 +383,7 @@ ProcXDGAInstallColormap(ClientPtr client)
     int rc;

     REQUEST(xXDGAInstallColormapReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -405,7 +405,7 @@ ProcXDGASelectInput(ClientPtr client)
 {

     REQUEST(xXDGASelectInputReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -425,7 +425,7 @@ ProcXDGAFillRectangle(ClientPtr client)
 {

     REQUEST(xXDGAFillRectangleReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -445,7 +445,7 @@ ProcXDGACopyArea(ClientPtr client)
 {

     REQUEST(xXDGACopyAreaReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -466,7 +466,7 @@ ProcXDGACopyTransparentArea(ClientPtr client)
 {

     REQUEST(xXDGACopyTransparentAreaReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -488,7 +488,7 @@ ProcXDGAGetViewportStatus(ClientPtr client)
     REQUEST(xXDGAGetViewportStatusReq);

     xXDGAGetViewportStatusReply rep;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -511,7 +511,7 @@ ProcXDGASync(ClientPtr client)
     REQUEST(xXDGASyncReq);

     xXDGASyncReply rep;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -556,7 +556,7 @@ ProcXDGAChangePixmapMode(ClientPtr client)
     xXDGAChangePixmapModeReply rep;

     int x, y;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -587,7 +587,7 @@ ProcXDGACreateColormap(ClientPtr client)
     REQUEST(xXDGACreateColormapReq);

     int result;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

         return BadValue;

 

     if(DGA_GETCLIENT(stuff->screen) != client)

@@ -625,7 +625,7 @@ ProcXF86DGAGetVideoLL(ClientPtr client)
     int num, offset, flags;

     char *name;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     REQUEST_SIZE_MATCH(xXF86DGAGetVideoLLReq);

@@ -664,7 +664,7 @@ ProcXF86DGADirectVideo(ClientPtr client)
     ClientPtr owner;

     REQUEST(xXF86DGADirectVideoReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

     REQUEST_SIZE_MATCH(xXF86DGADirectVideoReq);

 

@@ -718,7 +718,7 @@ ProcXF86DGAGetViewPortSize(ClientPtr client)
     REQUEST(xXF86DGAGetViewPortSizeReq);

     xXF86DGAGetViewPortSizeReply rep;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     REQUEST_SIZE_MATCH(xXF86DGAGetViewPortSizeReq);

@@ -746,7 +746,7 @@ ProcXF86DGASetViewPort(ClientPtr client)
 {

     REQUEST(xXF86DGASetViewPortReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     if (DGA_GETCLIENT(stuff->screen) != client)

@@ -773,7 +773,7 @@ ProcXF86DGAGetVidPage(ClientPtr client)
     REQUEST(xXF86DGAGetVidPageReq);

     xXF86DGAGetVidPageReply rep;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     REQUEST_SIZE_MATCH(xXF86DGAGetVidPageReq);

@@ -792,7 +792,7 @@ ProcXF86DGASetVidPage(ClientPtr client)
 {

     REQUEST(xXF86DGASetVidPageReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     REQUEST_SIZE_MATCH(xXF86DGASetVidPageReq);

@@ -810,7 +810,7 @@ ProcXF86DGAInstallColormap(ClientPtr client)
     int rc;

     REQUEST(xXF86DGAInstallColormapReq);

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     if (DGA_GETCLIENT(stuff->screen) != client)

@@ -837,7 +837,7 @@ ProcXF86DGAQueryDirectVideo(ClientPtr client)
     REQUEST(xXF86DGAQueryDirectVideoReq);

     xXF86DGAQueryDirectVideoReply rep;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     REQUEST_SIZE_MATCH(xXF86DGAQueryDirectVideoReq);

@@ -859,7 +859,7 @@ ProcXF86DGAViewPortChanged(ClientPtr client)
     REQUEST(xXF86DGAViewPortChangedReq);

     xXF86DGAViewPortChangedReply rep;

 

-    if (stuff->screen > screenInfo.numScreens)

+    if (stuff->screen >= screenInfo.numScreens)

 	return BadValue;

 

     if (DGA_GETCLIENT(stuff->screen) != client)

diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c
index d421a942f..77f7375b1 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.c
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c
@@ -371,6 +371,8 @@ done:
 	crtc->active = TRUE;

 	if (scrn->pScreen)

 	    xf86CrtcSetScreenSubpixelOrder (scrn->pScreen);

+	if (scrn->ModeSet)

+	    scrn->ModeSet(scrn);

     } else {

 	crtc->x = saved_x;

 	crtc->y = saved_y;

@@ -407,12 +409,16 @@ xf86CrtcSetMode (xf86CrtcPtr crtc, DisplayModePtr mode, Rotation rotation,
 void

 xf86CrtcSetOrigin (xf86CrtcPtr crtc, int x, int y)

 {

+    ScrnInfoPtr scrn = crtc->scrn;

+

     crtc->x = x;

     crtc->y = y;

     if (crtc->funcs->set_origin) {

 	if (!xf86CrtcRotate (crtc))

 	    return;

 	crtc->funcs->set_origin (crtc, x, y);

+	if (scrn->ModeSet)

+	    scrn->ModeSet(scrn);

     }

     else

 	xf86CrtcSetMode (crtc, &crtc->mode, crtc->rotation, x, y);

@@ -2894,6 +2900,8 @@ xf86DisableUnusedFunctions(ScrnInfoPtr pScrn)
     }

     if (pScrn->pScreen)

 	xf86_crtc_notify(pScrn->pScreen);

+    if (pScrn->ModeSet)

+	pScrn->ModeSet(pScrn);

 }

 

 #ifdef RANDR_12_INTERFACE

diff --git a/xorg-server/render/render.c b/xorg-server/render/render.c
index 623d5db33..a9cbfef8b 100644
--- a/xorg-server/render/render.c
+++ b/xorg-server/render/render.c
@@ -2552,8 +2552,8 @@ static void swapStops(void *stuff, int num)
     }

     colors = (CARD16 *)(stops);

     for (i = 0; i < 4*num; ++i) {

-        swaps(stops, n);

-        ++stops;

+        swaps(colors, n);

+        ++colors;

     }

 }