xserver: Branch 'master' - 2 commits

[Eric Anholt]

 randr/rrproperty.c |   14 ++++++++++++++
 1 files changed, 14 insertions(+)

New commits:
diff-tree cde17015dff1ced2aabb8b76c08f9110237821a5 (from e3add7c8ecbb2a0a662860f208f6ae7d1857c717)
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Jan 16 13:01:03 2007 -0800

    When changing a non-pending property, call the screen rrOutputSetProperty hook.

diff --git a/randr/rrproperty.c b/randr/rrproperty.c
index 4b77d39..916caf0 100644
--- a/randr/rrproperty.c
+++ b/randr/rrproperty.c
@@ -125,6 +125,7 @@ RRChangeOutputProperty (RROutputPtr outp
 {
     RRPropertyPtr		    prop;
     xRROutputPropertyNotifyEvent    event;
+    rrScrPrivPtr		    pScrPriv = rrGetScrPriv(output->pScreen);
     int				    sizeInBytes;
     int				    totalSize;
     pointer			    data;
@@ -213,6 +214,13 @@ RRChangeOutputProperty (RROutputPtr outp
 	prop->next = output->properties;
 	output->properties = prop;
     }
+
+    if (!prop->is_pending) {
+	/* What should we do in case of failure? */
+	pScrPriv->rrOutputSetProperty(output->pScreen, output,
+				      prop->propertyName, prop_value);
+    }
+
     if (sendevent)
     {
 	event.type = RREventBase + RRNotify;
diff-tree e3add7c8ecbb2a0a662860f208f6ae7d1857c717 (from 7fccec91c46baac4f8d2965180dc535b4eb7d65c)
Author: Eric Anholt <eric at anholt.net>
Date:   Tue Jan 16 12:59:34 2007 -0800

    Don't forget to add the property we configure to the properties list.

diff --git a/randr/rrproperty.c b/randr/rrproperty.c
index 56bb39a..4b77d39 100644
--- a/randr/rrproperty.c
+++ b/randr/rrproperty.c
@@ -298,6 +298,12 @@ RRConfigureOutputProperty (RROutputPtr o
     if (prop->valid_values)
 	xfree (prop->valid_values);
     prop->valid_values = new_values;
+
+    if (add) {
+	prop->next = output->properties;
+	output->properties = prop;
+    }
+
     return Success;
 }