Attachment 20284 Details for Bug 18512 – randr-target-exact-harder.patch

[patch] randr-target-exact-harder.patch

randr-target-exact-harder.patch (text/plain), 4.31 KB, created by Adam Jackson on 2008-11-13 10:19:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Adam Jackson

Created: 2008-11-13 10:19:00 UTC

Size: 4.31 KB

patch

obsolete

>diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
>index f072109..ee2f7e7 100644
>--- a/hw/xfree86/modes/xf86Crtc.c
>+++ b/hw/xfree86/modes/xf86Crtc.c
>@@ -1820,6 +1820,66 @@ nextEnabledOutput(xf86CrtcConfigPtr config, Bool *enabled, int *index)
> }
> 
> static Bool
>+aspectMatch(float a, float b)
>+{
>+    return fabs(1 - (a / b)) < 0.05;
>+}
>+
>+static DisplayModePtr
>+nextAspectMode(xf86OutputPtr o, DisplayModePtr last, float aspect)
>+{
>+    DisplayModePtr m = NULL;
>+
>+    if (!o)
>+	return NULL;
>+
>+    if (!last)
>+	m = o->probed_modes;
>+    else
>+	m = last->next;
>+
>+    for (; m; m = m->next)
>+	if (aspectMatch(aspect, (float)m->HDisplay / (float)m->VDisplay))
>+	    return m;
>+
>+    return NULL;
>+}
>+
>+static DisplayModePtr
>+bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
>+{
>+    int o = -1, p;
>+    DisplayModePtr mode = NULL, test = NULL, match = NULL;
>+
>+    if (!nextEnabledOutput(config, enabled, &o))
>+	return NULL;
>+    while ((mode = nextAspectMode(config->output[o], mode, aspect))) {
>+	test = mode;
>+	for (p = o; nextEnabledOutput(config, enabled, &p); ) {
>+	    test = xf86OutputFindClosestMode(config->output[p], mode);
>+	    if (!test)
>+		break;
>+	    if (test->HDisplay != mode->HDisplay ||
>+		    test->VDisplay != mode->VDisplay) {
>+		test = NULL;
>+		break;
>+	    }
>+	}
>+
>+	/* if we didn't match it on all outputs, try the next one */
>+	if (!test)
>+	    continue;
>+
>+	/* if it's bigger than the last one, save it */
>+	if (!match || (test->HDisplay > match->HDisplay))
>+	    match = test;
>+    }
>+
>+    /* return the biggest one found */
>+    return match;
>+}
>+
>+static Bool
> xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
> 		    DisplayModePtr *modes, Bool *enabled,
> 		    int width, int height)
>@@ -1871,75 +1931,43 @@ xf86TargetPreferred(ScrnInfoPtr scrn, xf86CrtcConfigPtr config,
> 	}
>     }
> 
>-    if (ret) {
>-	/* oh good, there is a match.  stash the selected modes and return. */
>-	memcpy(modes, preferred_match,
>-		config->num_output * sizeof(DisplayModePtr));
>-    }
>-
>-    xfree(preferred);
>-    xfree(preferred_match);
>-    return ret;
>-}
>-
>-static Bool
>-aspectMatch(float a, float b)
>-{
>-    return fabs(1 - (a / b)) < 0.05;
>-}
>-
>-static DisplayModePtr
>-nextAspectMode(xf86OutputPtr o, DisplayModePtr last, float aspect)
>-{
>-    DisplayModePtr m = NULL;
>+    /*
>+     * If there's no preferred mode, but only one monitor, pick the
>+     * biggest mode for its aspect ratio, assuming one exists.
>+     */
>+    if (!ret) do {
>+	int i = 0;
>+	float aspect = 0.0;
> 
>-    if (!o)
>-	return NULL;
>+	/* count the number of enabled outputs */
>+        for (i = 0, p = -1; nextEnabledOutput(config, enabled, &p); i++) ;
> 
>-    if (!last)
>-	m = o->probed_modes;
>-    else
>-	m = last->next;
>+	if (i != 1)
>+	    break;
> 
>-    for (; m; m = m->next)
>-	if (aspectMatch(aspect, (float)m->HDisplay / (float)m->VDisplay))
>-	    return m;
>+	p = -1;
>+	nextEnabledOutput(config, enabled, &p);
>+	if (config->output[p]->mm_height)
>+	    aspect = (float)config->output[p]->mm_width /
>+		     (float)config->output[p]->mm_height;
> 
>-    return NULL;
>-}
>+	if (aspect)
>+	    preferred_match = bestModeForAspect(config, enabled, aspect);
> 
>-static DisplayModePtr
>-bestModeForAspect(xf86CrtcConfigPtr config, Bool *enabled, float aspect)
>-{
>-    int o = -1, p;
>-    DisplayModePtr mode = NULL, test = NULL, match = NULL;
>-
>-    if (!nextEnabledOutput(config, enabled, &o))
>-	return NULL;
>-    while ((mode = nextAspectMode(config->output[o], mode, aspect))) {
>-	test = mode;
>-	for (p = o; nextEnabledOutput(config, enabled, &p); ) {
>-	    test = xf86OutputFindClosestMode(config->output[p], mode);
>-	    if (!test)
>-		break;
>-	    if (test->HDisplay != mode->HDisplay ||
>-		    test->VDisplay != mode->VDisplay) {
>-		test = NULL;
>-		break;
>-	    }
>+	if (preferred_match)
>+	    ret = TRUE;
> 	}
>+    } while (0);
> 
>-	/* if we didn't match it on all outputs, try the next one */
>-	if (!test)
>-	    continue;
>-
>-	/* if it's bigger than the last one, save it */
>-	if (!match || (test->HDisplay > match->HDisplay))
>-	    match = test;
>+    if (ret) {
>+	/* oh good, there is a match.  stash the selected modes and return. */
>+	memcpy(modes, preferred_match,
>+		config->num_output * sizeof(DisplayModePtr));
>     }
> 
>-    /* return the biggest one found */
>-    return match;
>+    xfree(preferred);
>+    xfree(preferred_match);
>+    return ret;
> }
> 
> static Bool

Actions: View | Splinter Review

Attachments on bug 18512: 20274 | 20275 | 20280 | 20284 | 20285

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.