Sun Feb 10 01:12:35 PST 2013

2 files changed, 0 insertions, 158 deletions

diff --git a/extra/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch b/extra/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch
deleted file mode 100644
index e3e42d410..000000000
--- a/extra/xorg-server/0001-dix-fix-zaphod-screen-scrossing-54654.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 29d84d5a7ca4cc12cce47de9313adeb8554fb894 Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Thu, 18 Oct 2012 15:11:31 +1000
-Subject: [PATCH] dix: fix zaphod screen scrossing (#54654)
-
-POINTER_SCREEN coordinates are screen-relative. For a Zaphod setup, the
-coordinates after a screen crossing are already relative to the new screen's
-origin. Add that offset to the coordinates before re-setting.
-
-regression introduced by
-commit bafbd99080be49a17be97d2cc758fbe623369945
-Author: Peter Hutterer <peter.hutterer@who-t.net>
-Date:   Wed Aug 8 11:34:32 2012 +1000
-
-    dix: work around scaling issues during WarpPointer (#53037)
-
-X.Org Bug 54654 <http://bugs.freedesktop.org/show_bug.cgi?id=54654>
-
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- dix/getevents.c | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/dix/getevents.c b/dix/getevents.c
-index 71d83c4..8b4379d 100644
---- a/dix/getevents.c
-+++ b/dix/getevents.c
-@@ -1400,8 +1400,9 @@ fill_pointer_events(InternalEvent *events, DeviceIntPtr pDev, int type,
-        coordinates were.
-      */
-     if (flags & POINTER_SCREEN) {
--        screenx = sx;
--        screeny = sy;
-+        scr = miPointerGetScreen(pDev);
-+        screenx = sx + scr->x;
-+        screeny = sy + scr->y;
-     }
- 
-     scr = positionSprite(pDev, (flags & POINTER_ABSOLUTE) ? Absolute : Relative,
--- 
-1.7.11.7
-
diff --git a/extra/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff b/extra/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
deleted file mode 100644
index 12c110151..000000000
--- a/extra/xorg-server/EXA_Fall_back_earlier_and_more_thoroughly_from_exaGlyphsV2.diff
+++ /dev/null
@@ -1,116 +0,0 @@
---- xorg-server-1.12.1/exa/exa_glyphs.c	2012-03-30 04:57:25.000000000 +0200
-+++ xorg-server-1.12.1/exa_glyphs.c.new	2012-04-15 11:48:51.683214230 +0200
-@@ -686,6 +686,7 @@
-     PixmapPtr pMaskPixmap = 0;
-     PicturePtr pMask = NULL;
-     ScreenPtr pScreen = pDst->pDrawable->pScreen;
-+    ExaScreenPriv(pScreen);
-     int width = 0, height = 0;
-     int x, y;
-     int first_xOff = list->xOff, first_yOff = list->yOff;
-@@ -697,7 +698,6 @@
-     ExaGlyphBuffer buffer;
- 
-     if (maskFormat) {
--        ExaScreenPriv(pScreen);
-         GCPtr pGC;
-         xRectangle rect;
- 
-@@ -719,22 +719,20 @@
-                                                 maskFormat->depth,
-                                                 CREATE_PIXMAP_USAGE_SCRATCH);
-         if (!pMaskPixmap)
--            return;
-+	    goto fallback;
-         component_alpha = NeedsComponent(maskFormat->format);
-         pMask = CreatePicture(0, &pMaskPixmap->drawable,
-                               maskFormat, CPComponentAlpha, &component_alpha,
-                               serverClient, &error);
--        if (!pMask ||
--            (!component_alpha && pExaScr->info->CheckComposite &&
--             !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask)))
-+        (*pScreen->DestroyPixmap) (pMaskPixmap);
-+	if (!pMask)
-+	    goto fallback;
-+
-+	if (!component_alpha && pExaScr->info->CheckComposite &&
-+	    !(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask))
-         {
-             PictFormatPtr argbFormat;
- 
--            (*pScreen->DestroyPixmap) (pMaskPixmap);
--
--            if (!pMask)
--                return;
--
-             /* The driver can't seem to composite to a8, let's try argb (but
-              * without component-alpha) */
-             FreePicture((pointer) pMask, (XID) 0);
-@@ -748,15 +746,25 @@
-                                                     maskFormat->depth,
-                                                     CREATE_PIXMAP_USAGE_SCRATCH);
-             if (!pMaskPixmap)
--                return;
-+	    goto fallback;
- 
-             pMask = CreatePicture(0, &pMaskPixmap->drawable, maskFormat, 0, 0,
-                                   serverClient, &error);
--            if (!pMask) {
--                (*pScreen->DestroyPixmap) (pMaskPixmap);
--                return;
--            }
-+            (*pScreen->DestroyPixmap) (pMaskPixmap);
-+	    if (!pMask)
-+	    goto fallback;
-         }
-+	  
-+	if (pExaScr->info->CheckComposite &&
-+	    (!(*pExaScr->info->CheckComposite) (PictOpAdd, pSrc, NULL, pMask) ||
-+	     (!(*pExaScr->info->CheckComposite) (op, pSrc, pMask, pDst) &&
-+	      (op != PictOpOver ||
-+	       !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, pMask, pDst) ||
-+	       !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, pMask, pDst))))) {
-+	    FreePicture ((pointer) pMask, (XID) 0);
-+	    goto fallback;
-+	}
-+
-         pGC = GetScratchGC(pMaskPixmap->drawable.depth, pScreen);
-         ValidateGC(&pMaskPixmap->drawable, pGC);
-         rect.x = 0;
-@@ -769,6 +777,13 @@
-         y = -extents.y1;
-     }
-     else {
-+    	if (pExaScr->info->CheckComposite &&
-+	    !(*pExaScr->info->CheckComposite) (op, pSrc, NULL, pDst) &&
-+	    (op != PictOpOver ||
-+	     !(*pExaScr->info->CheckComposite) (PictOpOutReverse, pSrc, NULL, pDst) ||
-+	     !(*pExaScr->info->CheckComposite) (PictOpOver, pSrc, NULL, pDst)))
-+	    goto fallback;
-+
-         x = 0;
-         y = 0;
-     }
-@@ -834,6 +849,10 @@
-                          xSrc + x - first_xOff,
-                          ySrc + y - first_yOff, 0, 0, x, y, width, height);
-         FreePicture((pointer) pMask, (XID) 0);
--        (*pScreen->DestroyPixmap) (pMaskPixmap);
-     }
-+    
-+    return;
-+
-+fallback:
-+    ExaCheckGlyphs(op, pSrc, pDst, maskFormat, xSrc, ySrc, nlist, list, glyphs);
- }
---- xorg-server-1.12.1/exa/exa_render.c	2012-03-30 04:57:25.000000000 +0200
-+++ xorg-server-1.12.1/exa_render.c.new	2012-04-15 11:50:35.272482047 +0200
-@@ -878,7 +878,7 @@
-     Bool saveMaskRepeat = pMask ? pMask->repeat : 0;
-     RegionRec region;
- 
--    if (pExaScr->swappedOut)
-+    if (pExaScr->fallback_counter || pExaScr->swappedOut)
-         goto fallback;
- 
-     /* Remove repeat in source if useless */