Rename pScreen to screen.renames

4 files changed, 109 insertions, 109 deletions

diff --git a/src/i830_dri.c b/src/i830_dri.c
index 1e9c22ab..60693822 100644
--- a/src/i830_dri.c
+++ b/src/i830_dri.c
@@ -83,8 +83,8 @@ static DRI2BufferPtr
 I830DRI2CreateBuffers(DrawablePtr drawable, unsigned int *attachments,
 		      int count)
 {
-	ScreenPtr pScreen = drawable->pScreen;
-	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	ScreenPtr screen = drawable->screen;
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	DRI2BufferPtr buffers;
 	dri_bo *bo;
@@ -130,11 +130,11 @@ I830DRI2CreateBuffers(DrawablePtr drawable, unsigned int *attachments,
 			if (!intel->tiling)
 				hint = 0;
 
-			pixmap = (*pScreen->CreatePixmap) (pScreen,
-							    drawable->width,
-							    drawable->height,
-							    drawable->depth,
-							   hint);
+			pixmap = screen->CreatePixmap(screen,
+						      drawable->width,
+						      drawable->height,
+						      drawable->depth,
+						      hint);
 
 		}
 
@@ -165,8 +165,8 @@ static DRI2Buffer2Ptr
 I830DRI2CreateBuffer(DrawablePtr drawable, unsigned int attachment,
 		     unsigned int format)
 {
-	ScreenPtr pScreen = drawable->pScreen;
-	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	ScreenPtr screen = drawable->pScreen;
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	DRI2Buffer2Ptr buffer;
 	dri_bo *bo;
@@ -207,12 +207,12 @@ I830DRI2CreateBuffer(DrawablePtr drawable, unsigned int attachment,
 		if (!intel->tiling)
 			hint = 0;
 
-		pixmap = (*pScreen->CreatePixmap) (pScreen,
-						    drawable->width,
-						    drawable->height,
-						    (format !=
-						     0) ? format : drawable->depth,
-						    hint);
+		pixmap = screen->CreatePixmap(screen,
+					      drawable->width,
+					      drawable->height,
+					      (format != 0) ? format :
+							      drawable->depth,
+					      hint);
 
 	}
 
@@ -240,13 +240,13 @@ I830DRI2CreateBuffer(DrawablePtr drawable, unsigned int attachment,
 static void
 I830DRI2DestroyBuffers(DrawablePtr drawable, DRI2BufferPtr buffers, int count)
 {
-	ScreenPtr pScreen = drawable->pScreen;
+	ScreenPtr screen = drawable->pScreen;
 	I830DRI2BufferPrivatePtr private;
 	int i;
 
 	for (i = 0; i < count; i++) {
 		private = buffers[i].driverPrivate;
-		(*pScreen->DestroyPixmap) (private->pixmap);
+		screen->DestroyPixmap(private->pixmap);
 	}
 
 	if (buffers) {
@@ -261,9 +261,9 @@ static void I830DRI2DestroyBuffer(DrawablePtr drawable, DRI2Buffer2Ptr buffer)
 {
 	if (buffer) {
 		I830DRI2BufferPrivatePtr private = buffer->driverPrivate;
-		ScreenPtr pScreen = drawable->pScreen;
+		ScreenPtr screen = drawable->pScreen;
 
-		(*pScreen->DestroyPixmap) (private->pixmap);
+		screen->DestroyPixmap(private->pixmap);
 
 		xfree(private);
 		xfree(buffer);
@@ -278,8 +278,8 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
 {
 	I830DRI2BufferPrivatePtr srcPrivate = sourceBuffer->driverPrivate;
 	I830DRI2BufferPrivatePtr dstPrivate = destBuffer->driverPrivate;
-	ScreenPtr pScreen = drawable->pScreen;
-	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	ScreenPtr screen = drawable->pScreen;
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	DrawablePtr src = (srcPrivate->attachment == DRI2BufferFrontLeft)
 	    ? drawable : &srcPrivate->pixmap->drawable;
@@ -288,9 +288,9 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
 	RegionPtr pCopyClip;
 	GCPtr gc;
 
-	gc = GetScratchGC(drawable->depth, pScreen);
-	pCopyClip = REGION_CREATE(pScreen, NULL, 0);
-	REGION_COPY(pScreen, pCopyClip, pRegion);
+	gc = GetScratchGC(drawable->depth, screen);
+	pCopyClip = REGION_CREATE(screen, NULL, 0);
+	REGION_COPY(screen, pCopyClip, pRegion);
 	(*gc->funcs->ChangeClip) (gc, CT_REGION, pCopyClip, 0);
 	ValidateGC(dst, gc);
 
@@ -363,9 +363,9 @@ I830DRI2CopyRegion(DrawablePtr drawable, RegionPtr pRegion,
 
 }
 
-Bool I830DRI2ScreenInit(ScreenPtr pScreen)
+Bool I830DRI2ScreenInit(ScreenPtr screen)
 {
-	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	DRI2InfoRec info;
 	char *p;
@@ -434,14 +434,14 @@ Bool I830DRI2ScreenInit(ScreenPtr pScreen)
 
 	info.CopyRegion = I830DRI2CopyRegion;
 
-	return DRI2ScreenInit(pScreen, &info);
+	return DRI2ScreenInit(screen, &info);
 }
 
-void I830DRI2CloseScreen(ScreenPtr pScreen)
+void I830DRI2CloseScreen(ScreenPtr screen)
 {
-	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-	DRI2CloseScreen(pScreen);
+	DRI2CloseScreen(screen);
 	intel->directRenderingType = DRI_NONE;
 }
diff --git a/src/i830_driver.c b/src/i830_driver.c
index 898a0f05..47bc4dff 100644
--- a/src/i830_driver.c
+++ b/src/i830_driver.c
@@ -189,11 +189,11 @@ static OptionInfoRec I830Options[] = {
 /* *INDENT-ON* */
 
 static void i830AdjustFrame(int scrnIndex, int x, int y, int flags);
-static Bool I830CloseScreen(int scrnIndex, ScreenPtr pScreen);
+static Bool I830CloseScreen(int scrnIndex, ScreenPtr screen);
 static Bool I830EnterVT(int scrnIndex, int flags);
 
 /* temporary */
-extern void xf86SetCursor(ScreenPtr pScreen, CursorPtr pCurs, int x, int y);
+extern void xf86SetCursor(ScreenPtr screen, CursorPtr pCurs, int x, int y);
 
 #ifdef I830DEBUG
 void
@@ -329,16 +329,16 @@ I830LoadPalette(ScrnInfoPtr scrn, int numColors, int *indices,
  * have already been created, but the first EnterVT happens before
  * CreateScreenResources.
  */
-static Bool i830CreateScreenResources(ScreenPtr pScreen)
+static Bool i830CreateScreenResources(ScreenPtr screen)
 {
-	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-	pScreen->CreateScreenResources = intel->CreateScreenResources;
-	if (!(*pScreen->CreateScreenResources) (pScreen))
+	screen->CreateScreenResources = intel->CreateScreenResources;
+	if (!(*screen->CreateScreenResources) (screen))
 		return FALSE;
 
-	i830_uxa_create_screen_resources(pScreen);
+	i830_uxa_create_screen_resources(screen);
 
 	return TRUE;
 }
@@ -950,16 +950,16 @@ void IntelEmitInvarientState(ScrnInfoPtr scrn)
 static void
 I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
 {
-	ScreenPtr pScreen = screenInfo.screens[i];
+	ScreenPtr screen = screenInfo.screens[i];
 	ScrnInfoPtr scrn = xf86Screens[i];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 
-	pScreen->BlockHandler = intel->BlockHandler;
+	screen->BlockHandler = intel->BlockHandler;
 
-	(*pScreen->BlockHandler) (i, blockData, pTimeout, pReadmask);
+	(*screen->BlockHandler) (i, blockData, pTimeout, pReadmask);
 
-	intel->BlockHandler = pScreen->BlockHandler;
-	pScreen->BlockHandler = I830BlockHandler;
+	intel->BlockHandler = screen->BlockHandler;
+	screen->BlockHandler = I830BlockHandler;
 
 	if (scrn->vtSema) {
 		Bool flushed = FALSE;
@@ -981,7 +981,7 @@ I830BlockHandler(int i, pointer blockData, pointer pTimeout, pointer pReadmask)
 		intel->need_mi_flush = FALSE;
 	}
 
-	i830_uxa_block_handler(pScreen);
+	i830_uxa_block_handler(screen);
 
 	I830VideoBlockHandler(i, blockData, pTimeout, pReadmask);
 }
@@ -1145,9 +1145,9 @@ int i830_crtc_to_pipe(xf86CrtcPtr crtc)
 }
 
 static Bool
-I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
+I830ScreenInit(int scrnIndex, ScreenPtr screen, int argc, char **argv)
 {
-	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];;
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];;
 	intel_screen_private *intel = intel_get_screen_private(scrn);;
 	VisualPtr visual;
 	MessageType from;
@@ -1204,7 +1204,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 
 #ifdef DRI2
 	if (intel->directRenderingType == DRI_NONE
-	    && I830DRI2ScreenInit(pScreen))
+	    && I830DRI2ScreenInit(screen))
 		intel->directRenderingType = DRI_DRI2;
 #endif
 
@@ -1272,8 +1272,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	 */
 	scrn->fbOffset = intel->front_buffer->offset;
 
-	DPRINTF(PFX, "assert( if(!fbScreenInit(pScreen, ...) )\n");
-	if (!fbScreenInit(pScreen, NULL,
+	DPRINTF(PFX, "assert( if(!fbScreenInit(screen, ...) )\n");
+	if (!fbScreenInit(screen, NULL,
 			  scrn->virtualX, scrn->virtualY,
 			  scrn->xDpi, scrn->yDpi,
 			  scrn->displayWidth, scrn->bitsPerPixel))
@@ -1281,8 +1281,8 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 
 	if (scrn->bitsPerPixel > 8) {
 		/* Fixup RGB ordering */
-		visual = pScreen->visuals + pScreen->numVisuals;
-		while (--visual >= pScreen->visuals) {
+		visual = screen->visuals + screen->numVisuals;
+		while (--visual >= screen->visuals) {
 			if ((visual->class | DynamicClass) == DirectColor) {
 				visual->offsetRed = scrn->offset.red;
 				visual->offsetGreen = scrn->offset.green;
@@ -1294,11 +1294,11 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 		}
 	}
 
-	fbPictureInit(pScreen, NULL, 0);
+	fbPictureInit(screen, NULL, 0);
 
-	xf86SetBlackWhitePixels(pScreen);
+	xf86SetBlackWhitePixels(screen);
 
-	if (!I830AccelInit(pScreen)) {
+	if (!I830AccelInit(screen)) {
 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 			   "Hardware acceleration initialization failed\n");
 		return FALSE;
@@ -1311,14 +1311,14 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	else
 		intel->batch_flush_notify = i830_batch_flush_notify;
 
-	miInitializeBackingStore(pScreen);
-	xf86SetBackingStore(pScreen);
-	xf86SetSilkenMouse(pScreen);
-	miDCInitialize(pScreen, xf86GetPointerScreenFuncs());
+	miInitializeBackingStore(screen);
+	xf86SetBackingStore(screen);
+	xf86SetSilkenMouse(screen);
+	miDCInitialize(screen, xf86GetPointerScreenFuncs());
 
 	xf86DrvMsg(scrn->scrnIndex, X_INFO, "Initializing HW Cursor\n");
 
-	if (!xf86_cursors_init(pScreen, I810_CURSOR_X, I810_CURSOR_Y,
+	if (!xf86_cursors_init(screen, I810_CURSOR_X, I810_CURSOR_Y,
 			       (HARDWARE_CURSOR_TRUECOLOR_AT_8BPP |
 				HARDWARE_CURSOR_BIT_ORDER_MSBFIRST |
 				HARDWARE_CURSOR_INVERT_MASK |
@@ -1338,30 +1338,30 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 	if (!I830EnterVT(scrnIndex, 0))
 		return FALSE;
 
-	intel->BlockHandler = pScreen->BlockHandler;
-	pScreen->BlockHandler = I830BlockHandler;
+	intel->BlockHandler = screen->BlockHandler;
+	screen->BlockHandler = I830BlockHandler;
 
-	pScreen->SaveScreen = xf86SaveScreen;
-	intel->CloseScreen = pScreen->CloseScreen;
-	pScreen->CloseScreen = I830CloseScreen;
-	intel->CreateScreenResources = pScreen->CreateScreenResources;
-	pScreen->CreateScreenResources = i830CreateScreenResources;
+	screen->SaveScreen = xf86SaveScreen;
+	intel->CloseScreen = screen->CloseScreen;
+	screen->CloseScreen = I830CloseScreen;
+	intel->CreateScreenResources = screen->CreateScreenResources;
+	screen->CreateScreenResources = i830CreateScreenResources;
 
-	if (!xf86CrtcScreenInit(pScreen))
+	if (!xf86CrtcScreenInit(screen))
 		return FALSE;
 
-	DPRINTF(PFX, "assert( if(!miCreateDefColormap(pScreen)) )\n");
-	if (!miCreateDefColormap(pScreen))
+	DPRINTF(PFX, "assert( if(!miCreateDefColormap(screen)) )\n");
+	if (!miCreateDefColormap(screen))
 		return FALSE;
 
-	DPRINTF(PFX, "assert( if(!xf86HandleColormaps(pScreen, ...)) )\n");
-	if (!xf86HandleColormaps(pScreen, 256, 8, I830LoadPalette, NULL,
+	DPRINTF(PFX, "assert( if(!xf86HandleColormaps(screen, ...)) )\n");
+	if (!xf86HandleColormaps(screen, 256, 8, I830LoadPalette, NULL,
 				 CMAP_RELOAD_ON_MODE_SWITCH |
 				 CMAP_PALETTED_TRUECOLOR)) {
 		return FALSE;
 	}
 
-	xf86DPMSInit(pScreen, xf86DPMSSet, 0);
+	xf86DPMSInit(screen, xf86DPMSSet, 0);
 
 #ifdef INTEL_XVMC
 	intel->XvMCEnabled = FALSE;
@@ -1373,7 +1373,7 @@ I830ScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
 #endif
 	/* Init video */
 	if (intel->XvEnabled)
-		I830InitVideo(pScreen);
+		I830InitVideo(screen);
 
 	/* Setup 3D engine, needed for rotation too */
 	IntelEmitInvarientState(scrn);
@@ -1503,7 +1503,7 @@ static Bool I830SwitchMode(int scrnIndex, DisplayModePtr mode, int flags)
 	return xf86SetSingleMode(scrn, mode, RR_Rotate_0);
 }
 
-static Bool I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
+static Bool I830CloseScreen(int scrnIndex, ScreenPtr screen)
 {
 	ScrnInfoPtr scrn = xf86Screens[scrnIndex];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
@@ -1513,29 +1513,29 @@ static Bool I830CloseScreen(int scrnIndex, ScreenPtr pScreen)
 	}
 
 	if (intel->uxa_driver) {
-		uxa_driver_fini(pScreen);
+		uxa_driver_fini(screen);
 		xfree(intel->uxa_driver);
 		intel->uxa_driver = NULL;
 	}
 	if (intel->front_buffer) {
-		i830_set_pixmap_bo(pScreen->GetScreenPixmap(pScreen), NULL);
+		i830_set_pixmap_bo(screen->GetScreenPixmap(screen), NULL);
 		i830_free_memory(scrn, intel->front_buffer);
 		intel->front_buffer = NULL;
 	}
 
-	xf86_cursors_fini(pScreen);
+	xf86_cursors_fini(screen);
 
 	i830_allocator_fini(scrn);
 
 	i965_free_video(scrn);
 
-	pScreen->CloseScreen = intel->CloseScreen;
-	(*pScreen->CloseScreen) (scrnIndex, pScreen);
+	screen->CloseScreen = intel->CloseScreen;
+	(*screen->CloseScreen) (scrnIndex, screen);
 
 	if (intel->directRenderingOpen
 	    && intel->directRenderingType == DRI_DRI2) {
 		intel->directRenderingOpen = FALSE;
-		I830DRI2CloseScreen(pScreen);
+		I830DRI2CloseScreen(screen);
 	}
 
 	xf86GARTCloseScreen(scrnIndex);
diff --git a/src/i830_uxa.c b/src/i830_uxa.c
index 03d4b17e..f4743d09 100644
--- a/src/i830_uxa.c
+++ b/src/i830_uxa.c
@@ -644,22 +644,22 @@ static Bool i830_uxa_destroy_pixmap(PixmapPtr pixmap)
 	return TRUE;
 }
 
-void i830_uxa_create_screen_resources(ScreenPtr pScreen)
+void i830_uxa_create_screen_resources(ScreenPtr screen)
 {
-	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	dri_bo *bo = intel->front_buffer->bo;
 
 	if (bo != NULL) {
-		PixmapPtr pixmap = pScreen->GetScreenPixmap(pScreen);
+		PixmapPtr pixmap = screen->GetScreenPixmap(screen);
 		i830_uxa_set_pixmap_bo(pixmap, bo);
 		dri_bo_reference(bo);
 	}
 }
 
-Bool i830_uxa_init(ScreenPtr pScreen)
+Bool i830_uxa_init(ScreenPtr screen)
 {
-	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 
 	if (!dixRequestPrivate(&uxa_pixmap_index, 0))
@@ -708,17 +708,17 @@ Bool i830_uxa_init(ScreenPtr pScreen)
 	intel->uxa_driver->finish_access = i830_uxa_finish_access;
 	intel->uxa_driver->pixmap_is_offscreen = i830_uxa_pixmap_is_offscreen;
 
-	if (!uxa_driver_init(pScreen, intel->uxa_driver)) {
+	if (!uxa_driver_init(screen, intel->uxa_driver)) {
 		xf86DrvMsg(scrn->scrnIndex, X_ERROR,
 			   "UXA initialization failed\n");
 		xfree(intel->uxa_driver);
 		return FALSE;
 	}
 
-	pScreen->CreatePixmap = i830_uxa_create_pixmap;
-	pScreen->DestroyPixmap = i830_uxa_destroy_pixmap;
+	screen->CreatePixmap = i830_uxa_create_pixmap;
+	screen->DestroyPixmap = i830_uxa_destroy_pixmap;
 
-	uxa_set_fallback_debug(pScreen, intel->fallback_debug);
+	uxa_set_fallback_debug(screen, intel->fallback_debug);
 
 	return TRUE;
 }
diff --git a/src/i830_video.c b/src/i830_video.c
index 7c1890d3..76055cf1 100644
--- a/src/i830_video.c
+++ b/src/i830_video.c
@@ -366,9 +366,9 @@ drmmode_overlay_put_image(ScrnInfoPtr scrn, xf86CrtcPtr crtc,
 #endif
 }
 
-void I830InitVideo(ScreenPtr pScreen)
+void I830InitVideo(ScreenPtr screen)
 {
-	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	XF86VideoAdaptorPtr *adaptors, *newAdaptors = NULL;
 	XF86VideoAdaptorPtr overlayAdaptor = NULL, texturedAdaptor = NULL;
@@ -401,7 +401,7 @@ void I830InitVideo(ScreenPtr pScreen)
 	 */
 	if (scrn->bitsPerPixel >= 16 && (IS_I9XX(intel) || IS_I965G(intel)) &&
 	    !(!IS_I965G(intel) && scrn->displayWidth > 2048)) {
-		texturedAdaptor = I830SetupImageVideoTextured(pScreen);
+		texturedAdaptor = I830SetupImageVideoTextured(screen);
 		if (texturedAdaptor != NULL) {
 			xf86DrvMsg(scrn->scrnIndex, X_INFO,
 				   "Set up textured video\n");
@@ -415,7 +415,7 @@ void I830InitVideo(ScreenPtr pScreen)
 	if (!OVERLAY_NOEXIST(intel) && scrn->bitsPerPixel != 8) {
 		intel->use_drmmode_overlay = drmmode_has_overlay(scrn);
 		if (intel->use_drmmode_overlay) {
-			overlayAdaptor = I830SetupImageVideoOverlay(pScreen);
+			overlayAdaptor = I830SetupImageVideoOverlay(screen);
 			if (overlayAdaptor != NULL) {
 				xf86DrvMsg(scrn->scrnIndex, X_INFO,
 					   "Set up overlay video\n");
@@ -439,12 +439,12 @@ void I830InitVideo(ScreenPtr pScreen)
 	if (intel_xvmc_probe(scrn)) {
 		if (texturedAdaptor)
 			xvmc_status =
-			    intel_xvmc_driver_init(pScreen, texturedAdaptor);
+			    intel_xvmc_driver_init(screen, texturedAdaptor);
 	}
 #endif
 
 	if (num_adaptors) {
-		xf86XVScreenInit(pScreen, adaptors, num_adaptors);
+		xf86XVScreenInit(screen, adaptors, num_adaptors);
 	} else {
 		xf86DrvMsg(scrn->scrnIndex, X_WARNING,
 			   "Disabling Xv because no adaptors could be initialized.\n");
@@ -453,7 +453,7 @@ void I830InitVideo(ScreenPtr pScreen)
 
 #ifdef INTEL_XVMC
 	if (xvmc_status)
-		intel_xvmc_screen_init(pScreen);
+		intel_xvmc_screen_init(screen);
 #endif
 	xfree(adaptors);
 }
@@ -464,9 +464,9 @@ void I830InitVideo(ScreenPtr pScreen)
 #define PFIT_AUTOSCALE_RATIO 0x61238
 #define PFIT_PROGRAMMED_SCALE_RATIO 0x61234
 
-static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
+static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr screen)
 {
-	ScrnInfoPtr scrn = xf86Screens[pScreen->myNum];
+	ScrnInfoPtr scrn = xf86Screens[screen->myNum];
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	XF86VideoAdaptorPtr adapt;
 	intel_adaptor_private *adaptor_priv;
@@ -549,7 +549,7 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
 	adaptor_priv->rotation = RR_Rotate_0;
 
 	/* gotta uninit this someplace */
-	REGION_NULL(pScreen, &adaptor_priv->clip);
+	REGION_NULL(screen, &adaptor_priv->clip);
 
 	intel->adaptor = adapt;
 
@@ -588,7 +588,7 @@ static XF86VideoAdaptorPtr I830SetupImageVideoOverlay(ScreenPtr pScreen)
 	return adapt;
 }
 
-static XF86VideoAdaptorPtr I830SetupImageVideoTextured(ScreenPtr pScreen)
+static XF86VideoAdaptorPtr I830SetupImageVideoTextured(ScreenPtr screen)
 {
 	XF86VideoAdaptorPtr adapt;
 	XF86AttributePtr attrs;
@@ -653,7 +653,7 @@ static XF86VideoAdaptorPtr I830SetupImageVideoTextured(ScreenPtr pScreen)
 		adaptor_priv->SyncToVblank = 1;
 
 		/* gotta uninit this someplace, XXX: shouldn't be necessary for textured */
-		REGION_NULL(pScreen, &adaptor_priv->clip);
+		REGION_NULL(screen, &adaptor_priv->clip);
 
 		adapt->pPortPrivates[i].ptr = (pointer) (adaptor_priv);
 	}
@@ -1320,9 +1320,9 @@ i830_clip_video_helper(ScrnInfoPtr scrn,
 
 		/* For textured video, we don't actually want to clip at all. */
 		if (crtc && !adaptor_priv->textured) {
-			REGION_INIT(pScreen, &crtc_region_local, &crtc_box, 1);
+			REGION_INIT(screen, &crtc_region_local, &crtc_box, 1);
 			crtc_region = &crtc_region_local;
-			REGION_INTERSECT(pScreen, crtc_region, crtc_region,
+			REGION_INTERSECT(screen, crtc_region, crtc_region,
 					 reg);
 		}
 		*crtc_ret = crtc;
@@ -1330,24 +1330,24 @@ i830_clip_video_helper(ScrnInfoPtr scrn,
 	ret = xf86XVClipVideoHelper(dst, xa, xb, ya, yb,
 				    crtc_region, width, height);
 	if (crtc_region != reg)
-		REGION_UNINIT(pScreen, &crtc_region_local);
+		REGION_UNINIT(screen, &crtc_region_local);
 	return ret;
 }
 
 static void
-i830_fill_colorkey(ScreenPtr pScreen, uint32_t key, RegionPtr clipboxes)
+i830_fill_colorkey(ScreenPtr screen, uint32_t key, RegionPtr clipboxes)
 {
-	DrawablePtr root = &WindowTable[pScreen->myNum]->drawable;
+	DrawablePtr root = &WindowTable[screen->myNum]->drawable;
 	XID pval[2];
 	BoxPtr pbox = REGION_RECTS(clipboxes);
 	int i, nbox = REGION_NUM_RECTS(clipboxes);
 	xRectangle *rects;
 	GCPtr gc;
 
-	if (!xf86Screens[pScreen->myNum]->vtSema)
+	if (!xf86Screens[screen->myNum]->vtSema)
 		return;
 
-	gc = GetScratchGC(root->depth, pScreen);
+	gc = GetScratchGC(root->depth, screen);
 	pval[0] = key;
 	pval[1] = IncludeInferiors;
 	(void)ChangeGC(gc, GCForeground | GCSubwindowMode, pval);
@@ -1604,7 +1604,7 @@ I830PutImage(ScrnInfoPtr scrn,
 {
 	intel_screen_private *intel = intel_get_screen_private(scrn);
 	intel_adaptor_private *adaptor_priv = (intel_adaptor_private *) data;
-	ScreenPtr pScreen = screenInfo.screens[scrn->scrnIndex];
+	ScreenPtr screen = screenInfo.screens[scrn->scrnIndex];
 	PixmapPtr pixmap = get_drawable_pixmap(drawable);
 	INT32 x1, x2, y1, y2;
 	int dstPitch;
@@ -1672,7 +1672,7 @@ I830PutImage(ScrnInfoPtr scrn,
 		/* update cliplist */
 		if (!REGION_EQUAL(scrn->pScreen, &adaptor_priv->clip, clipBoxes)) {
 			REGION_COPY(scrn->pScreen, &adaptor_priv->clip, clipBoxes);
-			i830_fill_colorkey(pScreen, adaptor_priv->colorKey, clipBoxes);
+			i830_fill_colorkey(screen, adaptor_priv->colorKey, clipBoxes);
 		}
 	} else {
 		if (crtc && adaptor_priv->SyncToVblank != 0) {