Attachment 3429 Details for Bug 4635 – Fixes the failure handling

[patch] Fixes the failure handling

randr_patch (text/plain), 2.08 KB, created by Thomas Winischhofer on 2005-09-29 03:33:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Winischhofer

Created: 2005-09-29 03:33:53 UTC

Size: 2.08 KB

patch

obsolete

>--- xf86RandR.c	2005-09-29 12:29:06.726286840 +0200
>+++ xf86Randr_new.c	2005-09-29 12:27:59.587573063 +0200
>@@ -134,6 +134,7 @@
>     int			oldmmWidth = pScreen->mmWidth;
>     int			oldmmHeight = pScreen->mmHeight;
>     WindowPtr		pRoot = WindowTable[pScreen->myNum];
>+    Bool		ret = TRUE;
> 
>     if (pRoot)
> 	(*scrp->EnableDisableFBAccess) (pScreen->myNum, FALSE);
>@@ -168,7 +169,7 @@
> 	scrp->virtualY = pScreen->height = oldHeight;
> 	pScreen->mmWidth = oldmmWidth;
> 	pScreen->mmHeight = oldmmHeight;
>-	return FALSE;
>+	ret = FALSE;
>     }
>     /*
>      * Make sure the layout is correct
>@@ -182,7 +183,7 @@
>     xf86SetViewport (pScreen, 0, 0);
>     if (pRoot)
> 	(*scrp->EnableDisableFBAccess) (pScreen->myNum, TRUE);
>-    return TRUE;
>+    return ret;
> }
> 
> static Bool
>@@ -196,6 +197,7 @@
>     DisplayModePtr	    mode;
>     int			    px, py;
>     Bool		    useVirtual = FALSE;
>+    Rotation		    oldRotation = randrp->rotation;
> 
>     miPointerPosition (&px, &py);
>     for (mode = scrp->modes; ; mode = mode->next)
>@@ -219,7 +221,7 @@
> 
>     if (randrp->rotation != rotation) {
> 
>-    /* Have the driver do its thing. */
>+        /* Have the driver do its thing. */
> 	if (scrp->DriverFunc) {
> 	    xorgRRRotation RRRotation;
> 	    RRRotation.RRConfig.rotation = rotation;
>@@ -238,8 +240,22 @@
> 	randrp->rotation = rotation;
>     }
> 
>-    if (!xf86RandRSetMode (pScreen, mode, useVirtual, pSize->mmWidth, pSize->mmHeight))
>+    if (!xf86RandRSetMode (pScreen, mode, useVirtual, pSize->mmWidth, pSize->mmHeight)) {
>+	if(randrp->rotation != oldRotation) {
>+	   /* Have the driver do its thing. */
>+	   if (scrp->DriverFunc) {
>+	       xorgRRRotation RRRotation;
>+	       RRRotation.RRConfig.rotation = oldRotation;
>+	       RRRotation.RRConfig.rate = xf86RandRModeRefresh (scrp->currentMode);
>+	       RRRotation.RRConfig.width = pScreen->width;
>+	       RRRotation.RRConfig.height = pScreen->height;
>+	       (*scrp->DriverFunc)(scrp, RR_SET_CONFIG, &RRRotation);
>+	   }
>+
>+	   randrp->rotation = oldRotation;
>+	}
> 	return FALSE;
>+    }
>     /*
>      * Move the cursor back where it belongs; SwitchMode repositions it
>      */

Actions: View | Splinter Review

Attachments on bug 4635: 3429

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.