xserver/composite compalloc.c,1.8,1.9

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/xserver/composite
In directory pdx:/tmp/cvs-serv19516

Modified Files:
	compalloc.c 
Log Message:
Revert changes that accidentally crept in from Debrix.


Index: compalloc.c
===================================================================
RCS file: /cvs/xserver/xserver/composite/compalloc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- compalloc.c	10 Jun 2004 19:39:49 -0000	1.8
+++ compalloc.c	11 Jun 2004 00:00:53 -0000	1.9
@@ -57,7 +57,6 @@
     CompWindowPtr	cw = GetCompWindow (pWin);
     CompClientWindowPtr	ccw;
     Bool		wasMapped = pWin->mapped;
-    ScreenPtr		pScreen = pWin->drawable.pScreen;
 
     /*
      * Only one Manual update is allowed
@@ -88,13 +87,10 @@
 	    xfree (ccw);
 	    return BadAlloc;
 	}
-	/* XXX DS */
-	ErrorF("compRedirectWindow: pScreen = %d\n", pScreen);
 	cw->damage = DamageCreate (compReportDamage,
 				   compDestroyDamage,
 				   DamageReportNonEmpty,
 				   FALSE,
-				   pScreen,
 				   pWin);
 	if (!cw->damage)
 	{
@@ -437,8 +433,8 @@
     pPixmap = (*pScreen->CreatePixmap) (pScreen, w, h, pWin->drawable.depth);
     if (!pPixmap)
 	return FALSE;
-    pPixmap->drawable.x = x;
-    pPixmap->drawable.y = y;
+    pPixmap->screen_x = x;
+    pPixmap->screen_y = y;
     pWin->redirectDraw = TRUE;
     compSetPixmap (pWin, pPixmap);
     cw->oldx = COMP_ORIGIN_INVALID;