diff options
| author | Keith Packard <keithp@keithp.com> | 2009-05-28 14:43:27 -0700 |
|---|---|---|
| committer | Ulrich Sibiller <uli42@gmx.de> | 2015-06-07 00:11:50 +0200 |
| commit | cf660f485eb478bcb7aaef3a538f2791e46662d9 (patch) | |
| tree | fff71216d07045c8388f3c180ee1f606bb0a61b2 /nx-X11/programs | |
| parent | 9dbd74793f4b125d56e3d0f63a845b5f7550d3b4 (diff) | |
| download | nx-libs-cf660f485eb478bcb7aaef3a538f2791e46662d9.tar.gz nx-libs-cf660f485eb478bcb7aaef3a538f2791e46662d9.tar.bz2 nx-libs-cf660f485eb478bcb7aaef3a538f2791e46662d9.zip | |
Backport: Make RANDR 'set' timestamps follow client specified time. Bug 21987.
The lastSetTime value which indicates when the configuration within the
server was last changed was not getting set in the appropriate RandR
requests.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'nx-X11/programs')
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrcrtc.c | 8 | ||||
| -rw-r--r-- | nx-X11/programs/Xserver/randr/rrscreen.c | 7 |
2 files changed, 2 insertions, 13 deletions
diff --git a/nx-X11/programs/Xserver/randr/rrcrtc.c b/nx-X11/programs/Xserver/randr/rrcrtc.c index 8a34962aa..bc1040c9f 100644 --- a/nx-X11/programs/Xserver/randr/rrcrtc.c +++ b/nx-X11/programs/Xserver/randr/rrcrtc.c @@ -838,10 +838,8 @@ ProcRRSetCrtcConfig (ClientPtr client) rep.status = RRSetConfigFailed; goto sendReply; } - #ifdef NXAGENT_SERVER /* Bug 21987 */ - pScrPriv->lastSetTime = time; - #endif rep.status = RRSetConfigSuccess; + pScrPriv->lastSetTime = time; sendReply: if (outputs) @@ -851,11 +849,7 @@ sendReply: /* rep.status has already been filled in */ rep.length = 0; rep.sequenceNumber = client->sequence; - #ifndef NXAGENT_SERVER /* Bug 21987 */ - rep.newTimestamp = pScrPriv->lastConfigTime.milliseconds; - #else rep.newTimestamp = pScrPriv->lastSetTime.milliseconds; - #endif if (client->swapped) { diff --git a/nx-X11/programs/Xserver/randr/rrscreen.c b/nx-X11/programs/Xserver/randr/rrscreen.c index e0eb0769b..a3851bd60 100644 --- a/nx-X11/programs/Xserver/randr/rrscreen.c +++ b/nx-X11/programs/Xserver/randr/rrscreen.c @@ -977,15 +977,10 @@ ProcRRSetScreenConfig (ClientPtr client) if (!RRCrtcSet (crtc, mode, 0, 0, stuff->rotation, 1, &output)) rep.status = RRSetConfigFailed; - #ifndef NXAGENT_SERVER /* Bug 21987 */ - else - rep.status = RRSetConfigSuccess; - #else else { - rep.status = RRSetConfigSuccess; pScrPriv->lastSetTime = time; + rep.status = RRSetConfigSuccess; } - #endif /* * XXX Configure other crtcs to mirror as much as possible |