svn merge ^/branches/released .

4 files changed, 32 insertions, 36 deletions

diff --git a/xorg-server/hw/xfree86/modes/xf86Crtc.c b/xorg-server/hw/xfree86/modes/xf86Crtc.c
index 5705d7da3..9c5b3c1ad 100644
--- a/xorg-server/hw/xfree86/modes/xf86Crtc.c
+++ b/xorg-server/hw/xfree86/modes/xf86Crtc.c
@@ -157,8 +157,7 @@ xf86CrtcDestroy (xf86CrtcPtr crtc)
 	    xf86_config->num_crtc--;

 	    break;

 	}

-    if (crtc->params)

-	free(crtc->params);

+    free(crtc->params);

     free(crtc->gamma_red);

     free(crtc);

 }

@@ -382,8 +381,7 @@ done:
 	crtc->transformPresent = saved_transform_present;

     }

 

-    if (adjusted_mode->name)

-	    free(adjusted_mode->name);

+    free(adjusted_mode->name);

     free(adjusted_mode);

 

     if (didLock)

@@ -482,8 +480,7 @@ xf86OutputSetMonitor (xf86OutputPtr output)
     if (!output->name)

 	return;

 

-    if (output->options)

-	free(output->options);

+    free(output->options);

 

     output->options = xnfalloc (sizeof (xf86OutputOptions));

     memcpy (output->options, xf86OutputOptions, sizeof (xf86OutputOptions));

@@ -580,7 +577,7 @@ xf86OutputInitialRotation (xf86OutputPtr output)
     

     for (i = 0; i < 4; i++)

 	if (xf86nameCompare (direction[i], rotate_name) == 0)

-	    return (1 << i);

+	    return 1 << i;

     return RR_Rotate_0;

 }

 

@@ -1041,8 +1038,8 @@ xf86DefaultScreenLimits (ScrnInfoPtr scrn, int *widthp, int *heightp,
 

 	if (crtc->enabled)

 	{

-	    crtc_width = crtc->x + xf86ModeWidth (&crtc->desiredMode, crtc->desiredRotation);

-	    crtc_height = crtc->y + xf86ModeHeight (&crtc->desiredMode, crtc->desiredRotation);

+	    crtc_width = crtc->desiredX + xf86ModeWidth (&crtc->desiredMode, crtc->desiredRotation);

+	    crtc_height = crtc->desiredY + xf86ModeHeight (&crtc->desiredMode, crtc->desiredRotation);

 	}

 	if (!canGrow) {

 	    for (o = 0; o < config->num_output; o++)

@@ -2204,7 +2201,7 @@ xf86TargetFallback(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
 				       target_rotation, width, height);

     }

 

-    return (target_mode != NULL);

+    return target_mode != NULL;

 }

 

 static Bool

@@ -3155,9 +3152,9 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
 						  &crtc_box);

 

 	if (crtc) {

-	    REGION_INIT (pScreen, &crtc_region_local, &crtc_box, 1);

+	    RegionInit(&crtc_region_local, &crtc_box, 1);

 	    crtc_region = &crtc_region_local;

-	    REGION_INTERSECT (pScreen, crtc_region, crtc_region, reg);

+	    RegionIntersect(crtc_region, crtc_region, reg);

 	}

 	*crtc_ret = crtc;

     }

@@ -3166,7 +3163,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
 				crtc_region, width, height);

 

     if (crtc_region != reg)

-	REGION_UNINIT (pScreen, &crtc_region_local);

+	RegionUninit(&crtc_region_local);

 

     return ret;

 }

@@ -3223,7 +3220,7 @@ xf86_crtc_supports_gamma(ScrnInfoPtr pScrn)
 	    return FALSE;

 	crtc = xf86_config->crtc[0];

 

-	return (crtc->funcs->gamma_set != NULL);

+	return crtc->funcs->gamma_set != NULL;

     }

 

     return FALSE;

diff --git a/xorg-server/hw/xfree86/modes/xf86DiDGA.c b/xorg-server/hw/xfree86/modes/xf86DiDGA.c
index 61c779edc..b2bbefa62 100644
--- a/xorg-server/hw/xfree86/modes/xf86DiDGA.c
+++ b/xorg-server/hw/xfree86/modes/xf86DiDGA.c
@@ -103,8 +103,7 @@ xf86_dga_get_modes (ScreenPtr pScreen)
 	if (display_mode == scrn->modes)

 	    break;

     }

-    if (xf86_config->dga_modes)

-	free(xf86_config->dga_modes);

+    free(xf86_config->dga_modes);

     xf86_config->dga_nmode = num;

     xf86_config->dga_modes = modes;

     return TRUE;

diff --git a/xorg-server/hw/xfree86/modes/xf86RandR12.c b/xorg-server/hw/xfree86/modes/xf86RandR12.c
index 8a4d72bd6..e49387317 100644
--- a/xorg-server/hw/xfree86/modes/xf86RandR12.c
+++ b/xorg-server/hw/xfree86/modes/xf86RandR12.c
@@ -71,7 +71,7 @@ static Bool xf86RandR12CreateScreenResources12 (ScreenPtr pScreen);
 static int xf86RandR12Generation;

 #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

 

-static int xf86RandR12KeyIndex;

+static DevPrivateKeyRec xf86RandR12KeyRec;

 static DevPrivateKey xf86RandR12Key;

 #define XF86RANDRINFO(p) ((XF86RandRInfoPtr) \

     dixLookupPrivate(&(p)->devPrivates, xf86RandR12Key))

@@ -517,7 +517,7 @@ xf86RandR12SetMode (ScreenPtr	    pScreen,
     int			oldHeight = pScreen->height;

     int			oldmmWidth = pScreen->mmWidth;

     int			oldmmHeight = pScreen->mmHeight;

-    WindowPtr		pRoot = WindowTable[pScreen->myNum];

+    WindowPtr		pRoot = pScreen->root;

     DisplayModePtr      currentMode = NULL;

     Bool 		ret = TRUE;

     PixmapPtr 		pspix = NULL;

@@ -685,7 +685,7 @@ xf86RandR12ScreenSetSize (ScreenPtr	pScreen,
     XF86RandRInfoPtr	randrp = XF86RANDRINFO(pScreen);

     ScrnInfoPtr		pScrn = XF86SCRNINFO(pScreen);

     xf86CrtcConfigPtr	config = XF86_CRTC_CONFIG_PTR(pScrn);

-    WindowPtr		pRoot = WindowTable[pScreen->myNum];

+    WindowPtr		pRoot = pScreen->root;

     PixmapPtr		pScrnPix = (*pScreen->GetScreenPixmap)(pScreen);

     Bool		ret = FALSE;

     int                 c;

@@ -739,7 +739,7 @@ finish:
     if (pRoot && pScrn->vtSema)

 	(*pScrn->EnableDisableFBAccess) (pScreen->myNum, TRUE);

 #if RANDR_12_INTERFACE

-    if (xf86RandR12Key && WindowTable[pScreen->myNum] && ret)

+    if (xf86RandR12Key && pScreen->root && ret)

 	RRScreenSizeNotify (pScreen);

 #endif

     return ret;

@@ -883,7 +883,9 @@ xf86RandR12Init (ScreenPtr pScreen)
 	xf86RandR12Generation = serverGeneration;

 

 #if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(7,0,0,0,0)

-    xf86RandR12Key = &xf86RandR12KeyIndex;

+    xf86RandR12Key = &xf86RandR12KeyRec;

+    if (!dixRegisterPrivateKey(&xf86RandR12KeyRec, PRIVATE_SCREEN, 0))

+	return FALSE;

 #else

     xf86RandR12Index = AllocateScreenPrivateIndex();

 #endif

diff --git a/xorg-server/hw/xfree86/modes/xf86Rotate.c b/xorg-server/hw/xfree86/modes/xf86Rotate.c
index e15c61476..f846d60ea 100644
--- a/xorg-server/hw/xfree86/modes/xf86Rotate.c
+++ b/xorg-server/hw/xfree86/modes/xf86Rotate.c
@@ -76,13 +76,13 @@ xf86RotateCrtcRedisplay (xf86CrtcPtr crtc, RegionPtr region)
 {

     ScrnInfoPtr		scrn = crtc->scrn;

     ScreenPtr		screen = scrn->pScreen;

-    WindowPtr		root = WindowTable[screen->myNum];

+    WindowPtr		root = screen->root;

     PixmapPtr		dst_pixmap = crtc->rotatedPixmap;

-    PictFormatPtr	format = compWindowFormat (WindowTable[screen->myNum]);

+    PictFormatPtr	format = compWindowFormat (screen->root);

     int			error;

     PicturePtr		src, dst;

-    int			n = REGION_NUM_RECTS(region);

-    BoxPtr		b = REGION_RECTS(region);

+    int			n = RegionNumRects(region);

+    BoxPtr		b = RegionRects(region);

     XID			include_inferiors = IncludeInferiors;

     

     src = CreatePicture (None,

@@ -167,10 +167,10 @@ xf86CrtcDamageShadow (xf86CrtcPtr crtc)
     if (damage_box.y1 < 0) damage_box.y1 = 0;

     if (damage_box.x2 > pScreen->width) damage_box.x2 = pScreen->width;

     if (damage_box.y2 > pScreen->height) damage_box.y2 = pScreen->height;

-    REGION_INIT (pScreen, &damage_region, &damage_box, 1);

+    RegionInit(&damage_region, &damage_box, 1);

     DamageRegionAppend (&(*pScreen->GetScreenPixmap)(pScreen)->drawable,

 			&damage_region);

-    REGION_UNINIT (pScreen, &damage_region);

+    RegionUninit(&damage_region);

     crtc->shadowClear = TRUE;

 }

 

@@ -217,7 +217,7 @@ xf86RotateRedisplay(ScreenPtr pScreen)
 	return FALSE;

     xf86RotatePrepare (pScreen);

     region = DamageRegion(damage);

-    if (REGION_NOTEMPTY(pScreen, region)) 

+    if (RegionNotEmpty(region))

     {

 	int			c;

 	SourceValidateProcPtr	SourceValidate;

@@ -240,14 +240,14 @@ xf86RotateRedisplay(ScreenPtr pScreen)
 		RegionRec   crtc_damage;

 

 		/* compute portion of damage that overlaps crtc */

-		REGION_INIT(pScreen, &crtc_damage, &crtc->bounds, 1);

-		REGION_INTERSECT (pScreen, &crtc_damage, &crtc_damage, region);

+		RegionInit(&crtc_damage, &crtc->bounds, 1);

+		RegionIntersect(&crtc_damage, &crtc_damage, region);

 		

 		/* update damaged region */

-		if (REGION_NOTEMPTY(pScreen, &crtc_damage))

+		if (RegionNotEmpty(&crtc_damage))

     		    xf86RotateCrtcRedisplay (crtc, &crtc_damage);

 		

-		REGION_UNINIT (pScreen, &crtc_damage);

+		RegionUninit(&crtc_damage);

 	    }

 	}

 	pScreen->SourceValidate = SourceValidate;

@@ -405,8 +405,7 @@ xf86CrtcRotate (xf86CrtcPtr crtc)
 	 */

 	xf86RotateDestroy (crtc);

 	crtc->transform_in_use = FALSE;

-	if (new_params)

-	    free(new_params);

+	free(new_params);

 	new_params = NULL;

 	new_nparams = 0;

 	new_filter = NULL;

@@ -506,8 +505,7 @@ xf86CrtcRotate (xf86CrtcPtr crtc)
     crtc->crtc_to_framebuffer = crtc_to_fb;

     crtc->f_crtc_to_framebuffer = f_crtc_to_fb;

     crtc->f_framebuffer_to_crtc = f_fb_to_crtc;

-    if (crtc->params)

-	free(crtc->params);

+    free(crtc->params);

     crtc->params = new_params;

     crtc->nparams = new_nparams;

     crtc->filter = new_filter;